From 0e3240cfbdb606ea52deb54ef828e50c4d15705b Mon Sep 17 00:00:00 2001
From: PhatPhuckDave <david.majdandzic@hotmail.com>
Date: Fri, 28 Mar 2025 18:52:56 +0100
Subject: [PATCH] Cook

---
 Content/Items/Alien/alienitems.xml            |  430 +--
 Content/Items/Assemblies/AlienChestLarge.xml  |    2 +-
 Content/Items/Assemblies/AlienChestSmall.xml  |    2 +-
 .../Items/Assemblies/AlienDoorAssembly2.xml   |   12 +-
 .../Items/Assemblies/AlienDoorAssembly5.xml   |    8 +-
 .../Assemblies/AlienGeneratorCharged.xml      |    6 +-
 .../Items/Assemblies/AlienHatchAssembly.xml   |    4 +-
 .../Items/Assemblies/AlienPumpAssembly.xml    |    6 +-
 .../Items/Assemblies/AlienPumpAssembly1.xml   |    8 +-
 .../Items/Assemblies/AlienPumpAssembly2.xml   |    6 +-
 .../Assemblies/DivingGearCabinetLarge.xml     |   24 +-
 .../Assemblies/DivingGearCabinetSmall.xml     |   18 +-
 Content/Items/Assemblies/DivingSuitLocker.xml |    4 +-
 Content/Items/Button/button.xml               |   20 +-
 Content/Items/Command/command.xml             |   14 +-
 Content/Items/Containers/containers.xml       |  188 +-
 Content/Items/CreatureLoot/creatureloot.xml   |  200 +-
 Content/Items/Diving/divinggear.xml           |  106 +-
 Content/Items/Door/doors.xml                  |    8 +-
 Content/Items/Electricity/lights.xml          |   26 +-
 Content/Items/Electricity/poweritems.xml      |   64 +-
 Content/Items/Electricity/signalitems.xml     |  464 +--
 Content/Items/Engine/engine.xml               |   12 +-
 Content/Items/Fabricators/fabricators.xml     |   16 +-
 Content/Items/Gardening/ballastflora.xml      |    2 +-
 Content/Items/Gardening/gardeningtools.xml    |   60 +-
 Content/Items/Gardening/growableplants.xml    |   62 +-
 Content/Items/Gardening/plantproducts.xml     |   44 +-
 Content/Items/Genetic/genetic.xml             |   36 +-
 .../Jobgear/Assistant/assistant_gear.xml      |   14 +-
 .../Assistant/assistant_talent_items.xml      |   40 +-
 .../Items/Jobgear/Captain/captain_gear.xml    |  120 +-
 .../Jobgear/Captain/captain_talent_items.xml  |   52 +-
 Content/Items/Jobgear/Clown/clown.xml         |   92 +-
 .../Items/Jobgear/Commoner/commoner_gear.xml  |  184 +-
 .../Items/Jobgear/Cultist/cultist_gear.xml    |   14 +-
 .../Items/Jobgear/Engineer/engineer_gear.xml  |   44 +-
 .../Engineer/engineer_talent_items.xml        |  142 +-
 .../Items/Jobgear/Mechanic/mechanic_gear.xml  |   68 +-
 .../Mechanic/mechanic_talent_items.xml        |  130 +-
 Content/Items/Jobgear/Medic/medic_gear.xml    |   84 +-
 .../Jobgear/Medic/medic_talent_items.xml      |  120 +-
 .../Jobgear/Security/securityofficer_gear.xml |  138 +-
 .../Security/securityofficer_talent_items.xml |  116 +-
 Content/Items/Jobgear/misc.xml                |   14 +-
 Content/Items/Labels/labels.xml               |    8 +-
 Content/Items/Legacy/legacycontainers.xml     |    6 +-
 Content/Items/Legacy/legacyfabricators.xml    |    8 +-
 .../Items/Legacy/legacyoxygengenerator.xml    |    2 +-
 Content/Items/Legacy/legacyrailgun.xml        |    8 +-
 Content/Items/Legacy/legacysearchlight.xml    |    2 +-
 Content/Items/Materials/materials.xml         |  432 +--
 Content/Items/Materials/medmaterials.xml      |   82 +-
 Content/Items/Materials/minerals.xml          |  294 +-
 Content/Items/Medical/buffs.xml               |  122 +-
 Content/Items/Medical/medical.xml             |  360 +--
 Content/Items/Medical/poisons.xml             |  132 +-
 Content/Items/Misc/misc.xml                   |   40 +-
 Content/Items/Misc/pvp_items.xml              |   24 +-
 Content/Items/Misc/traitor_items.xml          |   44 +-
 .../Items/OxygenGenerator/oxygengenerator.xml |   12 +-
 Content/Items/Pets/PetEggs.xml                |   48 +-
 Content/Items/Pets/PetItems.xml               |   10 +-
 Content/Items/Pump/pump.xml                   |    2 +-
 Content/Items/Reactor/reactor.xml             |   16 +-
 Content/Items/SearchLight/searchlight.xml     |    2 +-
 Content/Items/Shipwrecks/wreckeditems.xml     |   30 +-
 Content/Items/Tools/tools.xml                 |  590 ++--
 Content/Items/Weapons/chaingun.xml            |   76 +-
 Content/Items/Weapons/coilgun.xml             |  122 +-
 Content/Items/Weapons/depthcharge.xml         |   80 +-
 Content/Items/Weapons/explosives.xml          |  140 +-
 Content/Items/Weapons/flakcannon.xml          |  104 +-
 Content/Items/Weapons/pulselaser.xml          |   52 +-
 Content/Items/Weapons/railgun.xml             |  122 +-
 Content/Items/Weapons/turrethardpoint.xml     |    4 +-
 Content/Items/Weapons/weapons.xml             |  646 ++--
 Content/Items/idcard.xml                      |    4 +-
 Content/Map/Outposts/OutpostItems.xml         |  124 +-
 Content/Map/Pirates/PirateItems.xml           |   78 +-
 Content/Map/Thalamus/thalamusitems.xml        |    6 +-
 Content/Missions.xml                          |  268 +-
 .../Assistant/AfflictionsAssistant.xml        |   54 +-
 .../Talents/Assistant/TalentsAssistant.xml    |  182 +-
 .../Talents/Captain/AfflictionsCaptain.xml    |   46 +-
 Content/Talents/Captain/TalentsCaptain.xml    |  170 +-
 Content/Talents/Doctor/AfflictionsDoctor.xml  |   12 +-
 Content/Talents/Doctor/TalentsDoctor.xml      |  104 +-
 .../Talents/Engineer/AfflictionsEngineer.xml  |    8 +-
 Content/Talents/Engineer/TalentsEngineer.xml  |  110 +-
 .../Talents/Mechanic/AfflictionsMechanic.xml  |   10 +-
 Content/Talents/Mechanic/TalentsMechanic.xml  |  150 +-
 .../Talents/Security/AfflictionsSecurity.xml  |   14 +-
 Content/Talents/Security/TalentsSecurity.xml  |  152 +-
 Content/Talents/TalentTrees.xml               | 2771 ++++++++++++++---
 Content/Upgrades/UpgradeModules.xml           |   82 +-
 Content/hashes.txt                            |  466 +--
 .../Items/Containers/ek_containers.xml        |  186 +-
 .../Items/Jobgear/ek_divinggear.xml           |  148 +-
 .../1769403760/Items/Jobgear/ek_jobgear.xml   |  204 +-
 .../Items/Materials/ek_materials.xml          |   36 +-
 .../Items/Weapons/ek_attachments.xml          |  232 +-
 .../Items/Weapons/ek_chaingunammo.xml         |   72 +-
 .../Items/Weapons/ek_coilgunammo.xml          |  268 +-
 .../1769403760/Items/Weapons/ek_drones.xml    |   88 +-
 .../Items/Weapons/ek_pulselaserammo.xml       |   14 +-
 .../1769403760/Items/Weapons/ek_shells.xml    |  376 +--
 .../1769403760/Items/Weapons/ek_weapons.xml   | 1386 ++++-----
 .../Items/Weapons/ek_weapons_melee.xml        |   74 +-
 .../1769403760/Items/overwrite_turrets.xml    |    4 +-
 .../Items/overwrite_turrets_legacy.xml        |    4 +-
 .../Items/Containers/ekutility_containers.xml |  308 +-
 .../Items/Containers/ekutility_labels.xml     |   16 +-
 .../Items/Diving/ekutility_divinggear.xml     |  138 +-
 .../ekutility_densifiedmaterials.xml          | 1298 ++++----
 ...kutility_densifiedmaterials_doublesize.xml | 1280 ++++----
 .../ekutility_densifiedmaterials_oldfab.xml   | 1122 +++----
 .../ekutility_densifiedmaterials_oldids.xml   | 1280 ++++----
 ...utility_densifiedmaterials_oldstacking.xml | 1280 ++++----
 .../Tools/ekutility_placeablemachines.xml     |  312 +-
 .../Items/Tools/ekutility_tools.xml           |  496 +--
 .../1946765892/Items/overwrite_alienitems.xml |   62 +-
 .../Items/overwrite_alienitems_legacy.xml     |   60 +-
 .../Items/overwrite_alienitems_legacy2.xml    |   60 +-
 .../1946765892/Items/overwrite_tools.xml      |  118 +-
 .../Items/overwrite_tools_legacy.xml          |   22 +-
 .../2085783214/Items/huskmoditems.xml         |  126 +-
 .../Installed/2085783214/Items/medical.xml    |   22 +-
 .../Installed/2183524355/UpgradeModules.xml   |   80 +-
 .../Installed/2184257427/specialitems.xml     |    4 +-
 .../Installed/2184257427/wreckeditems.xml     |   28 +-
 .../Items/Command/ekgunnery_command.xml       |    2 +-
 .../Items/Containers/ekgunnery_containers.xml |   32 +-
 .../Items/Electricity/ekgunnery_devices.xml   |   20 +-
 .../Items/Weapons/ekgunnery_ammunition.xml    |  358 +--
 .../Items/Weapons/ekgunnery_auxiliary.xml     |   16 +-
 .../Items/Weapons/ekgunnery_heavyturrets.xml  |    6 +-
 .../Items/Weapons/ekgunnery_loaders.xml       |   62 +-
 .../Weapons/ekgunnery_loaders_legacy.xml      |   30 +-
 .../Items/Weapons/ekgunnery_melee.xml         |   22 +-
 .../Weapons/ekgunnery_modularmissile.xml      |   46 +-
 .../Items/Weapons/ekgunnery_spinalweapons.xml |   10 +-
 .../Items/Weapons/ekgunnery_turrets.xml       |   28 +-
 .../Weapons/ekgunnery_turrets_legacy.xml      |   74 +-
 .../Items/Weapons/ekgunnery_uniqueturrets.xml |    2 +-
 .../Items/Command/custom_commandterminal.xml  |    2 +-
 .../Items/Command/lazy_navterminal.xml        |    8 +-
 .../Containers/custom_storagecontainers.xml   |   42 +-
 .../Items/Door/custom_dockingports.xml        |   32 +-
 .../Items/Electricity/custom_devices.xml      |  342 +-
 .../Items/Electricity/custom_gauges.xml       |    6 +-
 .../Items/Electricity/custom_lights.xml       |   36 +-
 .../Electricity/custom_lights_outputtest.xml  |   22 +-
 .../Electricity/custom_submarine_function.xml |    6 +-
 .../Items/Electricity/poweritem_variants.xml  |   62 +-
 .../Items/Engine/thruster_engines.xml         |   18 +-
 .../Items/Engine/thruster_engines_legacy.xml  |   18 +-
 .../Items/Environment/environment_hazards.xml |   44 +-
 .../Environment/environment_particles.xml     |   34 +-
 .../Items/Environment/environment_sounds.xml  |   12 +-
 .../Items/Fabricators/fabricator_variants.xml |    4 +-
 .../2390137099/Items/Generator/generator.xml  |  164 +-
 .../Items/Searchlight/searchlight_custom.xml  |   12 +-
 .../CaveOutpostLocations/CaveObjects.xml      |   28 +-
 .../Lithomorph/LithomorphItems.xml            |   48 +-
 .../Installed/2532991202/Events/Missions.xml  |  164 +-
 .../Content/Items/Fabricators/fabricators.xml |    4 +-
 .../Content/Items/Food/Drinks.xml             |  210 +-
 .../Content/Items/Food/Food.xml               |  172 +-
 .../Content/Items/Food/Ingredients.xml        |   56 +-
 .../Content/Items/Misc/Misc.xml               |   42 +-
 .../2532991202/Items/Alien/alienitems.xml     |   12 +-
 .../2532991202/Items/Effects/EffectItems.xml  |    6 +-
 .../Items/Electricity/signalitems.xml         |    2 +-
 .../Items/EventItems/dementonitetools.xml     |   10 +-
 .../Items/EventItems/eventitems.xml           |  114 +-
 .../Items/Fabricators/vendingmachines.xml     |    4 +-
 .../Items/Factions/cultist_gear.xml           |   18 +-
 .../Items/Factions/soldier_gear.xml           |   94 +-
 .../Items/Gardening/growableplants.xml        |   10 +-
 .../2532991202/Items/Materials/materials.xml  |   12 +-
 .../2532991202/Items/Materials/minerals.xml   |    8 +-
 .../Installed/2532991202/Items/Misc/misc.xml  |   28 +-
 .../2532991202/Items/Misc/musicitems.xml      |   70 +-
 .../2532991202/Items/Pirates/PirateItems.xml  |   54 +-
 .../Items/Waste Items/WasteItems.xml          |    2 +-
 .../2613901395/Ammopack/Ammopack.xml          |   14 +-
 .../Backpack Belt-Fed Minigun.xml             |   24 +-
 .../2613901395/Backpack/Backpack.xml          |   14 +-
 .../Deep Diving Operation Suit.xml            |   32 +-
 .../Diving suits.old/Diving Suits.xml         |   92 +-
 .../2613901395/Duffel Bag/Duffel Bag.xml      |    4 +-
 .../Heavy Backpack/Heavy Backpack.xml         |   26 +-
 .../2613901395/Heavy Crate/Heavy Crate.xml    |   14 +-
 .../Medical Backpack/Medical Backpack.xml     |   22 +-
 .../2613901395/Medipack/Medipack.xml          |   14 +-
 .../Oxy-Gen. Backpack/Oxy-Gen. Backpack.xml   |   18 +-
 .../Power-Backpack/Power-Backpack.xml         |   20 +-
 .../Safety Harness.old/Safety Harness.xml     |   10 +-
 .../Shield Backpack/Shield Backpack.xml       |   16 +-
 .../Tactical Body Armor.xml                   |   12 +-
 .../Techno-Backpack/Techno-Backpack.xml       |   14 +-
 .../Vanilla Crates/Vanilla Crates.xml         |   20 +-
 .../Xeno-Backpack/Xeno-Backpack.xml           |    8 +-
 .../2651492771/Items/Command/command.xml      |    8 +-
 .../2683570256/CreatureLoot/creatureloot.xml  |   14 +-
 .../2683570256/Electricity/poweritems.xml     |   42 +-
 .../2683570256/Electricity/signalitems.xml    |   76 +-
 .../2683570256/Gardening/growableplants.xml   |   62 +-
 .../2683570256/Gardening/plantproducts.xml    |   44 +-
 .../Jobgear/captain_talent_items.xml          |   14 +-
 .../Jobgear/engineer_talent_items.xml         |   24 +-
 .../2683570256/Jobgear/medic_talent_items.xml |   42 +-
 .../Jobgear/securityofficer_talent_items.xml  |   40 +-
 .../2683570256/Materials/materials.xml        |  434 +--
 .../2683570256/Materials/medmaterials.xml     |   84 +-
 .../2683570256/Materials/minerals.xml         |  292 +-
 .../Installed/2683570256/Medical/buffs.xml    |  108 +-
 .../Installed/2683570256/Medical/medical.xml  |  362 +--
 .../Installed/2683570256/Medical/poisons.xml  |  134 +-
 .../Installed/2683570256/Misc/misc.xml        |   10 +-
 .../Installed/2683570256/Tools/tools.xml      |  274 +-
 .../Installed/2683570256/Weapons/weapons.xml  |  220 +-
 .../Installed/2781344452/containers.xml       |    4 +-
 .../Installed/2903374119/TalentTrees.xml      |  264 +-
 .../Installed/2936760984/command.xml          |    6 +-
 .../Installed/2936760984/items.xml            |   38 +-
 .../Installed/2936760984/treatments.xml       |   44 +-
 .../Content/Items/Command/command.xml         |    6 +-
 229 files changed, 15254 insertions(+), 13365 deletions(-)

diff --git a/Content/Items/Alien/alienitems.xml b/Content/Items/Alien/alienitems.xml
index e44356ed..e337bb43 100644
--- a/Content/Items/Alien/alienitems.xml
+++ b/Content/Items/Alien/alienitems.xml
@@ -3,14 +3,14 @@
   <Item name="" identifier="skyholderartifact" category="Alien" Tags="alien,alienartifact" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy" allowsellingwhenbroken="true" hideconditionbar="true">
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
     <Price baseprice="2000" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" />
-      <Price storeidentifier="merchantresearch" multiplier="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="2" spawnprobability="0.02" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="630,0,82,108" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="steel" />
@@ -48,14 +48,14 @@
   <Item name="" identifier="thermalartifact" category="Alien" Tags="alien,alienartifact" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy">
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
     <Price baseprice="2000" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" />
-      <Price storeidentifier="merchantresearch" multiplier="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="2" spawnprobability="0.02" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="542,112,102,99" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="steel" />
@@ -80,7 +80,7 @@
       </StatusEffect>
     </Holdable>
     <!-- Emits steam periodically when in water, burns. Had to use Lightcomponent to make it work -->
-    <LightComponent range="150.0" lightcolor="210,120,30,120" IsOn="False" castshadows="false" allowingameediting="false" pulseamount="0.1" pulsefrequency="4">
+    <LightComponent range="600" lightcolor="210,120,30,120" IsOn="False" castshadows="false" allowingameediting="false" pulseamount="0.1" pulsefrequency="4">
       <Statuseffect type="InWater" target="This" IsOn="True" Interval="20" />
       <Statuseffect type="NotInWater" target="This" IsOn="False" />
       <StatusEffect type="OnActive" target="This" IsOn="False" delay="5" stackable="False" />
@@ -106,14 +106,14 @@
   <Item name="" identifier="faradayartifact" category="Alien" Tags="alien,alienartifact" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy" allowsellingwhenbroken="true" hideconditionbar="true">
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
     <Price baseprice="2000" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" />
-      <Price storeidentifier="merchantresearch" multiplier="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="2" spawnprobability="0.02" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="645,108,93,103" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="steel" />
@@ -161,14 +161,14 @@
   <Item name="" identifier="nasonovartifact" category="Alien" Tags="alien,nasonov,alienartifact" pickdistance="150" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy" allowsellingwhenbroken="true" hideconditionbar="true">
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
     <Price baseprice="2000" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" />
-      <Price storeidentifier="merchantresearch" multiplier="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="2" spawnprobability="0.02" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="718,6,78,102" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="steel" />
@@ -198,14 +198,14 @@
   <Item name="" identifier="psychosisartifact" category="Alien" Tags="alien,alienartifact" sonarsize="30" spritecolor="200,200,200,255" scale="0.5" impactsoundtag="impact_metal_heavy">
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
     <Price baseprice="2000" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" />
-      <Price storeidentifier="merchantresearch" multiplier="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="2" spawnprobability="0.02" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="541,0,88,108" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="steel" />
@@ -231,13 +231,13 @@
         <sound file="Content/Items/Alien/Alienpump.ogg" range="500.0" loop="true" volume="1" />
       </StatusEffect>
     </Holdable>
-    <LightComponent range="150.0" lightcolor="255,56,144,111" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.25" />
+    <LightComponent range="600" lightcolor="255,56,144,111" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.25" />
   </Item>
   <Item name="" identifier="psychosisartifact_event" nameidentifier="psychosisartifact" variantof="psychosisartifact" hideinmenus="true">
     <Price baseprice="2000" sold="false" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" />
-      <Price storeidentifier="merchantresearch" multiplier="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
@@ -247,15 +247,15 @@
       <Clear />
     </Holdable>
   </Item>
-  <Item name="" identifier="alientrinket1" category="Alien" maxstacksize="8" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
+  <Item name="" identifier="alientrinket1" category="Alien" maxstacksize="16" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.1" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="4" maxamount="8" spawnprobability="1" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.2" />
     <Price baseprice="300" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" />
-      <Price storeidentifier="merchantresearch" multiplier="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
@@ -270,15 +270,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="alientrinket2" category="Alien" maxstacksize="8" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
+  <Item name="" identifier="alientrinket2" category="Alien" maxstacksize="16" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.1" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="4" maxamount="8" spawnprobability="1" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.2" />
     <Price baseprice="300" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" />
-      <Price storeidentifier="merchantresearch" multiplier="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
@@ -293,15 +293,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="alientrinket3" category="Alien" maxstacksize="8" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
+  <Item name="" identifier="alientrinket3" category="Alien" maxstacksize="16" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.1" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="4" maxamount="8" spawnprobability="1" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.2" />
     <Price baseprice="300" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" />
-      <Price storeidentifier="merchantresearch" multiplier="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
@@ -316,18 +316,18 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="oxygeniteshard" category="Alien,Material" cargocontaineridentifier="explosivecrate" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" tags="alien,smallitem" impacttolerance="8" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="oxygeniteshard" category="Alien,Material" cargocontaineridentifier="explosivecrate" maxstacksize="64" maxstacksizecharacterinventory="16" scale="0.5" tags="alien,smallitem" impacttolerance="8" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.15.22.1" Tags="alien,smallitem" />
-    <Price baseprice="200" minavailable="1">
+    <Price baseprice="200" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.15" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.45" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.4" />
-    <PreferredContainer primary="ruintreasure" minamount="2" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
+    <PreferredContainer primary="ruintreasure" minamount="4" maxamount="6" spawnprobability="1" />
     <Deconstruct time="20">
       <Item identifier="liquidoxygenite" mincondition="0.5" />
       <Item identifier="liquidoxygenite" mincondition="0.9" />
@@ -351,17 +351,17 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="" identifier="sulphuriteshard" category="Alien,Material" cargocontaineridentifier="metalcrate" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" tags="alien,smallitem" impacttolerance="8" impactsoundtag="impact_metal_light">
-    <Price baseprice="200" minavailable="1">
+  <Item name="" identifier="sulphuriteshard" category="Alien,Material" cargocontaineridentifier="metalcrate" maxstacksize="64" maxstacksizecharacterinventory="16" scale="0.5" tags="alien,smallitem" impacttolerance="8" impactsoundtag="impact_metal_light">
+    <Price baseprice="200" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.15" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.45" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.4" />
-    <PreferredContainer primary="ruintreasure" minamount="2" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
+    <PreferredContainer primary="ruintreasure" minamount="4" maxamount="6" spawnprobability="1" />
     <Deconstruct time="20">
       <Item identifier="sulphuricacid" mincondition="0.5" />
       <Item identifier="sulphuricacid" mincondition="0.9" />
@@ -385,16 +385,16 @@
   </Item>
   <Item name="" identifier="alienpistol" category="Weapon,Alien" tags="smallitem,weapon,alien,mountableweapon,pistolitem" Scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="500" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="ruinstoragelarge" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="researchcontainer" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="ruinstoragelarge" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="researchcontainer" amount="2" spawnprobability="0.02" />
     <Deconstruct time="20">
       <Item identifier="dementonite" />
       <Item identifier="fulgurium" />
@@ -405,8 +405,8 @@
     <Holdable slots="Any,RightHand,LeftHand" controlpose="true" aimpos="90,10" handle1="2,-7" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnBroken" target="This" Condition="100" setvalue="true" delay="1" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" itempos="20,-20">
-      <Containable items="alienpowercell" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" itempos="20,-20">
+      <Containable items="alienpowercell,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <RangedWeapon reload="0.5" barrelpos="34,6" spread="0" unskilledspread="2" drawhudwhenequipped="true" crosshairscale="0.2" combatpriority="60">
       <sound file="Content/Items/Alien/AlienTurret1.ogg" type="OnUse" range="1000.0" />
@@ -429,14 +429,14 @@
   </Item>
   <Item name="" identifier="ancientweapon" category="Alien,Weapon" Tags="alien,mediumitem,weapon,mountableweapon,cuttingequipment" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="1000" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="ruinstoragelarge" amount="1" spawnprobability="0.025" />
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.025" />
+    <PreferredContainer primary="ruinstoragelarge" amount="2" spawnprobability="0.05" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.05" />
     <Deconstruct time="20">
       <Item identifier="dementonite" />
       <Item identifier="dementonite" />
@@ -445,7 +445,7 @@
     <Sprite texture="AlienRuins_Items.png" depth="0.55" sourcerect="0,1776,185,96" origin="0.5,0.4" scale="0.5" />
     <Body radius="30" width="90" density="25" />
     <Holdable slots="Any,RightHand+LeftHand" aimpos="100,0" handle1="0,11" handle2="2,11" msg="ItemMsgPickUpSelect" />
-    <RepairTool structurefixamount="-0.75" range="400" barrelpos="75,0" targetforce="50" repairmultiple="true" repairthroughwalls="true" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-20.0" combatpriority="90" firedamage="30">
+    <RepairTool structurefixamount="-0.75" range="1600" barrelpos="75,0" targetforce="50" repairmultiple="true" repairthroughwalls="true" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-20.0" combatpriority="90" firedamage="30">
       <Fixable identifier="structure" />
       <RequiredItems items="alienpowercell" type="Contained" />
       <StatusEffect type="OnUse" targettype="UseTarget" targets="weldable" Stuck="-80.0" />
@@ -471,7 +471,7 @@
         <Affliction identifier="stun" amount="4" probability="0.15" />
       </StatusEffect>
       <sound file="Content/Items/Alien/alienweapon.ogg" type="OnUse" range="1000.0" loop="true" />
-      <LightComponent AllowInGameEditing="false" LightColor="0.8,0.7,1.0,1.0" Flicker="0.5" range="500">
+      <LightComponent AllowInGameEditing="false" LightColor="0.8,0.7,1.0,1.0" Flicker="0.5" range="2000">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5" />
       </LightComponent>
     </RepairTool>
@@ -495,8 +495,8 @@
       </StatusEffect>
     </Projectile>
     -->
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="9,0">
-      <Containable items="alienpowercell" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" itempos="9,0">
+      <Containable items="alienpowercell,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Upgrade gameversion="0.1500.5.0" scale="0.5" />
     <Upgrade gameversion="1.0.13.0" Tags="alien,mediumitem,weapon,mountableweapon,cuttingequipment" />
@@ -768,49 +768,49 @@
   </Item>
   <Item name="" identifier="artifactholder" category="Alien" Tags="alien,artifactholder,artifactcontainer">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.8" sourcerect="725,786,260,425" />
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" itempos="130,-180" containedspritedepth="0.81" autointeractwithcontained="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" itempos="130,-180" containedspritedepth="0.81" autointeractwithcontained="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.11,0.17" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="alienartifact" excludebroken="false">
+      <Containable items="alienartifact,ammobox,deepdiving,smallitem,mediumitem,largeitem" excludebroken="false">
         <StatusEffect type="OnContaining" target="This" Voltage="1.0" setvalue="true" />
         <StatusEffect type="OnContaining" target="This">
           <sound file="Content/Items/Alien/ALIEN_artifactHolderLoop.ogg" range="500.0" loop="true" dontmuffle="true" />
         </StatusEffect>
       </Containable>
-      <Containable items="thermalartifact" excludebroken="false">
+      <Containable items="thermalartifact,ammobox,deepdiving,smallitem,mediumitem,largeitem" excludebroken="false">
         <StatusEffect type="OnContaining" target="This" Charge="1000.0">
           <ParticleEmitter particle="artifactholderfx" anglemax="360" distancemin="0" distancemax="80" velocitymin="-150" velocitymax="0" particlespersecond="30" colormultiplier="240,180,20,255" />
           <ParticleEmitter particle="mist" anglemax="360" distancemax="40" scalemin="0.5" scalemax="1.0" velocitymin="4" velocitymax="10" scalemultiplier="1,1" particlespersecond="6" colormultiplier="240,180,20,255" />
         </StatusEffect>
       </Containable>
-      <Containable items="faradayartifact" excludebroken="false">
+      <Containable items="faradayartifact,ammobox,deepdiving,smallitem,mediumitem,largeitem" excludebroken="false">
         <StatusEffect type="OnContaining" target="This" Charge="10.0">
           <ParticleEmitter particle="artifactholderfx" anglemax="360" distancemin="0" distancemax="80" velocitymin="-150" velocitymax="0" particlespersecond="30" colormultiplier="20,180,240,255" />
           <ParticleEmitter particle="mist" anglemax="360" distancemax="40" scalemin="0.5" scalemax="1.0" velocitymin="4" velocitymax="10" scalemultiplier="1,1" particlespersecond="6" colormultiplier="20,180,240,255" />
         </StatusEffect>
       </Containable>
-      <Containable items="nasonovartifact" excludebroken="false">
+      <Containable items="nasonovartifact,ammobox,deepdiving,smallitem,mediumitem,largeitem" excludebroken="false">
         <StatusEffect type="OnContaining" target="This">
           <ParticleEmitter particle="artifactholderfx" anglemax="360" distancemin="0" distancemax="80" velocitymin="-150" velocitymax="0" particlespersecond="30" colormultiplier="240,240,100,255" />
           <ParticleEmitter particle="mist" anglemax="360" distancemax="40" scalemin="0.5" scalemax="1.0" velocitymin="4" velocitymax="10" scalemultiplier="1,1" particlespersecond="6" colormultiplier="240,240,100,255" />
         </StatusEffect>
       </Containable>
-      <Containable items="psychosisartifact" excludebroken="false">
+      <Containable items="psychosisartifact,ammobox,deepdiving,smallitem,mediumitem,largeitem" excludebroken="false">
         <StatusEffect type="OnContaining" target="This">
           <ParticleEmitter particle="artifactholderfx" anglemax="360" distancemin="0" distancemax="80" velocitymin="-150" velocitymax="0" particlespersecond="30" colormultiplier="240,20,100,255" />
           <ParticleEmitter particle="mist" anglemax="360" distancemax="40" scalemin="0.5" scalemax="1.0" velocitymin="4" velocitymax="10" scalemultiplier="1,1" particlespersecond="6" colormultiplier="240,20,100,255" />
         </StatusEffect>
       </Containable>
-      <Containable items="skyholderartifact" excludebroken="false">
+      <Containable items="skyholderartifact,ammobox,deepdiving,smallitem,mediumitem,largeitem" excludebroken="false">
         <StatusEffect type="OnContaining" target="This">
           <ParticleEmitter particle="artifactholderfx" anglemax="360" distancemin="0" distancemax="80" velocitymin="-150" velocitymax="0" particlespersecond="30" colormultiplier="20,60,240,255" />
           <ParticleEmitter particle="mist" anglemax="360" distancemax="40" scalemin="0.5" scalemax="1.0" velocitymin="4" velocitymax="10" scalemultiplier="1,1" particlespersecond="6" colormultiplier="20,60,240,255" />
         </StatusEffect>
       </Containable>
     </ItemContainer>
-    <LightComponent AllowInGameEditing="false" lightcolor="153,204,255,200" powerconsumption="1" canbeselected="false" range="800.0" IsOn="true" castshadows="false">
+    <LightComponent AllowInGameEditing="false" lightcolor="153,204,255,200" powerconsumption="1" canbeselected="false" range="3200" IsOn="true" castshadows="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1047,1792,255,255" depth="0.025" origin="0.5,0.5" alpha="0.4" />
     </LightComponent>
-    <PowerContainer capacity="20000.0" canbeselected="false" maxrechargespeed="10000.0" maxoutput="10000.0" />
+    <PowerContainer capacity="44000" canbeselected="false" maxrechargespeed="10000.0" maxoutput="10000.0" />
     <ConnectionPanel canbeselected="false" hudpriority="10">
       <RequiredItem items="screwdriver" type="Equipped" />
       <output name="power_out" displayname="connection.powerout" />
@@ -830,14 +830,14 @@
     <Sprite name="aliengenerator" texture="Content/Items/Alien/AlienRuins_Items_04.png" depth="0.8" sourcerect="515,4,506,506" />
     <DecorativeSprite name="aliengenerator_center" texture="Content/Items/Alien/AlienRuins_Items_04.png" depth="0.79" sourcerect="10,485,178,179" origin="0.5,0.5"/>
     <BrokenSprite name="aliengenerator_broken" texture="Content/Items/Alien/AlienRuins_Items_04.png" depth="0.78" sourcerect="515,515,506,506" origin="0.5,0.5" fadein="false" />
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="true" containedspritedepth="0.01" autointeractwithcontained="false">
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hideitems="true" containedspritedepth="0.01" autointeractwithcontained="false">
       <GuiFrame relativesize="0.11,0.17" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <StatusEffect type="Always" target="This" Charge="-1000.0" />
-      <Containable items="alienpowercell">
+      <Containable items="alienpowercell,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" Charge="10000.0" setvalue="true" />
       </Containable>
     </ItemContainer>
-    <PowerContainer capacity="1000" canbeselected="true" maxrechargespeed="1000.0" maxoutput="10000.0" />
+    <PowerContainer capacity="2200" canbeselected="true" maxrechargespeed="1000.0" maxoutput="10000.0" />
     <ConnectionPanel canbeselected="true" hudpriority="10" locked="True" allowingameediting="False" >
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
@@ -857,39 +857,39 @@
         <sound file="Content/Items/Weapons/ElectricalDischarger.ogg" range="50000" dontmuffle="true" />
       </StatusEffect>
     </ConnectionPanel>
-    <LightComponent AllowInGameEditing="false" lightcolor="128,128,128,10" canbeselected="false" range="200.0" IsOn="true" powerconsumption="0">
+    <LightComponent AllowInGameEditing="false" lightcolor="128,128,128,10" canbeselected="false" range="800" IsOn="true" powerconsumption="0">
       <Upgrade gameversion="1.6.4.0" range="200.0"/>
       <Upgrade gameversion="1.6.8.0" lightcolor="128,128,128,10"/>
       <Sprite texture="Content/Items/Alien/AlienRuins_Items_04.png" sourcerect="515,4,506,506" origin="0.5, 0.5" alpha="1.0" depth="0.71" />
     </LightComponent>
-    <LightComponent AllowInGameEditing="false" lightcolor="49,93,140,100" canbeselected="false" range="1000.0" IsOn="true" powerconsumption="0">
+    <LightComponent AllowInGameEditing="false" lightcolor="49,93,140,100" canbeselected="false" range="4000" IsOn="true" powerconsumption="0">
       <Upgrade gameversion="1.6.4.0" range="1000.0"/>
       <Upgrade gameversion="1.6.8.0" lightcolor="49,93,140,100"/>
       <Sprite texture="Content/Items/Alien/AlienRuins_Items_04.png" sourcerect="18,681,91,94" origin="0.5, 0.5" alpha="1.0" depth="0.7" />
       <IsActiveConditional targetcontaineditem="true" HasTag="alienpowercell" conditionpercentage="gt 0"/>
     </LightComponent>
   </Item>
-  <Item name="" identifier="alienpowercell" category="Alien,Equipment" maxstacksize="8" Tags="alien,smallitem,alienpowercell" scale="0.3" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="alienpowercell" category="Alien,Equipment" maxstacksize="16" Tags="alien,smallitem,alienpowercell" scale="0.3" impactsoundtag="impact_metal_light">
     <Price baseprice="220" sold="false">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="lead" />
       <Item identifier="fulgurium" />
     </Deconstruct>
-    <PreferredContainer primary="alienpistol" amount="1" spawnprobability="1.0" />
-    <PreferredContainer primary="ancientweapon" amount="1" spawnprobability="1.0" />
-    <PreferredContainer primary="wrecksecarmcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.4" />
-    <PreferredContainer primary="ruintreasure" minamount="2" maxamount="3" spawnprobability="0.5" />
-    <PreferredContainer secondary="researchcontainer" amount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="alienpistol" amount="2" spawnprobability="1" />
+    <PreferredContainer primary="ancientweapon" amount="2" spawnprobability="1" />
+    <PreferredContainer primary="wrecksecarmcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
+    <PreferredContainer primary="ruintreasure" minamount="4" maxamount="6" spawnprobability="1" />
+    <PreferredContainer secondary="researchcontainer" amount="2" spawnprobability="0.04" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="0,1952,34,77" depth="0.7" origin="0.5,0.5" />
-    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,30" canbeselected="false" range="100.0" IsOn="true" castshadows="false" />
+    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,30" canbeselected="false" range="400" IsOn="true" castshadows="false" />
     <Body radius="15" height="40" density="30" />
     <Holdable slots="RightHand,LeftHand,Any" msg="ItemMsgPickUpSelect">
       <!--<StatusEffect type="OnContained" target="Character">
@@ -897,7 +897,7 @@
       </StatusEffect>-->
     </Holdable>
     <ItemContainer hideitems="true" capacity="1" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true" SpawnWithId="alienprojectile" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="battery">
-      <Containable items="alienprojectile" />
+      <Containable items="alienprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-4.0" disabledeltatime="true">
         <SpawnItem identifiers="alienprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -965,7 +965,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
-    <LightComponent AllowInGameEditing="false" color="183,85,214,100" IsOn="true" range="1.0" castshadows="false">
+    <LightComponent AllowInGameEditing="false" color="183,85,214,100" IsOn="true" range="4" castshadows="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="183,113,100,97" depth="0.1" origin="0.5,0.5" />
     </LightComponent>
   </Item>
@@ -1045,7 +1045,7 @@
       </StatusEffect>
     </Projectile>
     <AiTarget sonardisruption="1" sightrange="500" soundrange="100000" static="true" sonarlabel="entityname.anomaly" />
-    <LightComponent range="2048.0" lightcolor="255,200,15,255" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0" flickerspeed="5">
+    <LightComponent range="8192" lightcolor="255,200,15,255" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0" flickerspeed="5">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5, 0.5" size="1.0,1.0" />
       <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.7" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This">
@@ -1116,8 +1116,8 @@
     <Sprite name="alienturret" texture="Content/Items/Alien/AlienTurret.png" depth="0.7" sourcerect="4,318,251,192" canflipy="false" />
     <BrokenSprite name="alienturret_broken_gradual" texture="Content/Items/Alien/AlienTurret.png" sourcerect="257,318,251,192" depth="0.69" fadein="true" maxcondition="80" />
     <BrokenSprite name="alienturret_broken" texture="Content/Items/Alien/AlienTurret.png" sourcerect="257,318,251,192" depth="0.68" fadein="false" />
-    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" canbeselected="false" characterusable="true">
-      <Containable items="alienturretammo" />
+    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="2" canbeselected="false" characterusable="true">
+      <Containable items="alienturretammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!-- when the turret is fired, it triggers this statuseffect and spawns new ammo -->
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="alienturretammo" spawnposition="ThisInventory" />
@@ -1132,7 +1132,7 @@
       <RailSpriteBroken name="alienturret_rail_broken" texture="Content/Items/Alien/AlienTurret.png" depth="0.71" sourcerect="254,0,184,316" origin="0.5,0.83" />      
       <BarrelSprite name="alienturret_barrel" texture="Content/Items/Alien/AlienTurret.png" depth="0.72" sourcerect="188,2,66,184" origin="0.5,1.57" />
       <BarrelSpriteBroken name="alienturret_barrel_broken" texture="Content/Items/Alien/AlienTurret.png" depth="0.72" sourcerect="442,2,66,184" origin="0.5,1.57" />      
-      <LightComponent LightColor="200,200,255,255" Flicker="0.0" powerconsumption="1" range="1000" directional="true" IsOn="true" pulsefrequency="1.0" pulseamount="0.2" drawbehindsubs="false" ignorecontinuoustoggle="false" InheritParentIsActive="false">
+      <LightComponent LightColor="200,200,255,255" Flicker="0.0" powerconsumption="1" range="4000" directional="true" IsOn="true" pulsefrequency="1.0" pulseamount="0.2" drawbehindsubs="false" ignorecontinuoustoggle="false" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="-0.055,0.5" size="1.0,0.3" />
       </LightComponent>     
       <StatusEffect type="OnUse" target="This">
@@ -1192,49 +1192,49 @@
   </Item>
   <Item name="" identifier="alienwritingdecal1" nameidentifier="alienwriting" Tags="alienwritingdecal" width="285" height="160" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,384,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,544,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienwritingdecal2" nameidentifier="alienwriting" Tags="alienwritingdecal" width="285" height="160" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,705,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,864,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienwritingdecal3" nameidentifier="alienwriting" Tags="alienwritingdecal" width="117" height="117" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1915,2,131,132" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1915,137,131,132" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienwritingdecal4" nameidentifier="alienwriting" Tags="alienwritingdecal" width="261" height="87" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1658,2,254,97" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1658,200,250,93" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienwritingdecal5" nameidentifier="alienwriting" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1658,102,255,95" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1658,296,251,91" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
     <Item name="" identifier="alienwritingdecal6" nameidentifier="alienwriting" Tags="alienwritingdecal" width="241" height="138" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="9,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="250,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienwritingdecal7" nameidentifier="alienwriting" Tags="alienwritingdecal" width="241" height="156" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="9,1587,241,156" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="250,1587,241,156" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Alien writing: force alienwriting1 event" description="A SINGER IS BORN — AUDIENCE GATHERS, [UNTRANSLATABLE?] SPREADS — OUTGROWS THE CRADLE, FORTRESS IS BUILT — TO HOUSE — TO PROTECT" nameidentifier="alienwriting" identifier="alienwriting_alienwriting1" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="false" hideinmenus="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,384,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,544,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
       <StatusEffect target="This" type="OnSpawn" evententitytag="alienwriting1">
         <TriggerEvent identifier="alienwriting1" />
@@ -1243,7 +1243,7 @@
   </Item>
   <Item name="Alien writing: force alienwriting2 event" description="LIFE INCUBATED UNDER ICE — CONSCIOUSNESS FORMS, KNOWLEDGE COMPOUNDS — CIVILIZATION DEVELOPS, INSULATED FROM DANGER" nameidentifier="alienwriting" identifier="alienwriting_alienwriting2" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="false" hideinmenus="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,705,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,864,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
       <StatusEffect target="This" type="OnSpawn" evententitytag="alienwriting2">
         <TriggerEvent identifier="alienwriting2" />
@@ -1252,7 +1252,7 @@
   </Item>
   <Item name="Alien writing: force alienwriting4 event" description="THE SINGER IS ALONE - THE DEVOTED LONGING FOR [UNTRANSLATABLE?] - A BRIDGE TO BRING NIGH THE GREAT SPHERE IS BUILT" nameidentifier="alienwriting" identifier="alienwriting_alienwriting6" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="false" hideinmenus="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="9,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="250,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
       <StatusEffect target="This" type="OnSpawn" evententitytag="alienwriting4">
         <TriggerEvent identifier="alienwriting4" />
@@ -1261,7 +1261,7 @@
   </Item>
   <Item name="Alien writing: force alienwriting5 event" description="WHICH CAME FIRST - YOH-WEY, THE DEVOTED, THE ONES FROM THE SKY - THIS ONE DOES NOT KNOW, BUT IS SURELY ONE OF THE LAST, LEST THEY CAN QUENCH THE RADIANCE" nameidentifier="alienwriting" identifier="alienwriting_alienwriting7" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="false" hideinmenus="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="9,1587,241,156" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="250,1587,241,156" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
       <StatusEffect target="This" type="OnSpawn" evententitytag="alienwriting5">
         <TriggerEvent identifier="alienwriting5" />
@@ -1270,7 +1270,7 @@
   </Item>
   <Item name="Alien writing: force alienwriting6 event" description="THE RADIANCE OF THE GREAT SPHERE - DID WE NOT UNDERSTAND OR DID WE NOT [UNTRANSLATABLE?] - THE BRIDGE CALLS IT FORTH" nameidentifier="alienwriting" identifier="alienwriting_alienwriting8" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="false" hideinmenus="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="9,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="250,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
       <StatusEffect target="This" type="OnSpawn" evententitytag="alienwriting6">
         <TriggerEvent identifier="alienwriting6" />
@@ -1281,7 +1281,7 @@
   <Item name="" identifier="aliencoil" Tags="alien,aliencoil" category="Alien" damagedbyexplosions="true" damagedbymeleeweapons="true" damagedbyprojectiles="true" damagedbyrepairtools="true" health="300">
     <StaticBody width="176" height="301" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.55" sourcerect="513,1008,176,301" origin="0.5,0.5" />
-    <!--<LightComponent AllowInGameEditing="false" lightcolor="112,146,190,100" flicker="0.2" canbeselected="false" range="800.0" IsOn="true" />-->
+    <!--<LightComponent AllowInGameEditing="false" lightcolor="112,146,190,100" flicker="0.2" canbeselected="false" range="3200" IsOn="true" />-->
     <BrokenSprite name="aliencoil_broken" texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.56" sourcerect="1507,893,176,301" origin="0.5,0.5" fadein="false"/>
     <ElectricalDischarger duration="0.25" range="500" rangemultiplierinwalls="5" powerconsumption="100" minvoltage="0.0">
       <Attack targetimpulse="50">
@@ -1320,20 +1320,20 @@
         <sound file="Content/Items/Weapons/ElectricalDischarger.ogg" range="50000" dontmuffle="true" />
       </StatusEffect>
     </ConnectionPanel>
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" powerconsumption="1" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" powerconsumption="1" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="513,1315,176,301" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>  
   <Item name="" identifier="aliencoildecorative" nameidentifier="aliencoil" Tags="alien,aliencoil" category="Alien" hideinmenus="true">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.55" sourcerect="513,1008,176,301" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" powerconsumption="1" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" powerconsumption="1" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="513,1315,176,301" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="toxinsvent" aliases="alienvent" category="Alien" tags="alien,toxinsvent" scale="0.5" linkable="false" >
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Sprite texture="Content/Items/Alien/Legacy/AlienRuin_Legacy.png" depth="0.91" sourcerect="203,512,53,52" />
-    <LightComponent range="200" castshadows="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,100" pulsefrequency="0.3" pulseamount="0.2" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,100" pulsefrequency="0.3" pulseamount="0.2" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Items/Alien/Legacy/AlienRuin_Legacy.png" depth="0.91" sourcerect="203,512,53,52" />
       <sound file="Content/Items/Alien/AlienPump.ogg" type="OnActive" range="400.0" loop="true" />
       <StatusEffect type="OnActive" target="This">
@@ -1361,23 +1361,23 @@
   </Item>
   <Item name="" identifier="alienitemcontainersmall" category="Alien" tags="aliencontainer" linkable="true" pickdistance="150" scale="0.5">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.84" sourcerect="1,130,146,92" origin="0.5,0.5" />
-    <ItemContainer capacity="6" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="3">
+    <ItemContainer capacity="13" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="4">
       <GuiFrame relativesize="0.16,0.22" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem,alienartifact" />
+      <Containable items="smallitem,mediumitem,alienartifact,ammobox,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="alienitemcontainermedium" category="Alien" tags="aliencontainer" linkable="true" pickdistance="150" scale="0.5">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.84" sourcerect="1,0,176,129" origin="0.5,0.5" />
-    <ItemContainer capacity="8" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="4">
+    <ItemContainer capacity="18" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="5">
       <GuiFrame relativesize="0.2,0.22" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem,alienartifact" />
+      <Containable items="smallitem,mediumitem,alienartifact,ammobox,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="alienitemcontainerlarge" category="Alien" tags="aliencontainer" linkable="true" pickdistance="150" scale="0.5">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.84" sourcerect="289,0,252,216" origin="0.5,0.5" />
-    <ItemContainer capacity="12" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="4">
+    <ItemContainer capacity="26" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="6">
       <GuiFrame relativesize="0.2,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem,largeitem,alienartifact" />
+      <Containable items="smallitem,mediumitem,largeitem,alienartifact,ammobox,deepdiving" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="alienlightcomponent" category="Alien" Tags="smallitem,alienlight" cargocontaineridentifier="metalcrate">
@@ -1399,9 +1399,9 @@
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.84" sourcerect="0,1022,464,340" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1040,1022,464,340" depth="0.799" origin="0.5,0.5" scale="true" />
     <Body radius="150" bodytype="Static" />
-    <ItemContainer capacity="9" canbeselected="True" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="3" accessonlywhenbroken="true">
+    <ItemContainer capacity="20" canbeselected="True" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="5" accessonlywhenbroken="true">
       <GuiFrame relativesize="0.2,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       <StatusEffect Type="OnBroken" target="This">
         <ParticleEmitter particle="whitegoosplash" drawontop="true" particleamount="20" velocitymin="0" velocitymax="300" anglemin="0" anglemax="360" scalemin="0.5" scalemax="1" />
         <ParticleEmitter particle="damagebubbles" drawontop="true" particleamount="10" scalemin="0.5" scalemax="1" anglemin="45" anglemax="135" velocitymin="100" velocitymax="200" />
@@ -1414,7 +1414,7 @@
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.84" sourcerect="21,1367,395,395" origin="0.5,0.5" />
     <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="226,700,301,296" depth="0.78" origin="0.5,0.5" offset="0,-375" />
     <BrokenSprite name="gravitysphere_broken" texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.83" sourcerect="2048,2048,395,395" origin="0.5,0.5" fadein="false" />
-    <LightComponent range="600" lightcolor="140,197,180,111" IsOn="true" castshadows="true" allowingameediting="false" flicker="0.2" flickerspeed="5.0" pulsefrequency="0.2" pulseamount="0.4">
+    <LightComponent range="2400" lightcolor="140,197,180,111" IsOn="true" castshadows="true" allowingameediting="false" flicker="0.2" flickerspeed="5.0" pulsefrequency="0.2" pulseamount="0.4">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" origin="0.5,0.5" />
       <StatusEffect type="OnActive" target="This">
         <sound file="Content/Items/Alien/ALIEN_gravitySphereLoop.ogg" range="800.0" loop="true" dontmuffle="true" />
@@ -1481,8 +1481,8 @@
       <TerminalButton style="alienbuttonblue" Signal="1"/>
       <TerminalButton style="alienbuttonred" Signal="1"/>
     </ButtonTerminal>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true">
-      <Containable items="smallitem" />
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" hudpriority="10" locked="True" allowingameediting="False">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -1503,11 +1503,11 @@
       </StatusEffect>
       <StatusEffect type="OnBroken" target="Contained" Condition="-1000" setvalue="true" />
     </ConnectionPanel>
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="532,954,60,54" depth="0.1" origin="1.05,0.38" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" HasTag="smallalienartifact" conditionpercentage="gt 0" />
     </LightComponent>
-    <LightComponent range="1.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="4" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="534,878,157,76" depth="0.1" origin="0.5,0.5" alpha="0.7" />
       <IsActiveConditional targetitemcomponent="connectionpanel" conditionpercentage="gt 0" />
     </LightComponent>
@@ -1522,16 +1522,16 @@
   </Item>
   <Item name="" identifier="alientranslator" category="Alien" Tags="smallitem" cargocontaineridentifier="metalcrate" scale="0.25" impactsoundtag="impact_metal_light" hideinmenus="true">
     <Price baseprice="500" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.2" />
-      <Price storeidentifier="merchantcity" multiplier="0.2" />
-      <Price storeidentifier="merchantresearch" multiplier="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="0.6" />
+      <Price storeidentifier="merchantcity" multiplier="0.6" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
       <Price storeidentifier="merchantmilitary" multiplier="0.2 " />
       <Price storeidentifier="merchantmine" />
     </Price>
     <PreferredContainer primary="reactorcab" secondary="engcab" />
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="ruinstoragelarge" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="researchcontainer" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="ruinstoragelarge" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="researchcontainer" amount="2" spawnprobability="0.02" />
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="251,833,60,61" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="323,1950,90,90" depth="0.8" origin="0.5,0.5" />
     <Body width="90" height="90" density="8" />
@@ -1543,26 +1543,26 @@
   </Item>
   <Item name="" nameidentifier="RuinDecal1" identifier="ruinpipeconnection" description="" width="64" height="80" texturescale="0.5,0.5" scale="0.5" noninteractable="true" category="Alien">
     <sprite texture="Content/Map/AlienWallSet1.png" sourcerect="960,256,64,80" depth="0.9" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/AlienWallSet1.png" sourcerect="896,256,64,80" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Upgrade gameversion="0.15.9.0" noninteractable="true" />
   </Item>
   <Item name="" nameidentifier="RuinDecal1" identifier="ruinpipeconnectioncorner" description="" width="70" height="80" texturescale="0.5,0.5" scale="0.5" noninteractable="true" category="Alien">
     <sprite texture="Content/Map/AlienWallSet1.png" sourcerect="955,342,70,70" depth="0.9" premultiplyalpha="false" origin="0.55,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/AlienWallSet1.png" sourcerect="890,342,63,70" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" nameidentifier="RuinDecal1" identifier="ruindecalpulse1" width="64" height="80" texturescale="0.5,0.5" scale="0.5" noninteractable="true" category="Alien">
     <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="0,1,406,401" depth="0.9" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="111,111,255,33" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.25">
+    <LightComponent range="0" lightcolor="111,111,255,33" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.25">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="433,0,404,402" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="0.0" lightcolor="111,111,255,11" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.5">
+    <LightComponent range="0" lightcolor="111,111,255,11" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.5">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="836,1,406,405" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="0.0" lightcolor="111,111,255,11" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.6">
+    <LightComponent range="0" lightcolor="111,111,255,11" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.6">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1240,3,406,402" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Upgrade gameversion="0.15.9.0" noninteractable="true" />
@@ -1589,7 +1589,7 @@
       <!-- keep the AI target active when the item is active -->
       <StatusEffect type="OnActive" target="This" sightrange="5000" soundrange="5000" setvalue="true" />
     </ItemComponent>
-    <LightComponent range="200" lightcolor="255,62,62,255" IsOn="false" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
+    <LightComponent range="800" lightcolor="255,62,62,255" IsOn="false" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1704,504,338,658" origin="0.5,0.5" size="1,1" alpha="1.0" />
       <IsActive targetitemcomponent="TriggerComponent" triggeractive="true" />
     </LightComponent>
@@ -1670,7 +1670,7 @@
         <AITrigger state="Idle" duration="1" allowtobeoverridden="false" allowtooverride="true" />
       </StatusEffect>
     </ItemComponent>
-    <LightComponent range="200" lightcolor="255,62,62,255" IsOn="false" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
+    <LightComponent range="800" lightcolor="255,62,62,255" IsOn="false" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1704,504,338,658" origin="0.5,0.5" size="1,1" alpha="1.0" />
       <IsActive targetitemcomponent="TriggerComponent" hasstatustag="repairactive" />
     </LightComponent>
@@ -1715,19 +1715,19 @@
   </Item>
   <Item name="" identifier="alienlight1" nameidentifier="ruinlight" width="100" height="50" texturescale="1.0,1.0" scale="0.5" category="Alien" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1030,0,100,50" depth="0.94" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="150.0" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
+    <LightComponent range="600" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1030,62,100,50" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienlight2" nameidentifier="ruinlight" width="50" height="100" texturescale="1.0,1.0" scale="0.5" category="Alien" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1029,116,50,100" depth="0.94" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="150.0" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
+    <LightComponent range="600" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1080,116,50,100" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienlight3" nameidentifier="ruinlight" width="76" height="70" texturescale="1.0,1.0" scale="0.5" category="Alien" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1137,0,76,70" depth="0.94" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="150.0" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
+    <LightComponent range="600" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1218,0,76,70" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -1736,7 +1736,7 @@
     <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="21,1367,395,395" depth="0.75" origin="0.5,0.5" offset="0,0" scale="1.2" rotationspeed="300" />
     <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.7" origin="0.5,0.5" offset="0,0" rotationspeed="-350" />
     <AiTarget sonardisruption="1" sightrange="500" soundrange="100000" static="true" sonarlabel="entityname.anomaly" />
-    <LightComponent range="2048.0" lightcolor="255,200,15,255" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
+    <LightComponent range="8192" lightcolor="255,200,15,255" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
       <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.7" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This">
         <Sound file="Content/Items/Alien/AlienPump.ogg" range="20000" position="0,0" />
@@ -1762,7 +1762,7 @@
     <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="21,1367,395,395" depth="0.75" origin="0.5,0.5" offset="0,0" scale="1.2" rotationspeed="300" />
     <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.7" origin="0.5,0.5" offset="0,0" rotationspeed="-350" />
     <Body radius="20" bodytype="Static" />
-    <LightComponent range="2048.0" lightcolor="255,200,15,255" IsOn="true" castshadows="true" allowingameediting="false" flicker="1.0" flickerspeed="5" pulseamount="0.2" pulsefrequency="2">
+    <LightComponent range="8192" lightcolor="255,200,15,255" IsOn="true" castshadows="true" allowingameediting="false" flicker="1.0" flickerspeed="5" pulseamount="0.2" pulsefrequency="2">
       <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.7" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This">
         <Sound file="Content/Items/Alien/AlienPump.ogg" range="20000" position="0,0" />
@@ -1775,7 +1775,7 @@
         <Affliction identifier="hallucinating" strength="20" />
       </StatusEffect>
     </LightComponent>
-    <LightComponent range="2048.0" lightcolor="255,210,150,255" IsOn="true" castshadows="true" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.6" />    
+    <LightComponent range="8192" lightcolor="255,210,150,255" IsOn="true" castshadows="true" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.6" />    
   </Item>
   <Item name="submarinepusher" identifier="submarinepusher" texturescale="1.0,1.0" scale="5" category="Alien" spritecolor="255,255,255,100" noninteractable="true" hideinmenus="true">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.8" origin="0.5,0.5" offset="0,0" />
@@ -1799,7 +1799,7 @@
     <Sprite name="guardianpod" texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="912,385,210,210" depth="0.03" origin="0.5,0.5" />
     <BrokenSprite name="guardianpod_broken_gradual" texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="912,598,210,210" origin="0.5,0.5" depth="0.02" fadein="true" maxcondition="99" />
     <BrokenSprite name="guardianpod_broken" texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="912,598,210,210" origin="0.5,0.5" depth="0.01" fadein="false" />
-    <LightComponent range="200" lightcolor="255,62,62,255" IsOn="true" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
+    <LightComponent range="800" lightcolor="255,62,62,255" IsOn="true" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
       <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="912,813,210,210" origin="0.5,0.5" size="1,1" alpha="1.0" />
       <StatusEffect type="OnActive" target="This">
         <sound file="Content/Items/Alien/AlienArtifactLoop1.ogg" range="10000.0" loop="true" volume="0.1" frequencymultiplier="0.5" />
@@ -1909,15 +1909,15 @@
         <Remove />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" containedstateindicatorstyle="spear">
-      <Containable items="guardianspear" />
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="2" containedstateindicatorstyle="spear">
+      <Containable items="guardianspear,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item identifier="guardiansteamcannon" category="hidden" Tags="guardianweapon,guardiankey" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" nonplayerteaminteractable="True">
     <Sprite texture="Content/Characters/Fractalguardian/Fractalguardian.png" sourcerect="214,514,130,64" depth="0.55" origin="0.5,0.5" />
     <Body width="100" height="35" density="30" />
     <Holdable slots="Any,RightHand" controlpose="false" aimpos="120,0" handle1="-55,0" holdangle="0" usehandrotationforholdangle="true" msg="ItemMsgPickUpSelect" />
-    <RepairTool structurefixamount="0.0" range="500" barrelpos="45,0" fireprobability="0.0" spread="25">
+    <RepairTool structurefixamount="0.0" range="2000" barrelpos="45,0" fireprobability="0.0" spread="25">
       <ParticleEmitterHitCharacter particle="fleshsmoke" particlespersecond="3" anglemin="-5" anglemax="5" velocitymin="10" velocitymax="100" />
       <ParticleEmitter particle="steamspray" particlespersecond="80" anglemin="0" anglemax="0" velocitymin="300" velocitymax="500" highqualitycollisiondetection="true" />
       <ParticleEmitter particle="bubbles" particlespersecond="20" anglemin="-10" anglemax="10" scalemin="0.3" scalemax="0.7" velocitymin="5" velocitymax="100" copyentityangle="true" />
@@ -1935,7 +1935,7 @@
     <Sprite texture="AlienRuins_Items.png" depth="0.55" sourcerect="0,1776,185,96" origin="0.5,0.4" scale="0.5" />
     <Body width="85" height="40" density="15" />
     <Holdable slots="Any,RightHand" controlpose="false" aimpos="120,0" handle1="0,11" holdangle="0" usehandrotationforholdangle="true" msg="ItemMsgPickUpSelect" />
-    <RepairTool structurefixamount="-0.75" range="400" barrelpos="75,0" targetforce="50" repairmultiple="true" repairthroughwalls="true" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-20.0">
+    <RepairTool structurefixamount="-0.75" range="1600" barrelpos="75,0" targetforce="50" repairmultiple="true" repairthroughwalls="true" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-20.0">
       <Fixable identifier="structure" />
       <StatusEffect type="OnUse" targettype="UseTarget" targets="weldable" Stuck="-80.0" />
       <!--Damage doors-->
@@ -1952,7 +1952,7 @@
         <Affliction identifier="radiationsickness" amount="25" />
       </StatusEffect>
       <sound file="Content/Items/Alien/alienweapon.ogg" type="OnUse" range="800.0" loop="true" />
-      <LightComponent AllowInGameEditing="false" LightColor="0.8,0.7,1.0,1.0" Flicker="0.5" range="500">
+      <LightComponent AllowInGameEditing="false" LightColor="0.8,0.7,1.0,1.0" Flicker="0.5" range="2000">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5" />
       </LightComponent>
       <!-- remove if the weapon ends up outside the guardian's inventory (arm severed?) -->
@@ -2057,8 +2057,8 @@
         <Remove />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" canbeselected="false" characterusable="true">
-      <Containable items="alienturretammoemp" />
+    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="2" canbeselected="false" characterusable="true">
+      <Containable items="alienturretammoemp,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="acidemitter" identifier="acidemitter" Scale="1" tags="" sonarsize="0" hideinmenus="true" impacttolerance="0.001" health="30">
@@ -2161,7 +2161,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,200,255,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,200,255,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Characters/Spineling/Spineling.png" sourcerect="0,230,180,23" origin="0.5,0.6" alpha="0.5" />
     </LightComponent>
   </Item>
@@ -2179,7 +2179,7 @@
         <Affliction identifier="morbusinepoisoning" strength="3" probability="0.1" />
       </Attack>
     </Projectile>
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,255,200,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,255,200,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Characters/Spineling_morbusine/Spineling_morbusine.png" sourcerect="0,230,180,23" origin="0.5,0.6" alpha="0.5" />
     </LightComponent>
   </Item>
@@ -2216,7 +2216,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent range="400" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="255,255,255,30" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="1600" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="255,255,255,30" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Characters/Spineling_giant/Spineling_giant.png" sourcerect="0,940,720,72" origin="0.55,0.5" alpha="0.5" />
     </LightComponent>
   </Item>
@@ -2249,7 +2249,7 @@
         </Explosion>
       </StatusEffect>
     </Holdable>
-    <LightComponent range="20" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="80" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="327,165,35,38" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <aitarget sightrange="1000" static="true" />
@@ -2290,7 +2290,7 @@
         </Explosion>
       </StatusEffect>
     </Projectile>
-    <LightComponent range="20" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="80" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="327,165,35,38" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -2412,23 +2412,23 @@
     <Sprite name="alienstoragevat" texture="Content/Items/Alien/AlienRuins_Items_02.png" depth="0.8" sourcerect="397,456,168,172" origin="0.5,0.5" />
     <BrokenSprite name="alienstoragevat_broken" texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="567,456,168,172" depth="0.799" origin="0.5,0.5" scale="true" />
     <Body width="150" height="150" bodytype="static"/>
-    <ItemContainer capacity="4" slotsperrow="2" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" accessonlywhenbroken="true">
+    <ItemContainer capacity="9" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" accessonlywhenbroken="true">
       <GuiFrame relativesize="0.18,0.25" anchor="Center" style="ItemUI"/>
-      <Containable items="smallitem,mediumitem"/>
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem"/>
       <StatusEffect type="OnBroken" target="this">
         <ParticleEmitter particle="whitegoosplash" drawontop="true" particleamount="20" velocitymin="0" velocitymax="300" anglemin="0" anglemax="360" scalemin="0.5" scalemax="1"/>
         <ParticleEmitter particle="damagebubbles" drawontop="true" particleamount="10" scalemin="0.5" scalemax="1" anglemin="45" anglemax="135" velocitymin="100" velocitymax="200"/>
         <Sound file="Content/Map/Thalamus/Sounds/CARRIER_organs2.ogg" range="500" volume="0.2"/>
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="748,465,162,155" origin="0.5,0.5" alpha="0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliencurrentgenerator" category="Alien" Tags="alien" scale="0.5" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbyrepairtools="true" damagedbymeleeweapons="true" health="300">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" depth="0.8" sourcerect="1856,0,171,447" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="1856,459,171,447" depth="0.799" origin="0.5,0.5" scale="true" />
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="1858,929,168,439" origin="0.5,0.5" alpha="0.5" />
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="bubbles" copyentityangle="true" VelocityMin="500" VelocityMax="550" ScaleMax="1.5" ParticlesPerSecond="100" LifeTimeMultiplier="1.2" />
@@ -2470,16 +2470,16 @@
     <Sprite name="assemblydevice_bubble" texture="Content/Items/Alien/AlienRuins_Items_02.png" depth="0.79" sourcerect="2,8,151,154" origin="0.5,0.5" />
     <BrokenSprite name="assemblydevice_bubble_broken" texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="173,8,151,154" depth="0.78" origin="0.5,0.5" scale="true" />
     <TriggerComponent radius="80" triggeredby="Item" sensor="false" />
-    <ItemContainer capacity="4" slotsperrow="2" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" accessonlywhenbroken="true">
+    <ItemContainer capacity="9" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" accessonlywhenbroken="true">
       <GuiFrame relativesize="0.18,0.25" anchor="Center" style="ItemUI"/>
-      <Containable items="smallitem,mediumitem"/>
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem"/>
       <StatusEffect type="OnBroken" target="this">
         <ParticleEmitter particle="whitegoosplash" drawontop="true" particleamount="20" velocitymin="0" velocitymax="300" anglemin="0" anglemax="360" scalemin="0.5" scalemax="1"/>
         <ParticleEmitter particle="damagebubbles" drawontop="true" particleamount="10" scalemin="0.5" scalemax="1" anglemin="45" anglemax="135" velocitymin="100" velocitymax="200"/>
         <Sound file="Content/Map/Thalamus/Sounds/CARRIER_organs2.ogg" range="500" volume="0.2"/>
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="84,184,131,200" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="84,184,131,200" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite name="alienassemblydevice_bubble_light" texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="2,177,151,154" origin="0.48,0.48" alpha="0.3" />
       <IsActiveConditional targetitemcomponent="Itemcontainer" isBroken="false"/>
     </LightComponent>
@@ -2488,7 +2488,7 @@
     <Sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" depth="0.8" sourcerect="383,15,475,414" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="863,15,475,414" depth="0.799" origin="0.5,0.5" scale="true" />
     <Body width="450" height="400" bodytype="Static" />   
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" pulsefrequency="0.3" pulseamount="0.2" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" pulsefrequency="0.3" pulseamount="0.2" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="1348,15,475,414" origin="0.5,0.5" alpha="0.5" />
     </LightComponent>
     <ConnectionPanel canbeselected="true" hudpriority="10" locked="True" allowingameediting="False">
@@ -2549,24 +2549,24 @@
     <DecorativeSprite name="aliensample2" texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.95" sourcerect="1766,1700,272,174" origin="0.5,0.5" randomgroupid="1" offset="30,30" offsetanim="Noise" rotationanim="Noise" rotation="25" rotationspeed="0.1" offsetanimspeed="0.02" />
     <DecorativeSprite name="aliensample3" texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.95" sourcerect="1304,1861,246,177" origin="0.5,0.5" randomgroupid="1" offset="30,30" offsetanim="Noise" rotationanim="Noise" rotation="25" rotationspeed="0.1" offsetanimspeed="0.02" />
     <DecorativeSprite name="aliensample4" texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.95" sourcerect="1889,1204,159,158" origin="0.5,0.5" randomgroupid="1" offset="30,30" offsetanim="Noise" rotationanim="Noise" rotation="25" rotationspeed="0.1" offsetanimspeed="0.02" />
-    <LightComponent range="512" lightcolor="255,255,255,128" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="2048" lightcolor="255,255,255,128" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1504,1456,421,235" depth="0.97" premultiplyalpha="false" origin="0.5,0.59" />
     </LightComponent>
-    <ItemContainer capacity="4" canbeselected="True" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="2" accessonlywhenbroken="false">
+    <ItemContainer capacity="9" canbeselected="True" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="3" accessonlywhenbroken="false">
       <GuiFrame relativesize="0.18,0.25" anchor="Center" style="ItemUI"/>
-      <Containable items="smallitem,mediumitem"/>
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem"/>
     </ItemContainer>
   </Item>
   <Item name="" identifier="joviansystemhologram" category="Alien" Tags="alien" scale="1.0" noninteractable="true" spritecolor="175,125,255">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items_03.png" sourcerect="0,0,10,10" depth="0.5" origin="0.5,0.5" />
     
-    <LightComponent range="150" castshadows="False" drawbehindsubs="False" ison="True" pulsefrequency="0.2" pulseamount="0.2" blinkfrequency="0" lightcolor="200,200,255,255" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="600" castshadows="False" drawbehindsubs="False" ison="True" pulsefrequency="0.2" pulseamount="0.2" blinkfrequency="0" lightcolor="200,200,255,255" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This">
         <ParticleEmitter particle="hologramsphere" particlespersecond="25" scalemultiplier="0.5,0.5"/>
       </StatusEffect>
     </LightComponent>
-    <LightComponent range="300" castshadows="False" drawbehindsubs="False" ison="True" pulsefrequency="0.3" pulseamount="0.8" blinkfrequency="0" lightcolor="200,200,255,255" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="1200" castshadows="False" drawbehindsubs="False" ison="True" pulsefrequency="0.3" pulseamount="0.8" blinkfrequency="0" lightcolor="200,200,255,255" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     
@@ -2592,90 +2592,90 @@
   
   <Item name="" identifier="aliensymbol01" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol02" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol03" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol04" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol05" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol06" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol07" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol08" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol09" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol10" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol11" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol12" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
 
   <Item name="" identifier="aliengenerator" category="Legacy" Tags="alien,aliengenerator" scale="0.3">
     <Sprite texture="Content/Items/Alien/Legacy/AlienRuin_Legacy.png" depth="0.8" sourcerect="512,0,512,573" />
-    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,50" canbeselected="false" range="800.0" IsOn="true">
+    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,50" canbeselected="false" range="3200" IsOn="true">
       <Sprite texture="Content/Items/Alien/Legacy/AlienRuin_Legacy.png" sourcerect="0,486,176,176" origin="0.47, 0.3" alpha="1.0" />
     </LightComponent>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" itempos="264,-321" containedspritedepth="0.01" autointeractwithcontained="true">
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" itempos="264,-321" containedspritedepth="0.01" autointeractwithcontained="true">
       <GuiFrame relativesize="0.11,0.17" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <StatusEffect type="Always" target="This" Charge="-10.0" />
-      <Containable items="alienpowercell">
+      <Containable items="alienpowercell,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" Charge="100.0" setvalue="true" />
       </Containable>
     </ItemContainer>
-    <PowerContainer capacity="10.0" canbeselected="false" maxrechargespeed="1000.0" maxoutput="10000.0" />
+    <PowerContainer capacity="22" canbeselected="false" maxrechargespeed="1000.0" maxoutput="10000.0" />
     <ConnectionPanel canbeselected="true" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
@@ -2689,8 +2689,8 @@
 
   <Item name="" identifier="alienturret" category="Legacy" Tags="turret,alien" scale="0.5" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbyrepairtools="true" damagedbymeleeweapons="true" health="1000">
     <Sprite texture="Content/Items/Alien/EndRuin_Items.png" depth="0.4" sourcerect="384,768,455,256" canflipy="false" />
-    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" canbeselected="false" characterusable="true">
-      <Containable items="alienturretammo" />
+    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="2" canbeselected="false" characterusable="true">
+      <Containable items="alienturretammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!-- when the turret is fired, it triggers this statuseffect and spawns new ammo -->
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="alienturretammo" spawnposition="ThisInventory" />
@@ -2719,7 +2719,7 @@
       <TerminalButton style="alienbuttonred" />
     </ButtonTerminal>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true">
-      <Containable items="smallitem" />
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -2727,7 +2727,7 @@
       <output name="signal_out1" displayname="connection.signaloutx~[num]=1" />
       <output name="signal_out2" displayname="connection.signaloutx~[num]=2" />
     </ConnectionPanel>
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="532,878,160,79" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
diff --git a/Content/Items/Assemblies/AlienChestLarge.xml b/Content/Items/Assemblies/AlienChestLarge.xml
index 5151beec..60a04e63 100644
--- a/Content/Items/Assemblies/AlienChestLarge.xml
+++ b/Content/Items/Assemblies/AlienChestLarge.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ItemAssembly name="AlienChestLarge" description="" hideinmenus="true">
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="2" rect="-18,58,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="1">
-    <LightComponent range="80" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,165" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="320" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,165" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/AlienChestSmall.xml b/Content/Items/Assemblies/AlienChestSmall.xml
index b31484b8..16d75869 100644
--- a/Content/Items/Assemblies/AlienChestSmall.xml
+++ b/Content/Items/Assemblies/AlienChestSmall.xml
@@ -4,7 +4,7 @@
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="0,0,0,0,0" />
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="3" rect="-18,42,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="1">
-    <LightComponent range="80" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,165" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="320" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,165" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/AlienDoorAssembly2.xml b/Content/Items/Assemblies/AlienDoorAssembly2.xml
index 4cd5a5de..5ba20c42 100644
--- a/Content/Items/Assemblies/AlienDoorAssembly2.xml
+++ b/Content/Items/Assemblies/AlienDoorAssembly2.xml
@@ -325,7 +325,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="43" rect="175,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -336,7 +336,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="42" rect="239,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -347,7 +347,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="41" rect="-272,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -358,7 +358,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="39" rect="-208,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -369,7 +369,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="38" rect="-144,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -380,7 +380,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="37" rect="112,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/AlienDoorAssembly5.xml b/Content/Items/Assemblies/AlienDoorAssembly5.xml
index f18dcffe..0188f6ab 100644
--- a/Content/Items/Assemblies/AlienDoorAssembly5.xml
+++ b/Content/Items/Assemblies/AlienDoorAssembly5.xml
@@ -143,7 +143,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="28" rect="64,84,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -154,7 +154,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="27" rect="-96,63,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -165,7 +165,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="26" rect="64,63,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -176,7 +176,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="25" rect="-96,84,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/AlienGeneratorCharged.xml b/Content/Items/Assemblies/AlienGeneratorCharged.xml
index 207866fc..ef10ded4 100644
--- a/Content/Items/Assemblies/AlienGeneratorCharged.xml
+++ b/Content/Items/Assemblies/AlienGeneratorCharged.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ItemAssembly name="ChargedAlienGenerator" description="" hideinmenus="true">
   <Item name="Alien Power Cell" identifier="alienpowercell" ID="5" rect="-134,-121,12,15" description="" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.7" scale="0.3" hideinassemblypreview="true">
-    <LightComponent range="100" castshadows="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="400" castshadows="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Holdable holdpos="0,-15" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="" />
   </Item>
   <Item name="Alien Generator" identifier="aliengenerator_new" ID="4" rect="-64,96,153,171" description="" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.3">
-    <LightComponent range="800" castshadows="True" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="3200" castshadows="True" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <ItemContainer pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="5" />
-    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="10" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="22" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <ConnectionPanel locked="False" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem identifiers="screwdriver" type="Equipped" msg="" />
       <input name="shutdown" />
diff --git a/Content/Items/Assemblies/AlienHatchAssembly.xml b/Content/Items/Assemblies/AlienHatchAssembly.xml
index c7b427e3..a731fb45 100644
--- a/Content/Items/Assemblies/AlienHatchAssembly.xml
+++ b/Content/Items/Assemblies/AlienHatchAssembly.xml
@@ -8,7 +8,7 @@
         <link w="14" />
       </output>
     </ConnectionPanel>
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
   </Item>
   <Item name="" identifier="alienbutton" ID="6" rect="-17,112,24,27" noninteractable="False" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,alien,alienbutton" displaysidebysidewhenlinked="False" spritedepth="0.8" hiddeningame="False">
     <Controller istoggle="False" pickingtime="0" canbepicked="True" allowingameediting="False" msg="itemmsgpressselect" />
@@ -18,7 +18,7 @@
         <link w="13" />
       </output>
     </ConnectionPanel>
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
   </Item>
   <Item name="" identifier="blackwire" ID="14" rect="50040,-70086,48,20" noninteractable="False" scale="0.5" spritecolor="49,49,49,255" inventoryiconcolor="49,49,49,255" containercolor="255,255,255,255" condition="100" tags="smallitem,wire" displaysidebysidewhenlinked="False" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="" />
diff --git a/Content/Items/Assemblies/AlienPumpAssembly.xml b/Content/Items/Assemblies/AlienPumpAssembly.xml
index 753e73cc..9a5f173f 100644
--- a/Content/Items/Assemblies/AlienPumpAssembly.xml
+++ b/Content/Items/Assemblies/AlienPumpAssembly.xml
@@ -17,13 +17,13 @@
     </Repairable>
   </Item>
   <Item name="Alien Power Cell" identifier="alienpowercell" ID="4" rect="5722,-745,12,15" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien,smallitem" displaysidebysidewhenlinked="False" spritedepth="0.7" scale="0.3" hideinassemblypreview="true">
-    <LightComponent range="100" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="400" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Holdable holdpos="0,-15" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="" />
   </Item>
   <Item name="Alien Generator" identifier="aliengenerator_new" ID="3" rect="63,80,153,171" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.3">
-    <LightComponent range="800" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="3200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ItemContainer itempos="264,-321" iteminterval="0,0" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" contained="4" />
-    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="10" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="22" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="shutdown" />
diff --git a/Content/Items/Assemblies/AlienPumpAssembly1.xml b/Content/Items/Assemblies/AlienPumpAssembly1.xml
index 49975aa7..86f69209 100644
--- a/Content/Items/Assemblies/AlienPumpAssembly1.xml
+++ b/Content/Items/Assemblies/AlienPumpAssembly1.xml
@@ -22,13 +22,13 @@
     </Repairable>
   </Item>
   <Item name="Alien Power Cell" identifier="alienpowercell" ID="6" rect="5722,-713,12,15" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien,smallitem" displaysidebysidewhenlinked="False" spritedepth="0.7" scale="0.3" hideinassemblypreview="true">
-    <LightComponent range="100" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="400" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Holdable holdpos="0,-15" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="" />
   </Item>
   <Item name="Alien Generator" identifier="aliengenerator_new" ID="3" rect="79,80,153,171" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.3">
-    <LightComponent range="800" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="3200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ItemContainer itempos="264,-321" iteminterval="0,0" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" contained="6" />
-    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="10" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="22" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="shutdown" />
@@ -179,7 +179,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="12" rect="-112,127,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="1">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/AlienPumpAssembly2.xml b/Content/Items/Assemblies/AlienPumpAssembly2.xml
index b3ed9c5b..419ca76d 100644
--- a/Content/Items/Assemblies/AlienPumpAssembly2.xml
+++ b/Content/Items/Assemblies/AlienPumpAssembly2.xml
@@ -22,9 +22,9 @@
     </Repairable>
   </Item>
   <Item name="Alien Generator" identifier="aliengenerator_new" ID="5" rect="79,80,153,171" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.3">
-    <LightComponent range="800" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="3200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ItemContainer itempos="264,-321" iteminterval="0,0" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" contained="0" />
-    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="10" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="22" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="shutdown" />
@@ -175,7 +175,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="24" rect="-112,127,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="1">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/DivingGearCabinetLarge.xml b/Content/Items/Assemblies/DivingGearCabinetLarge.xml
index 5208f821..acbcc5b9 100644
--- a/Content/Items/Assemblies/DivingGearCabinetLarge.xml
+++ b/Content/Items/Assemblies/DivingGearCabinetLarge.xml
@@ -4,24 +4,24 @@
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="ItemMsgInteractSelect" contained="93,95,97,99,101,102,103,104,105,106,107,108,109,110,111,112,113,115,117,119,121,122,123,124,125,127,129,131,133,135" />
   </Item>
   <Item name="" identifier="flashlight" ID="135" rect="50052,-15092,24,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,tool,provocative,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.02" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="127,127,127,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.02" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="127,127,127,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Holdable holdpos="29.999998,-14.999999" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="136" />
   </Item>
   <Item name="" identifier="flashlight" ID="133" rect="50052,-15092,24,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,tool,provocative,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.02" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="127,127,127,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.02" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="127,127,127,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Holdable holdpos="29.999998,-14.999999" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="134" />
   </Item>
   <Item name="" identifier="sonarbeacon" ID="131" rect="50057,-15080,14,32" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" sonarlabel="Sonar Beacon" condition="100" tags="smallitem,sonar,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="30" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="50" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="2" lightcolor="0,255,0,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="200" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="2" lightcolor="0,255,0,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <CustomInterface labels="sonarbeacon.beaconactive,sonarbeacon.beaconsignal" signals="1;1" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="132" />
   </Item>
   <Item name="" identifier="sonarbeacon" ID="129" rect="50057,-15080,14,32" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" sonarlabel="Sonar Beacon" condition="100" tags="smallitem,sonar,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="30" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="50" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="2" lightcolor="0,255,0,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="200" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="2" lightcolor="0,255,0,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <CustomInterface labels="sonarbeacon.beaconactive,sonarbeacon.beaconsignal" signals="1;1" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="130" />
   </Item>
@@ -37,19 +37,19 @@
   </Item>
   <Item name="" identifier="flare" ID="124" rect="50051,-15092,27,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light,provocative" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
   </Item>
   <Item name="" identifier="flare" ID="123" rect="50051,-15092,27,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light,provocative" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
   </Item>
   <Item name="" identifier="flare" ID="122" rect="50051,-15092,27,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light,provocative" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
   </Item>
   <Item name="" identifier="flare" ID="121" rect="50051,-15092,27,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light,provocative" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
   </Item>
   <Item name="" identifier="oxygentank" ID="106" rect="50058,-15080,12,33" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,oxygensource" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="29.999998,-14.999999" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
@@ -147,7 +147,7 @@
   </Item>
   <Item name="" identifier="underwaterscooter" ID="119" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
@@ -155,7 +155,7 @@
   </Item>
   <Item name="" identifier="underwaterscooter" ID="117" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
@@ -163,7 +163,7 @@
   </Item>
   <Item name="" identifier="underwaterscooter" ID="115" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
@@ -171,7 +171,7 @@
   </Item>
   <Item name="" identifier="underwaterscooter" ID="113" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
diff --git a/Content/Items/Assemblies/DivingGearCabinetSmall.xml b/Content/Items/Assemblies/DivingGearCabinetSmall.xml
index 4f8e4dc2..a1f69190 100644
--- a/Content/Items/Assemblies/DivingGearCabinetSmall.xml
+++ b/Content/Items/Assemblies/DivingGearCabinetSmall.xml
@@ -21,23 +21,23 @@
   </Item>
   <Item name="Flare" identifier="flare" ID="53" rect="227,-124,27,9" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
   </Item>
   <Item name="Flare" identifier="flare" ID="52" rect="227,-124,27,9" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
   </Item>
   <Item name="Flare" identifier="flare" ID="51" rect="227,-124,27,9" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
   </Item>
   <Item name="Flare" identifier="flare" ID="50" rect="227,-124,27,9" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
   </Item>
   <Item name="Flare" identifier="flare" ID="49" rect="227,-124,27,9" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
   </Item>
   <Item name="Handheld Sonar" identifier="handheldsonar" ID="47" rect="229,-123,22,11" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,sonar" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="30" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
@@ -81,7 +81,7 @@
   </Item>
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="45" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
     <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
@@ -89,7 +89,7 @@
   </Item>
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="43" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
     <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
@@ -97,7 +97,7 @@
   </Item>
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="35" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
     <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
@@ -105,7 +105,7 @@
   </Item>
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="33" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
     <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
diff --git a/Content/Items/Assemblies/DivingSuitLocker.xml b/Content/Items/Assemblies/DivingSuitLocker.xml
index 1714f24b..7bff9fcc 100644
--- a/Content/Items/Assemblies/DivingSuitLocker.xml
+++ b/Content/Items/Assemblies/DivingSuitLocker.xml
@@ -19,8 +19,8 @@
     <Holdable holdpos="30,-15" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
   </Item>
   <Item name="Diving Suit" identifier="divingsuit" ID="14" rect="-15,-116,63,56" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="diving,divingsuit,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
-    <LightComponent range="200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="250,224,165,255" isactive="True" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
-    <LightComponent range="200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="250,224,165,255" isactive="True" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="800" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="250,224,165,255" isactive="True" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="800" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="250,224,165,255" isactive="True" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Wearable pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgEquipSelect" />
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="15" />
   </Item>
diff --git a/Content/Items/Button/button.xml b/Content/Items/Button/button.xml
index 96d3e523..28d1a343 100644
--- a/Content/Items/Button/button.xml
+++ b/Content/Items/Button/button.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="button" category="Electrical" tags="smallitem,button" allowedlinks="door" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="8">
+  <Item name="" identifier="button" category="Electrical" tags="smallitem,button" allowedlinks="door" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="16">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="engcab"/>
-    <Price baseprice="125" minavailable="4">
+    <Price baseprice="125" minavailable="12">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <Sprite texture="button.png" sourcerect="28,70,34,51" depth="0.8" origin="0.5,0.5" />
     <Deconstruct time="10">
@@ -35,16 +35,16 @@
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
     </Holdable>
   </Item>
-  <Item name="" identifier="switch" category="Electrical" tags="smallitem,switch" allowedlinks="door" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="8">
+  <Item name="" identifier="switch" category="Electrical" tags="smallitem,switch" allowedlinks="door" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="16">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="engcab"/>
-    <Price baseprice="125" minavailable="4">
+    <Price baseprice="125" minavailable="12">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="10"/>
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="30"/>
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="448,192,64,64" origin="0.5,0.5" />
     <Sprite texture="button.png" sourcerect="4,49,22,40" depth="0.79" origin="0.5,0.5" />
@@ -61,11 +61,11 @@
       <sound file="Content/Items/Button/Switch1.ogg" type="OnUse" range="250.0" />
       <sound file="Content/Items/Button/Switch2.ogg" type="OnUse" range="250.0" />
     </Controller>
-      <LightComponent range="10.0" lightcolor="50,255,50,0" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="50,255,50,0" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
         <sprite texture="Content/Items/Button/button.png" sourcerect="4,9,22,40" depth="0.1" origin="0.5,0.5" alpha="1.0" />
         <IsActive targetitemcomponent="Controller" State="eq True" />
       </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,50,50,0" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,50,50,0" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Button/button.png" sourcerect="4,89,22,40" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="Controller" State="eq False" />
     </LightComponent>
@@ -80,13 +80,13 @@
   </Item>
   <Item name="" identifier="lever" category="Electrical" tags="smallitem,switch" allowedlinks="door" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <PreferredContainer primary="engcab"/>
-    <Price baseprice="125" minavailable="4">
+    <Price baseprice="125" minavailable="12">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="10"/>
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="30"/>
     </Price>
     <Sprite texture="button.png" sourcerect="64,1,63,62" depth="0.79" origin="0.5,0.5" />
     <Deconstruct time="10">
diff --git a/Content/Items/Command/command.xml b/Content/Items/Command/command.xml
index 04a3de35..42aa01a6 100644
--- a/Content/Items/Command/command.xml
+++ b/Content/Items/Command/command.xml
@@ -14,11 +14,11 @@
       <MaintainPosIndicator texture="Content/Items/Command/NavUI.png" sourcerect="50,0,60,61" />
       <MaintainPosOriginIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,0,50,54" />
       <SteeringIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,135,362,16" origin="0,0.5"/>
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,0,384,304" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="400,0,384,304" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
@@ -105,7 +105,7 @@
     <Sprite texture="Content/Items/Command/CommandDevices.png" depth="0.8" sourcerect="400,0,288,240" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,256,288,240" depth="0.8" maxcondition="80" fadein="true" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,512,288,240" depth="0.8" maxcondition="0" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="256,320,288,240" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -224,10 +224,10 @@
       <icon identifier="location" texture="Content/UI/MainIconsAtlas.png" sourcerect="349,435,11,11" origin="0.5,0.5"/>
       <icon identifier="mineral" texture="Content/UI/MainIconsAtlas.png" sourcerect="336,434,7,12" origin="0.5,0.5"/>
       <icon identifier="" texture="Content/UI/MainIconsAtlas.png" sourcerect="346,416,4,4" origin="0.5,0.5"/>
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,0,384,212" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="400,0,384,212" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
     </Sonar>
@@ -271,7 +271,7 @@
     <Sprite texture="Content/Items/Command/CommandDevices.png" sourcerect="700,0,160,128" depth="0.8" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="700,124,160,128" depth="0.8" maxcondition="80" fadein="true" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="856,0,160,128" depth="0.8" maxcondition="0" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,320,160,128" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -368,7 +368,7 @@
       <Button text="label.previouscamera" connection="prev_camera" signal="-1" />
       <Button text="label.nextcamera" connection="next_camera" signal="1" />
     </CustomInterface>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
       <sprite texture="Content/Items/Command/CommandDevices.png" depth="0.025" sourcerect="707,763,279,160" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
diff --git a/Content/Items/Containers/containers.xml b/Content/Items/Containers/containers.xml
index d94001f2..ff8eb114 100644
--- a/Content/Items/Containers/containers.xml
+++ b/Content/Items/Containers/containers.xml
@@ -2,68 +2,68 @@
 <Items>
   <Item name="" identifier="suppliescabinet" tags="container,suppliescontainer" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="889,349,120,132" origin="0.5,0.5" />
-    <ItemContainer capacity="6" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="13" slotsperrow="4" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.16,0.22" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
     </ItemContainer>
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
     <Upgrade gameversion="1.1.0.0" campaignsaveonly="true">
       <ItemContainer>
-        <Containable items="smallitem,mediumitem" />
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
         <ClearSubContainerRestrictions />
       </ItemContainer>
     </Upgrade>
   </Item>
   <Item name="" identifier="mediumsteelcabinet" tags="locker,container" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="1,1,175,374" origin="0.5,0.5" />
-    <ItemContainer capacity="20" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="44" slotsperrow="7" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="3" maxstacksize="1">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
+      <SubContainer capacity="7" maxstacksize="2">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
     <Upgrade gameversion="1.1.0.0" campaignsaveonly="true">
       <ItemContainer>
-        <Containable items="smallitem,mediumitem" />
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
         <ClearSubContainerRestrictions />
       </ItemContainer>
     </Upgrade>
   </Item>
   <Item name="" aliases="Diving Gear Cabinet" identifier="mediumwindowedsteelcabinet" category="Diving" tags="locker,container" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="178,1,168,377" origin="0.5,0.5" />
-    <ItemContainer capacity="20" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="44" slotsperrow="7" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="3" maxstacksize="1">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
+      <SubContainer capacity="7" maxstacksize="2">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
     <Upgrade gameversion="1.1.0.0" campaignsaveonly="true">
       <ItemContainer>
-        <Containable items="smallitem,mediumitem" />
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
         <ClearSubContainerRestrictions />
       </ItemContainer>
     </Upgrade>
   </Item>
   <Item name="" identifier="steelcabinet" tags="locker,container" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="348,2,364,373" origin="0.5,0.5" />
-    <ItemContainer capacity="35" slotsperrow="7" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="77" slotsperrow="9" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.28,0.48" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="5" maxstacksize="1">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
+      <SubContainer capacity="11" maxstacksize="2">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
     <Upgrade gameversion="1.1.0.0" campaignsaveonly="true">
       <ItemContainer>
-        <Containable items="smallitem,mediumitem" />
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
         <ClearSubContainerRestrictions />
       </ItemContainer>
     </Upgrade>
@@ -71,81 +71,81 @@
   <!-- TODO: switch to SecureSteelLockRed.png when access denied and SecureSteelLockGreen.png when access granted-->
   <Item name="" identifier="securesteelcabinet" tags="locker,container,securecontainer" linkable="true" spritecolor="255,255,255,255" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="1,380,105,160" origin="0.5,0.5" />
-    <ItemContainer capacity="20" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="44" slotsperrow="7" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <RequiredItem items="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="3" maxstacksize="1">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
+      <SubContainer capacity="7" maxstacksize="2">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
     <Upgrade gameversion="1.1.0.0" campaignsaveonly="true">
       <ItemContainer>
-        <Containable items="smallitem,mediumitem" />
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
         <ClearSubContainerRestrictions />
       </ItemContainer>
     </Upgrade>
   </Item>
   <Item name="" identifier="railgunshellrack" tags="container,railgunammocontainer" pickdistance="120" scale="0.5" canflipx="false" canflipy="false">
     <Sprite texture="containers.png" depth="0.84" sourcerect="330,811,218,212" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="6" slotsperrow="6" itempos="32,-100" iteminterval="30,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="13" slotsperrow="4" itempos="32,-100" iteminterval="30,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect">
       <Upgrade gameversion="0.18.0.0" itempos="32,-100" iteminterval="30,0" />
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="railgunammo" />
+      <Containable items="railgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="railgunshellrack3" nameidentifier="railgunshellrack" category="Legacy" tags="container,railgunammocontainer" pickdistance="120" scale="0.5" canflipx="false" canflipy="false">
     <Sprite texture="containers.png" depth="0.84" sourcerect="330,811,218,212" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="3" slotsperrow="3" itempos="53,-100" iteminterval="55,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="7" slotsperrow="3" itempos="53,-100" iteminterval="55,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="railgunammo" />
+      <Containable items="railgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="coilgunammoshelf" tags="container,ammoboxcontainer" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="188,717,140,306" canflipx="false" origin="0.5,0.5" />
-    <ItemContainer capacity="3" canbeselected="true" hideitems="false" itempos="70,-52" iteminterval="0,-96" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="7" canbeselected="true" hideitems="false" itempos="70,-52" iteminterval="0,-96" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="ammobox,coilgunammo,depthchargeammo"  excludedidentifiers="boardingpod" />
+      <Containable items="ammobox,coilgunammo,depthchargeammo,deepdiving,smallitem,mediumitem,largeitem"  excludedidentifiers="boardingpod" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="medcabinet" tags="container,medcontainer" category="Medical" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="815,1,208,346" />
-    <ItemContainer capacity="35" slotsperrow="7" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="77" slotsperrow="9" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.28,0.48" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="5" maxstacksize="1">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
+      <SubContainer capacity="11" maxstacksize="2">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
     <Upgrade gameversion="1.1.0.0" campaignsaveonly="true">
       <ItemContainer>
-        <Containable items="smallitem,mediumitem" />
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
         <ClearSubContainerRestrictions />
       </ItemContainer>
     </Upgrade>
   </Item>
   <Item name="" identifier="toxcabinet" tags="container,toxcontainer" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="889,483,125,148" origin="0.5,0.5" />
-    <ItemContainer capacity="20" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="44" slotsperrow="7" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <RequiredItem items="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="3" maxstacksize="1">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
+      <SubContainer capacity="7" maxstacksize="2">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
     <Upgrade gameversion="1.1.0.0" campaignsaveonly="true">
       <ItemContainer>
-        <Containable items="smallitem,mediumitem" />
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
         <ClearSubContainerRestrictions />
       </ItemContainer>
     </Upgrade>
@@ -160,10 +160,10 @@
     <!-- TODO: implement
     <DecorativeSprite name="Diving Suit Locker Light" texture="DivingSuitLocker.png" depth="0.84" sourcerect="330,77,241,67" origin="0.5,0.5" />
     -->
-    <ItemContainer hideitems="false" drawinventory="true" capacity="5" slotsperrow="5" itempos="132,-44" iteminterval="0,-65" itemrotation="0" containedspritedepth="0.83" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="11" slotsperrow="4" itempos="132,-44" iteminterval="0,-65" itemrotation="0" containedspritedepth="0.83" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/Map/LabelIcons.png" sourcerect="512,0,256,256" origin="0.5,0.5" />
-      <Containable items="deepdiving" excludeditems="deepdivinglarge" />
+      <Containable items="deepdiving,ammobox,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="oxygentankshelf" category="Legacy" tags="container,oxygentankcontainer,oxygentankrefiller" pickdistance="50" scale="0.6">
@@ -188,7 +188,7 @@
       <ParticleEmitter particle="fleshsmoke" particlespersecond="2" scalemin="1" scalemax="2" mincondition="0.0" maxcondition="50.0" />
       <input name="power_in" displayname="connection.powerin" />
     </ConnectionPanel>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="10" maxstacksize="1" slotsperrow="5" itempos="24,-41" iteminterval="42,-65" itemsperrow="2" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="22" maxstacksize="2" slotsperrow="5" itempos="24,-41" iteminterval="42,-65" itemsperrow="2" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.3" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnFire" target="This" tags="onfire" duration="1" stackable="false" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
@@ -201,7 +201,7 @@
       <SlotIcon slotindex="7" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="8" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="9" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingfuel" excludebroken="false" excludefullcondition="true">
+      <Containable items="oxygensource,weldingfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" excludebroken="false" excludefullcondition="true">
         <StatusEffect type="OnContaining" targettype="Contained" Condition="1.0" Comparison="And">
           <Conditional Voltage="gt 0.1" targetcontainer="true" targetitemcomponent="Powered"/>
           <Conditional HasTag="refillableoxygensource"/>
@@ -235,7 +235,7 @@
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="0,0" iteminterval="0,0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/Map/LabelIcons.png" sourcerect="512,0,256,256" origin="0.5,0.5" />
-      <Containable items="deepdiving" excludeditems="deepdivinglarge" />
+      <Containable items="deepdiving,ammobox,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   
@@ -261,13 +261,13 @@
       <ParticleEmitter particle="fleshsmoke" particlespersecond="2" scalemin="1" scalemax="2" mincondition="0.0" maxcondition="50.0" />
       <input name="power_in" displayname="connection.powerin" />
     </ConnectionPanel> 
-    <ItemContainer hideitems="false" drawinventory="true" capacity="3" maxstacksize="1" slotsperrow="3" itempos="27,-42" iteminterval="22.5,0" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="7" maxstacksize="2" slotsperrow="3" itempos="27,-42" iteminterval="22.5,0" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.16,0.18" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <StatusEffect type="OnFire" target="This" tags="onfire" duration="1" stackable="false" />
-      <Containable items="oxygensource,weldingfuel" excludebroken="false" excludefullcondition="true">
+      <Containable items="oxygensource,weldingfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" excludebroken="false" excludefullcondition="true">
         <StatusEffect type="OnContaining" targettype="Contained" Condition="1.0" Comparison="And">
           <Conditional Voltage="gt 0.1" targetcontainer="true" targetitemcomponent="Powered"/>
           <Conditional HasTag="refillableoxygensource"/>
@@ -282,13 +282,13 @@
     <Sprite texture="containers.png" depth="0.54" sourcerect="407,376,152,89" origin="0.5,0.5" />
     <Body width="150" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="20" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem,mediumitem" excludeditems="toolbelt,toolbox,bandolier,cargoscooter,largemobilecontainer" />
+    <ItemContainer capacity="44" maxstacksize="64" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
     </ItemContainer>
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="128">
+      <ItemContainer maxstacksize="128" />
     </Upgrade>
   </Item>
   <Item name="" identifier="securemetalcrate" tags="crate,securecrate" scale="0.5" linkable="true" pickdistance="150" impactsoundtag="impact_metal_heavy">
@@ -297,14 +297,14 @@
     <Sprite texture="containers.png" depth="0.54" sourcerect="561,377,151,86" origin="0.5,0.5" />
     <Body width="150" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="20" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer capacity="44" maxstacksize="64" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
       <RequiredItem items="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
-      <Containable items="smallitem,mediumitem" excludeditems="toolbelt,toolbox,bandolier,cargoscooter,largemobilecontainer" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
     </ItemContainer>
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="128">
+      <ItemContainer maxstacksize="128" />
     </Upgrade>
   </Item>
   <Item name="" identifier="explosivecrate" tags="crate,allowcleanup" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" waterproof="true">
@@ -313,13 +313,13 @@
     <Sprite texture="containers.png" depth="0.54" sourcerect="410,466,150,88" origin="0.5,0.5" />
     <Body width="150" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="12" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem" />
+    <ItemContainer capacity="26" maxstacksize="64" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="128">
+      <ItemContainer maxstacksize="128" />
     </Upgrade>
   </Item>
   <Item name="" identifier="chemicalcrate" tags="crate,allowcleanup" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" waterproof="true">
@@ -328,13 +328,13 @@
     <Sprite texture="containers.png" depth="0.54" sourcerect="562,467,148,87" origin="0.5,0.5" />
     <Body width="145" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="12" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem" />
+    <ItemContainer capacity="26" maxstacksize="64" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="128">
+      <ItemContainer maxstacksize="128" />
     </Upgrade>
   </Item>
   <Item name="" identifier="mediccrate" category="Medical" tags="crate,allowcleanup" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" waterproof="true">
@@ -342,41 +342,41 @@
     <Sprite texture="containers.png" depth="0.54" sourcerect="410,563,148,87" origin="0.5,0.5" />
     <Body width="145" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="12" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem" />
+    <ItemContainer capacity="26" maxstacksize="64" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="128">
+      <ItemContainer maxstacksize="128" />
     </Upgrade>
   </Item>
   <Item name="" identifier="extinguisherbracket" category="Equipment" tags="extinguisherholder" canflipx="false" canflipy="false" scale="0.5" pickdistance="75">
     <Sprite texture="containers.png" depth="0.84" sourcerect="815,349,72,204" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" AutoInteractWithContained="true" maxstacksize="1" slotsperrow="1" itempos="35,-130" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" AutoInteractWithContained="true" maxstacksize="2" slotsperrow="1" itempos="35,-130" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="extinguisher" />
+      <Containable items="extinguisher,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Upgrade gameversion="0.10.0.0" scale="*0.5" itempos="35,-130" />
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="128">
+      <ItemContainer maxstacksize="128" />
     </Upgrade>
   </Item>
   <Item name="" identifier="weaponholder" category="Weapon" tags="weaponholder" canflipx="false" canflipy="false" scale="0.5">
     <Sprite texture="containers.png" depth="0.85" sourcerect="188,596,84,85" origin="0.5,0.5"/>
     <DecorativeSprite texture="containers.png" depth="0.83" sourcerect="188,682,124,33" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" AutoInteractWithContained="true" maxstacksize="1" slotsperrow="1" itempos="46,-47" iteminterval="0,0" itemrotation="90" containedspritedepth="0.831" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" AutoInteractWithContained="true" maxstacksize="2" slotsperrow="1" itempos="46,-47" iteminterval="0,0" itemrotation="90" containedspritedepth="0.831" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="mountableweapon" />
+      <Containable items="mountableweapon,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Upgrade gameversion="0.18.3.0">
       <ItemContainer>
         <!-- previously the holder was configured to hold items with the tag "weapon", and sub builders 
         used this tag in non-weapon items to allow placing various decorative items on the holders.
         Let's readd the tag in older subs so we don't cause those items to drop. -->
-        <Containable items="mountableweapon,weapon" />
+        <Containable items="mountableweapon,weapon,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Upgrade>
   </Item>
@@ -390,7 +390,7 @@
     <sprite texture="containers.png" sourcerect="330,652,162,157" depth="0.885" origin="0.5339039,0.4379086" canflipx="false"/>
     <ItemContainer capacity="1" slotsperrow="1" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.11,0.17" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
     </ItemContainer>
     <Upgrade gameversion="0.10.0.0" scale="*0.77" />
   </Item>
@@ -403,16 +403,16 @@
     <sprite texture="containers.png" sourcerect="1,545,112,110" depth="0.885" origin="0.5,0.5" canflipx="false"/>
     <ItemContainer capacity="1" slotsperrow="1" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.11,0.17" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
     </ItemContainer>
     <Upgrade gameversion="0.10.0.0" scale="*0.676" />
   </Item>
 
   <Item name="" identifier="crateshelf" tags="container,cargocontainer" linkable="true" canflipx="false" pickdistance="150" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="1,657,185,366" origin="0.5,0.5" />
-    <ItemContainer capacity="4" maxstacksize="1" canbeselected="true" hideitems="false" itempos="92,-48" iteminterval="0,-92" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="9" maxstacksize="2" canbeselected="true" hideitems="false" itempos="92,-48" iteminterval="0,-92" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="crate" />
+      <Containable items="crate,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   
@@ -427,11 +427,11 @@
       <Item identifier="titanium" amount="2" />
     </Fabricate>
     <Price baseprice="300" sold="false" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="0.7" />
-      <Price storeidentifier="merchantcity" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantresearch" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.1" />
+      <Price storeidentifier="merchantcity" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantresearch" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" />
     </Price>
     <InventoryIcon texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="806,103,124,100" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="806,2,124,100" depth="0.6" />
@@ -442,13 +442,13 @@
       <AnimationConditional Voltage="gt 0.1" targetitemcomponent="LightComponent"/>
     </DecorativeSprite>
     <Body width="124" height="95" density="20" />
-    <LightComponent range="100" lightcolor="142,145,184,120" castshadows="false" depth="0.6" powerconsumption="10" IsOn="true" allowingameediting="false" />
+    <LightComponent range="400" lightcolor="142,145,184,120" castshadows="false" depth="0.6" powerconsumption="10" IsOn="true" allowingameediting="false" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,-70" handle1="0,45" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" allowswappingwhenpicked="false" />
     <ItemContainer capacity="1" hideitems="true" ContainedStateIndicatorSlot="1">
-      <Containable items="alienartifact"/>
+      <Containable items="alienartifact,ammobox,deepdiving,smallitem,mediumitem,largeitem"/>
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1"  maxstacksize="1">
-        <Containable items="mobilebattery">
+      <SubContainer capacity="1"  maxstacksize="2">
+        <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <StatusEffect type="OnContaining" target="Contained" Condition="-0.15" >
             <RequiredItem items="alienartifact" type="Contained"/>
           </StatusEffect>
@@ -460,7 +460,7 @@
 
 
   <Item name="" identifier="sealedsupplycrate" tags="crate" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" hideinmenus="true">
-    <PreferredContainer secondary="wreckstoragecab" spawnprobability="0.02"/>
+    <PreferredContainer secondary="wreckstoragecab" spawnprobability="0.04"/>
     <Price baseprice="1250" sold="false" canbespecial="false" />
     <!--<InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,128,64,64" />-->
     <Sprite texture="containers.png" depth="0.54" sourcerect="562,563,147,86" origin="0.5,0.5" />
@@ -470,9 +470,9 @@
   <Item name="" identifier="unitloaddevice" tags="cargocontainer" linkable="true" pickdistance="150" scale="0.5" waterproof="true" >
     <Sprite texture="UnitLoadDevice.png" depth="0.8" sourcerect="0,0,567,446" origin="0.5,0.5" />
     <DecorativeSprite texture="UnitLoadDevice.png" depth="0.85" sourcerect="0,457,567,446" origin="0.5,0.5" />
-    <ItemContainer capacity="12" maxstacksize="1" canbeselected="true" hideitems="false" itempos="120,-364" iteminterval="150,80" itemsperrow="3" slotsperrow="4" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
+    <ItemContainer capacity="26" maxstacksize="2" canbeselected="true" hideitems="false" itempos="120,-364" iteminterval="150,80" itemsperrow="3" slotsperrow="6" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
       <GuiFrame relativesize="0.25,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="crate" />
+      <Containable items="crate,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
@@ -483,13 +483,13 @@
     <Body width="150" height="80" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
     <DecorativeSprite texture="Content/Items/Electricity/signalcomp.png" depth="0.53" sourcerect="195,33,27,31" origin="0.5,1.0"/>    
-    <LightComponent range="60.0" lightcolor="100,225,100,50" alphablend="true" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.5">
+    <LightComponent range="240" lightcolor="100,225,100,50" alphablend="true" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.5">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" depth="0.53" sourcerect="195,33,27,31" origin="0.5,1.0" alpha="1.0" />
     </LightComponent>    
     <ItemContainer capacity="0" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true" containedstateindicatorstyle="battery" containedstateindicatorslot="0" containedspritedepth="0.56">
       <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="1,185,120,29" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1" >
-        <Containable items="mobilebattery">
+      <SubContainer capacity="1" maxstacksize="2" >
+        <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <StatusEffect type="OnContaining" target="This" Voltage="1.0" setvalue="true" />
           <StatusEffect type="OnContaining" target="Contained" Condition="-0.34" />
           <StatusEffect type="OnContaining" target="This" interval="2">
@@ -506,8 +506,8 @@
           </StatusEffect>
         </Containable>
       </SubContainer>
-      <SubContainer capacity="11">
-        <Containable items="smallitem">
+      <SubContainer capacity="24">
+        <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem">
           <StatusEffect type="OnContaining" target="This,Contained" />
         </Containable>
       </SubContainer>
diff --git a/Content/Items/CreatureLoot/creatureloot.xml b/Content/Items/CreatureLoot/creatureloot.xml
index 847ccc2a..1b4952bf 100644
--- a/Content/Items/CreatureLoot/creatureloot.xml
+++ b/Content/Items/CreatureLoot/creatureloot.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="alienblood" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" RequireAimToUse="True">
+  <Item name="" identifier="alienblood" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="storageorgan" minamount="1" maxamount="2" spawnprobability="1"/>
+    <PreferredContainer secondary="storageorgan" minamount="2" maxamount="4" spawnprobability="1"/>
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" />
-      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.2" minavailable="2"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="0.85" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" />
+      <Price storeidentifier="merchantresearch" sold="true" multiplier="3.6" minavailable="6"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="2.55" />
     </Price>
     <SuitableTreatment type="bloodloss" suitability="10" />
     <SuitableTreatment type="psychosis" suitability="-45" />
@@ -39,16 +39,16 @@
     </Holdable>
     <SkillRequirementHint identifier="medical" level="35"/>
   </Item>
-  <Item name="" identifier="huskeggsbasic" category="Material" maxstacksize="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.3" RequireAimToUse="True">
-    <PreferredContainer primary="toxcontainer" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0.2" />
+  <Item name="" identifier="huskeggsbasic" category="Material" maxstacksize="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.3" RequireAimToUse="True">
+    <PreferredContainer primary="toxcontainer" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0.4" />
     <PreferredContainer secondary="medfabcab"/>
     <Price baseprice="310">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantcity" multiplier="1.3" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.3" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantcity" multiplier="3.9" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.9" />
     </Price>
     <Holdable canBeCombined="true" removeOnCombined="true" slots="Any,RightHand,LeftHand" holdpos="0,-80" aimpos="40,5" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnSecondaryUse" target="This" Condition="-25.0" />
@@ -73,18 +73,18 @@
     <Sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" sourcerect="523,86,160,50" depth="0.6" origin="0.5,0.5" />
     <Body width="140" height="45" density="10.5" />
   </Item>
-  <Item name="" identifier="huskeggs" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" RequireAimToUse="True" HitOnlyCharacters="true">
+  <Item name="" identifier="huskeggs" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" RequireAimToUse="True" HitOnlyCharacters="true">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="toxcontainer" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0.2" />
+    <PreferredContainer primary="toxcontainer" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0.4" />
     <PreferredContainer secondary="medfabcab"/>
     <Price baseprice="400">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantcity" multiplier="1.3" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchanthusk" minavailable="2" maxavailable="6">
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantcity" multiplier="3.9" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchanthusk" minavailable="6" maxavailable="6">
         <Reputation faction="huskcult" min="30"/>
       </Price>
     </Price>
@@ -121,14 +121,14 @@
     </MeleeWeapon>
     <Projectile characterusable="false" launchimpulse="20.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon" />
   </Item>
-  <Item name="" identifier="swimbladder" description="" Tags="smallitem,chem,medical" cargocontaineridentifier="chemicalcrate" maxstacksize="8" category="Material" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="swimbladder" description="" Tags="smallitem,chem,medical" cargocontaineridentifier="chemicalcrate" maxstacksize="16" category="Material" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="250">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="0.9" />
-      <Price storeidentifier="merchantcity" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="2.7" />
+      <Price storeidentifier="merchantcity" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="9" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
     <Sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.7" sourcerect="64,0,44,52" origin="0.5,0.5" />
@@ -142,17 +142,17 @@
     <Body width="40" height="45" density="9.9" />
     <Holdable slots="RightHand,LeftHand,Any" holdpos="0,-70" handle1="0,10" handle2="0,-10" />
   </Item>
-  <Item name="" identifier="adrenalinegland" Tags="smallitem,chem,medical" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" category="Material" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="adrenalinegland" Tags="smallitem,chem,medical" maxstacksize="16" cargocontaineridentifier="chemicalcrate" description="" category="Material" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="240">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="0.9" />
-      <Price storeidentifier="merchantcity" multiplier="1.1" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.85" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="2.7" />
+      <Price storeidentifier="merchantcity" multiplier="3.3" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.55" />
     </Price>
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer primary="storageorgan" minamount="1" maxamount="2" spawnprobability="1"/>
+    <PreferredContainer primary="storageorgan" minamount="2" maxamount="4" spawnprobability="1"/>
     <Sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.7" sourcerect="108,1,45,51" origin="0.5,0.5" />
     <Deconstruct time="10">
       <Item identifier="adrenaline" />
@@ -185,7 +185,7 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="1" sold="false" canbespecial="false" />
     <Price baseprice="500" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="huskcult" min="70"/>
       </Price>
     </Price>
@@ -255,14 +255,14 @@
   <Item name="" identifier="smallmudraptoregg" nameidentifier="mudraptoregg" Tags="smallitem,ignorebyai,mudraptoregg" health="20" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="300" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.5" minavailable="1"/>
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" multiplier="0.85" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" sold="true" multiplier="4.5" minavailable="3"/>
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" multiplier="2.55" />
     </Price>
-    <PreferredContainer primary="toxcontainer" spawnprobability="0.01" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="locker" spawnprobability="0.01" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="toxcontainer" spawnprobability="0.02" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="locker" spawnprobability="0.02" notcampaign="true" notpvp="true"/>
     <Sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.18" sourcerect="164,3,42,49" origin="0.5,0.5" />
     <Deconstruct time="10">
       <Item identifier="alienblood" />
@@ -280,8 +280,8 @@
 	    </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false">
-      <Containable items="antibloodloss1">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" showcontainedstateindicator="false">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <!-- increase scale -->
         <StatusEffect type="OnContaining" target="This" Scale="0.005"/>
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
@@ -295,10 +295,10 @@
         </StatusEffect>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+    <LightComponent range="20" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="164,3,42,49" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="20" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="80" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="164,3,42,49" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -325,7 +325,7 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnBroken" target="This">
         <particleemitter particle="whitegoosplash" particleamount="20" velocitymin="0" velocitymax="300" anglemin="0" anglemax="360" scalemin="0.5" scalemax="1.0" emitinterval="0" particlespersecond="0" highqualitycollisiondetection="False" copyentityangle="False" />
@@ -337,7 +337,7 @@
 	      <particleemitter particle="mudrapeggbrownchunks" particleamount="8" velocitymin="100" velocitymax="1000" anglemin="0" anglemax="360" scalemin="0.2" scalemax="0.5" />
 	    </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
-      <Containable items="antibloodloss1">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <!-- increase scale -->
         <StatusEffect type="OnContaining" target="This" Scale="0.005"/>
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
@@ -350,10 +350,10 @@
         </StatusEffect>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+    <LightComponent range="20" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="235,156,67,82" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="30" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="120" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="235,156,67,82" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -380,7 +380,7 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnBroken" target="This">
         <particleemitter particle="mudrapeggbrownchunks" particleamount="100" velocitymin="100" velocitymax="2000" anglemin="0" anglemax="360" scalemin="0.4" scalemax="0.6" />
@@ -397,16 +397,16 @@
         <Remove />
         <SpawnCharacter speciesname="Mudraptor_hatchling" inheriteventtags="true" />
       </StatusEffect>      
-      <Containable items="antibloodloss1">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <!-- increase scale -->
         <StatusEffect type="OnContaining" target="This" Scale="0.002"/>
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+    <LightComponent range="20" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="300,291,98,113" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="40" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="160" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="410,301,88,95" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -420,7 +420,7 @@
     </Deconstruct>
     <!-- rectangular body to prevent the egg from rolling -->
     <Body width="110" height="120" friction="1.0" restitution="0.01" angulardamping="1.0" density="12"/>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnBroken" target="This">
         <particleemitter particle="mudrapeggbrownchunks" particleamount="100" velocitymin="100" velocitymax="2000" anglemin="0" anglemax="360" scalemin="0.4" scalemax="0.6" />
@@ -438,16 +438,16 @@
         <SpawnCharacter speciesname="Tigerthresher_hatchling" />
         <Remove />
       </StatusEffect>      
-      <Containable items="antibloodloss1,alienblood">
+      <Containable items="antibloodloss1,alienblood,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <!-- increase scale -->
         <StatusEffect type="OnContaining" target="This" Scale="0.005"/>
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="217,157,0,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+    <LightComponent range="20" lightcolor="217,157,0,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="300,291,98,113" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="40" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="160" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="410,301,88,95" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -461,7 +461,7 @@
     </Deconstruct>
     <!-- rectangular body to prevent the egg from rolling -->
     <Body width="110" height="120" friction="1.0" restitution="0.01" angulardamping="1.0" density="12"/>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnBroken" target="This">
         <particleemitter particle="whitegoosplash" particleamount="20" velocitymin="0" velocitymax="300" anglemin="0" anglemax="360" scalemin="0.5" scalemax="1.0" emitinterval="0" particlespersecond="0" highqualitycollisiondetection="False" copyentityangle="False" />
@@ -479,16 +479,16 @@
         <SpawnCharacter speciesname="Crawler_hatchling" />
         <Remove />
       </StatusEffect>
-      <Containable items="antibloodloss1">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <!-- increase scale -->
         <StatusEffect type="OnContaining" target="This" Scale="0.005"/>
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="255,0,0,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30" >
+    <LightComponent range="20" lightcolor="255,0,0,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30" >
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="300,291,98,113" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="40" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="160" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="410,301,88,95" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -496,11 +496,11 @@
     <PreferredContainer primary="storagecab" secondary="mineralcab" />
     <Sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.18" sourcerect="4,450,262,62" origin="0.5,0.5" />
     <Price baseprice="1000" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="2" />
-      <Price storeidentifier="merchantresearch" multiplier="0.75" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.75" />
-      <Price storeidentifier="merchantmine" multiplier="0.5" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="6" />
+      <Price storeidentifier="merchantresearch" multiplier="2.25" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.25" />
+      <Price storeidentifier="merchantmine" multiplier="1.5" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="carbon" amount="2" />
@@ -510,18 +510,18 @@
     <Holdable slots="Any,RightHand+LeftHand" holdpos="0,-80" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect" />
   </Item>
 
-  <Item name="" identifier="aliencircuitry" category="Misc" Tags="smallitem,signal" maxstacksize="4" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="aliencircuitry" category="Misc" Tags="smallitem,signal" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" spawnprobability="0" />
     <PreferredContainer secondary="mineralcab" spawnprobability="0" />
-    <PreferredContainer secondary="circuitrycontainer" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="3" maxamount="4" spawnprobability="0.3" />
+    <PreferredContainer secondary="circuitrycontainer" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="6" maxamount="8" spawnprobability="0.6" />
     <Price baseprice="80" sold="false">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity"/>
-      <Price storeidentifier="merchantresearch" multiplier="2" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="1.5" />
+      <Price storeidentifier="merchantengineering" multiplier="4.5" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" amount="2" />
@@ -535,11 +535,11 @@
   <Item name="" identifier="diversremains" sonarsize="2" tags="mediumitem,monsterfood" category="Misc" canbepicked="true" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="storagecab" secondary="mineralcab" />
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="1" />
-      <Price storeidentifier="merchantresearch" multiplier="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="3" />
+      <Price storeidentifier="merchantresearch" multiplier="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <Deconstruct time="10" chooserandom="true" amount="2">
       <Item identifier="rubber" commonness="0.5"/>
@@ -557,11 +557,11 @@
   <Item name="" identifier="hammerheadribs" sonarsize="2" tags="mediumitem" category="Misc" canbepicked="true" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="storagecab" secondary="mineralcab" />
     <Price baseprice="200" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="2" />
-      <Price storeidentifier="merchantresearch" multiplier="0.75" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.75" />
-      <Price storeidentifier="merchantmine" multiplier="0.5" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="6" />
+      <Price storeidentifier="merchantresearch" multiplier="2.25" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.25" />
+      <Price storeidentifier="merchantmine" multiplier="1.5" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -574,11 +574,11 @@
 
   <Item name="" identifier="endwormshell" sonarsize="4" category="Misc" tags="mediumitem" cargocontaineridentifier="metalcrate" impactsoundtag="impact_soft" scale="0.5" allowasextracargo="true">
     <Price baseprice="1400" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.75" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="3" />
+      <Price storeidentifier="merchantresearch" multiplier="5.25" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="carbon" amount="4" />
@@ -592,11 +592,11 @@
 
   <Item name="" identifier="watchershell" sonarsize="4" category="Misc" tags="mediumitem" cargocontaineridentifier="metalcrate" impactsoundtag="impact_soft" scale="0.5" allowasextracargo="true">
     <Price baseprice="500" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="3" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -610,11 +610,11 @@
 
   <Item name="" identifier="spinelingspikeloot" category="Weapon" tags="smallitem" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" scale="0.5" allowasextracargo="true" RequireAimToUse="True" nameidentifier="spinelingspike" translationidentifier="spinelingspike">
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="3" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -639,7 +639,7 @@
         </StatusEffect>
       </Attack>
     </MeleeWeapon>
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,200,255,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,200,255,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Characters/Spineling/Spineling.png" sourcerect="0,230,180,23" origin="0.5,0.6" alpha="0.5"/>
     </LightComponent>
   </Item>
diff --git a/Content/Items/Diving/divinggear.xml b/Content/Items/Diving/divinggear.xml
index 5c7a92f2..04ccf795 100644
--- a/Content/Items/Diving/divinggear.xml
+++ b/Content/Items/Diving/divinggear.xml
@@ -2,17 +2,17 @@
 <Items>
   <Item name="" identifier="divingmask" scale="0.5" category="Diving,Equipment" Tags="smallitem,diving,lightdiving" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
     <Price baseprice="100">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="7" />
-      <Price storeidentifier="merchantresearch" minavailable="5" />
-      <Price storeidentifier="merchantmilitary" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="15" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" minavailable="21" />
+      <Price storeidentifier="merchantresearch" minavailable="15" />
+      <Price storeidentifier="merchantmilitary" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="45" />
     </Price>
-    <PreferredContainer secondary="respawncontainer" amount="2" notcampaign="true"/>
-    <PreferredContainer primary="divingcab" amount="2" allowtransfershere="false"/>
-    <PreferredContainer primary="supplycab" amount="1" transferonlyonepercontainer="true"/>
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.1"/>
-    <PreferredContainer secondary="outpostsupplycab" amount="1" spawnprobability="0.5"/>
+    <PreferredContainer secondary="respawncontainer" amount="4" notcampaign="true"/>
+    <PreferredContainer primary="divingcab" amount="4" allowtransfershere="false"/>
+    <PreferredContainer primary="supplycab" amount="2" transferonlyonepercontainer="true"/>
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.2"/>
+    <PreferredContainer secondary="outpostsupplycab" amount="2" spawnprobability="1"/>
     <Deconstruct time="10">
       <Item identifier="plastic" />
       <Item identifier="rubber" />
@@ -30,9 +30,9 @@
       <sprite name="Diving Mask Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.7" hidelimb="false" hideotherwearables="false" sourcerect="226,326,69,68" origin="0.4,0.3" hidewearablesoftype="moustache,beard" />
       <StatusEffect type="OnWearing" target="Character" HideFace="true" setvalue="true" disabledeltatime="true" />
     </Wearable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingtoolfuel" excludeditems="oxygenitetank" />
+      <Containable items="oxygensource,weldingtoolfuel" />
       <Containable items="oxygensource">
         <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" UseHullOxygen="false" />
         <StatusEffect type="OnWearing" target="Contained" Condition="-0.3" comparison="And">
@@ -78,16 +78,16 @@
   
   <Item name="" identifier="divingsuit" category="Diving,Equipment" tags="diving,deepdiving,human" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy" botpriority="1" cargocontaineridentifier="">
     <Price baseprice="250">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="4" />
-      <Price storeidentifier="merchantresearch" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="5" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" minavailable="12" />
+      <Price storeidentifier="merchantresearch" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="15" />
     </Price>
     <PreferredContainer primary="divingsuitcontainer" spawnprobability="1" campaignonly="true" maxleveldifficulty="35" />
     <PreferredContainer primary="divingsuitcontainer" spawnprobability="1" notcampaign="true" />
     <PreferredContainer primary="piratedivingsuitcontainer" spawnprobability="1" maxleveldifficulty="35" />
-    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.1" maxleveldifficulty="35" />
+    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.2" maxleveldifficulty="35" />
     <Deconstruct time="30">
       <Item identifier="titaniumaluminiumalloy" />
       <Item identifier="rubber" />
@@ -109,7 +109,7 @@
     <Body radius="45" width="34" density="20" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Diving Suit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="5,4,92,94" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <Upgrade gameversion="0.1300.0.3" allowingameediting="false" />
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" Interval="0.1" setvalue="true">
             <Conditional IsDead="false" />
@@ -152,9 +152,9 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use">
       <Upgrade gameversion="0.1401.0.0" msg="ItemMsgPickUpUse" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingtoolfuel" excludeditems="oxygenitetank" />
+      <Containable items="oxygensource,weldingtoolfuel" />
       <Containable items="oxygensource">
         <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" />
         <StatusEffect type="OnWearing" target="Contained" Condition="-0.3" comparison="And">
@@ -211,15 +211,15 @@
   <Item name="" identifier="underwaterscooter" category="Diving,Equipment" Tags="smallitem,provocative,scooter" cargocontaineridentifier="metalcrate" description="" Scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" requireaimtouse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="180">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="6" />
-      <Price storeidentifier="merchantresearch" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" minavailable="5" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" minavailable="18" />
+      <Price storeidentifier="merchantresearch" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" minavailable="15" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="12" />
     </Price>
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer primary="divingcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckdivingcab,beaconsupplycab" spawnprobability="0.05"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer primary="divingcab" amount="4" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckdivingcab,beaconsupplycab" spawnprobability="0.1"/>
     <Deconstruct time="20">
       <Item identifier="aluminium" />
       <Item identifier="copper" />
@@ -236,7 +236,7 @@
     <Sprite texture="Scooter.png" depth="0.55" sourcerect="0,0,140,102" />
     <Body width="120" height="60" density="10" />
     <Holdable slots="Any,RightHand+LeftHand" aimpos="90,0" handle1="-35,32" handle2="-27,34" msg="ItemMsgPickUpSelect" holdangle="-10">
-      <LightComponent LightColor="220,255,150,200" range="500" powerconsumption="10" IsOn="true">
+      <LightComponent LightColor="220,255,150,200" range="2000" powerconsumption="10" IsOn="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="-0.01, 0.5" size="1.0,1.0" />
         <Upgrade gameversion="1.1.2.0" powerconsumption="10" />
       </LightComponent>
@@ -254,7 +254,7 @@
       </StatusEffect>
       <sound file="Content/Items/Diving/ScooterLoop.ogg" type="OnUse" range="500.0" loop="true" />
     </Propulsion>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <Containable items="mobilebattery" />
     </ItemContainer>
@@ -262,15 +262,15 @@
   </Item>  
   <Item name="" identifier="abyssdivingsuit" category="Diving,Equipment" tags="diving,deepdiving,human" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy" botpriority="0.9" cargocontaineridentifier="">
     <Price baseprice="550" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="2" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" minavailable="6" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="6" />
     </Price>
     <PreferredContainer primary="divingsuitcontainer" />
     <PreferredContainer primary="piratedivingsuitcontainer" spawnprobability="1" minleveldifficulty="50" />
-    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.05" minleveldifficulty="50" />
+    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.1" minleveldifficulty="50" />
     <Deconstruct time="30">
       <Item identifier="titaniumaluminiumalloy" />
       <Item identifier="titaniumaluminiumalloy" />
@@ -293,7 +293,7 @@
     <Body radius="45" width="34" density="20" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Abyss Diving Suit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="0,409,103,103" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" Interval="0.1" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -336,9 +336,9 @@
       <StatValue stattype="WalkingSpeed" value="-0.2" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" />
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingtoolfuel" excludeditems="oxygenitetank" />
+      <Containable items="oxygensource,weldingtoolfuel" />
       <Containable items="oxygensource">
         <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" />
         <StatusEffect type="OnWearing" target="Contained" Condition="-0.3" comparison="And">
@@ -393,16 +393,16 @@
   </Item>
   <Item name="" identifier="combatdivingsuit" category="Diving,Equipment" tags="diving,deepdiving,human" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy" botpriority="2" cargocontaineridentifier="">
     <Price baseprice="560" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="0.9" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="2" sold="false"/>
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="2.7" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" minavailable="6" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" minavailable="3"/>
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.85" minavailable="3"/>
+      <Price storeidentifier="merchantmilitary" minavailable="9"/>
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.55" minavailable="9"/>
     </Price>
     <PreferredContainer primary="divingsuitcontainer" />
     <PreferredContainer primary="piratedivingsuitcontainer" spawnprobability="1" minleveldifficulty="35" />
-    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.05" minleveldifficulty="35"/>
+    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.1" minleveldifficulty="35"/>
     <Deconstruct time="30">
       <Item identifier="ballisticfiber" />
       <Item identifier="titaniumaluminiumalloy" />
@@ -428,7 +428,7 @@
     <Body radius="45" width="34" density="20" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Combat Diving Suit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="326,0,103,103" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" Interval="0.1" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -470,9 +470,9 @@
       <StatValue stattype="PropulsionSpeed" value="0.4" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" />
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingtoolfuel" excludeditems="oxygenitetank" />
+      <Containable items="oxygensource,weldingtoolfuel" />
       <Containable items="oxygensource">
         <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" />
         <StatusEffect type="OnWearing" target="Contained" Condition="-0.3" comparison="And">
@@ -535,14 +535,14 @@
     <Body radius="45" width="34" density="20" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Respawn Diving Suit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="100,409,103,103" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
           <LightTexture texture="Content/Lights/divinghelmetlight.png" origin="0.05, 0.5" size="1.0,1.0" />
           <IsActive condition="gt 10.0"/>
         </LightComponent>      
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" flicker="0.8" flickerspeed="1.0" pulsefrequency="0.1" pulseamount="0.5">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" flicker="0.8" flickerspeed="1.0" pulsefrequency="0.1" pulseamount="0.5">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -608,7 +608,7 @@
 
   <Item name="" identifier="brokendivingsuit" category="Diving,Equipment" tags="deepdiving,human" scale="0.5" fireproof="false" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy" botpriority="0" cargocontaineridentifier="">
     <!-- lesser yield than regular diving suit, can't be sold -->
-    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.1" maxleveldifficulty="100" />
+    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.2" maxleveldifficulty="100" />
     <Deconstruct time="15" chooserandom="true" amount="1">
       <Item identifier="titanium" commonness="60" />
       <Item identifier="rubber" commonness="50" />
@@ -648,7 +648,7 @@
       <StatValue stattype="WalkingSpeed" value="-0.2" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use"/>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <Containable items="oxygensource,weldingtoolfuel" />
     </ItemContainer>
diff --git a/Content/Items/Door/doors.xml b/Content/Items/Door/doors.xml
index a152f6a4..e4ec5f7b 100644
--- a/Content/Items/Door/doors.xml
+++ b/Content/Items/Door/doors.xml
@@ -270,12 +270,12 @@
     </DockingPort>
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
-    <LightComponent range="10.0" lightcolor="255,0,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.9.9000.0" lightcolor="255,0,0,0"/>
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="0,0,113,209" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.9.9000.0" lightcolor="0,255,0,0"/>
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="0,0,113,209" depth="0.9" origin="0.5,0.5" alpha="1.0" />
@@ -312,12 +312,12 @@
     </DockingPort>
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
-    <LightComponent range="10.0" lightcolor="255,0,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.9.9000.0" lightcolor="255,0,0,0"/>
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="126,2,128,112" depth="0.9" origin="0.5,0.5" alpha="1.0"  />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.9.9000.0" lightcolor="0,255,0,0"/>
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="126,2,128,112" depth="0.9" origin="0.5,0.5" alpha="1.0"  />
diff --git a/Content/Items/Electricity/lights.xml b/Content/Items/Electricity/lights.xml
index d13c112c..12edb5d3 100644
--- a/Content/Items/Electricity/lights.xml
+++ b/Content/Items/Electricity/lights.xml
@@ -283,7 +283,7 @@
   <Item name="" identifier="lamp" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="304,528,64,96" depth="0.8" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="784,528,64,96" />
@@ -301,7 +301,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm01" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="0,528,80,112" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,528,80,112" origin="0.5,0.5" />
@@ -318,7 +318,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm02" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="80,528,80,112" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="560,528,80,112" />
@@ -335,7 +335,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm03" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="160,528,64,112" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="640,528,64,112" />
@@ -352,7 +352,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm04" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="224,528,80,112" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="704,528,80,112" origin="0.5,0.5" />
@@ -369,7 +369,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentl01" category="Electrical" Tags="largeitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="0,816,240,64" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,816,240,64" />
@@ -386,7 +386,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentl02" category="Electrical" Tags="largeitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="0,896,288,48" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/light_fluorescent_L2.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,896,288,48" />
@@ -403,7 +403,7 @@
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm01" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="0,672,80,128" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,672,80,128" origin="0.5,0.5" />
@@ -420,7 +420,7 @@
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm02" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="80,672,128,80" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="560,672,128,80" origin="0.5,0.5" />
@@ -437,7 +437,7 @@
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm03" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="208,672,112,128" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="688,672,112,128" />
@@ -454,7 +454,7 @@
   <Item name="" nameidentifier="lamp" identifier="lighthalogenm04" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="320,672,128,96" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="800,672,128,96" origin="0.5,0.5" />
@@ -471,7 +471,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightleds01" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="352,784,80,80" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="842,794,59,59" origin="0.5,0.5" />
@@ -489,7 +489,7 @@
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="0,960,96,16" depth="0.8" />
     <!-- base texture -->
-    <LightComponent lightcolor="255,0,0,25" range="250.0" IsOn="true" castshadows="false" alphablend="true">
+    <LightComponent lightcolor="255,0,0,25" range="1000" IsOn="true" castshadows="false" alphablend="true">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,960,96,16" />
     </LightComponent>
diff --git a/Content/Items/Electricity/poweritems.xml b/Content/Items/Electricity/poweritems.xml
index b58ac750..839e15f4 100644
--- a/Content/Items/Electricity/poweritems.xml
+++ b/Content/Items/Electricity/poweritems.xml
@@ -14,12 +14,12 @@
         <Conditional voltage="gt 0.1" />
       </StatusEffect>
     </PowerTransfer>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" alphablend="true" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" alphablend="true" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="264,186,110,176" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq False" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" alphablend="true" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1.5">
+    <LightComponent range="40" lightcolor="255,255,255,0" alphablend="true" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1.5">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="376,186,110,176" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq True" />
@@ -98,7 +98,7 @@
     <Sprite texture="signalcomp.png" sourcerect="604,0,118,159" depth="0.8" />
     <BrokenSprite texture="signalcomp.png" sourcerect="722,0,118,159" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="signalcomp.png" sourcerect="840,0,118,159" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="2000.0" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="65,33" indicatorsize="34,46" ishorizontal="false" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="4400" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="65,33" indicatorsize="34,46" ishorizontal="false" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" /> <!--minsize="350,250" maxsize="420,300"-->
       <StatusEffect type="OnActive" targettype="Contained" targets="loadable" Condition="2.0" comparison="and">
         <!-- the statuseffect targets the contained item (a battery cell that's being charged), but the conditional targets the container (this battery) -->
@@ -129,12 +129,12 @@
       <output name="power_value_out" displayname="connection.powervalueout" />
       <input name="disable_output" displayname="connection.disableoutput" />
     </ConnectionPanel>
-    <ItemContainer capacity="3" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
+    <ItemContainer capacity="7" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <Containable items="loadable" />
+      <Containable items="loadable,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="120" maxdeteriorationdelay="240" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.5" />
@@ -162,7 +162,7 @@
     <Sprite texture="signalcomp.png" sourcerect="604,207,118,124" depth="0.8" />
     <BrokenSprite texture="signalcomp.png" sourcerect="722,207,118,124" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="signalcomp.png" sourcerect="840,207,118,124" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="2000.0" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="21,12" indicatorsize="54,35" ishorizontal="true" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="4400" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="21,12" indicatorsize="54,35" ishorizontal="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" /> <!--minsize="350,250" maxsize="420,300"-->
       <StatusEffect type="OnActive" targettype="Contained" targets="loadable" Condition="2.0" comparison="and">
         <!-- the statuseffect targets the contained item (a battery cell that's being charged), but the conditional targets the container (this battery) -->
@@ -193,12 +193,12 @@
       <output name="power_value_out" displayname="connection.powervalueout" />
       <input name="disable_output" displayname="connection.disableoutput" />
     </ConnectionPanel>
-    <ItemContainer capacity="3" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
+    <ItemContainer capacity="7" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <Containable items="loadable" />
+      <Containable items="loadable,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   
@@ -208,7 +208,7 @@
     <Sprite texture="signalcomp.png" depth="0.8" sourcerect="512,334,154,160" />
     <BrokenSprite texture="signalcomp.png" sourcerect="667,334,155,161" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="signalcomp.png" sourcerect="821,334,155,161" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="20.0" rechargespeed="0" maxrechargespeed="1000.0" maxoutput="20000000.0" efficiency="0.1" exponentialrechargespeed="true" rechargeadjustspeed="0.1" rechargewarningindicatorlow="0.5" rechargewarningindicatorhigh="0.75" canbeselected="true" indicatorposition="53,11" indicatorsize="47,10" ishorizontal="true" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="44" rechargespeed="0" maxrechargespeed="1000.0" maxoutput="20000000.0" efficiency="0.1" exponentialrechargespeed="true" rechargeadjustspeed="0.1" rechargewarningindicatorlow="0.5" rechargewarningindicatorhigh="0.75" canbeselected="true" indicatorposition="53,11" indicatorsize="47,10" ishorizontal="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" />
       <Upgrade gameversion="0.16.7.0" maxrechargespeed="1000"/>
       <Upgrade gameversion="0.16.7.0" maxoutput="20000000.0"/>
@@ -236,7 +236,7 @@
       <output name="power_value_out" displayname="connection.powervalueout" />
       <input name="disable_output" displayname="connection.disableoutput" />
     </ConnectionPanel>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" alphablend="true" pulsefrequency="0.4" pulseamount="0.4" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" alphablend="true" pulsefrequency="0.4" pulseamount="0.4" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="358,334,154,160" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerContainer" rechargeratio="gt 0.7" />
       <IsActive targetitemcomponent="PowerContainer" currpowerconsumption="gt 500" />
@@ -264,21 +264,21 @@
     </Repairable>
   </Item>
   
-  <Item name="" identifier="batterycell" category="Equipment,Electrical" maxstacksize="8" tags="smallitem,loadable,mobilebattery" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="batterycell" category="Equipment,Electrical" maxstacksize="16" tags="smallitem,loadable,mobilebattery" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="batterycellrecharger" maxcondition="80"/>
-    <PreferredContainer primary="stunbaton,underwaterscooter,handheldsonar,sonarbeacon,flashlight,portablepump,poweredcontainer" spawnprobability="1.0" mincondition="25"/>
-    <PreferredContainer secondary="divingcab" amount="3" spawnprobability="1" notcampaign="true" />
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab,outpostengcab" minamount="1" maxamount="2" spawnprobability="0.1"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05"/>
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="stunbaton,underwaterscooter,handheldsonar,sonarbeacon,flashlight,portablepump,poweredcontainer" spawnprobability="1" mincondition="25"/>
+    <PreferredContainer secondary="divingcab" amount="6" spawnprobability="1" notcampaign="true" />
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab,outpostengcab" minamount="2" maxamount="4" spawnprobability="0.2"/>
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1"/>
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.2" />
     <Upgrade gameversion="0.10.0.0" scale="0.5"/>
-    <Price baseprice="125" minavailable="7">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="5"/>
-      <Price storeidentifier="merchantcity" minavailable="4"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" minavailable="6"/>
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="6" />
+    <Price baseprice="125" minavailable="21">
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" minavailable="15"/>
+      <Price storeidentifier="merchantcity" minavailable="12"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" minavailable="18"/>
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="18" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="zinc" />
@@ -299,19 +299,19 @@
     </Quality>
   </Item>
   
-  <Item name="" identifier="fulguriumbatterycell" category="Equipment,Electrical" maxstacksize="8" tags="smallitem,loadable,mobilebattery" health="200" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fulguriumbatterycell" category="Equipment,Electrical" maxstacksize="16" tags="smallitem,loadable,mobilebattery" health="200" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5"/>
     <PreferredContainer primary="batterycellrecharger" maxcondition="80"/>
     <PreferredContainer primary="stunbaton,underwaterscooter,handheldsonar,sonarbeacon,flashlight,portablepump,poweredcontainer" mincondition="25"/>
     <PreferredContainer secondary="divingcab,engcab,reactorcab"/>
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.05"/>
-    <Price baseprice="250" minavailable="1" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.25" />
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.1"/>
+    <Price baseprice="250" minavailable="3" minleveldifficulty="15">
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.75" />
       <Price storeidentifier="merchantcity" />
-      <Price storeidentifier="merchantresearch" minavailable="2" />
+      <Price storeidentifier="merchantresearch" minavailable="6" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="zinc" />
@@ -361,13 +361,13 @@
       <ParticleEmitter particle="fleshsmoke" particlespersecond="2" scalemin="1" scalemax="2" mincondition="0.0" maxcondition="50.0" />
       <input name="power_in" displayname="connection.powerin" />
     </ConnectionPanel>
-    <ItemContainer capacity="4" maxstacksize="1" canbeselected="true" hideitems="false" itempos="24,10" iteminterval="23,0" itemrotation="-90" uilabel="ChargingDock" containedspritedepth="0.81">
+    <ItemContainer capacity="9" maxstacksize="2" canbeselected="true" hideitems="false" itempos="24,10" iteminterval="23,0" itemrotation="-90" uilabel="ChargingDock" containedspritedepth="0.81">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="3" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <Containable items="loadable" />
+      <Containable items="loadable,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Electricity/signalitems.xml b/Content/Items/Electricity/signalitems.xml
index 347a7eb4..5d400a8c 100644
--- a/Content/Items/Electricity/signalitems.xml
+++ b/Content/Items/Electricity/signalitems.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="circuitbox" category="Electrical" Tags="smallitem" maxstacksize="1" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" disablecommandmenuwhenselected="true" grabwhenselected="true">
+  <Item name="" identifier="circuitbox" category="Electrical" Tags="smallitem" maxstacksize="2" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" disablecommandmenuwhenselected="true" grabwhenselected="true">
     <PreferredContainer primary="engcab"/>
     <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="192,258,64,64" depth="0.8" canflipx="false" origin="0.5,0.5" />
     <Body width="51" height="51" density="30" />
@@ -50,12 +50,12 @@
       <output name="signal_out8" displayname="connection.signaloutx~[num]=8" />
     </ConnectionPanel>
     <!-- container for components -->
-    <ItemContainer capacity="64" maxstacksize="1" canbeselected="false" allowdraganddrop="false" drawinventory="false" QuickUseMovesItemsInside="false">
-      <Containable items="circuitboxcomponent" />
+    <ItemContainer capacity="141" maxstacksize="2" canbeselected="false" allowdraganddrop="false" drawinventory="false" QuickUseMovesItemsInside="false">
+      <Containable items="circuitboxcomponent,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <!-- container for wires -->
-    <ItemContainer capacity="10" maxstacksize="32" canbeselected="false" allowdraganddrop="false" drawinventory="false" QuickUseMovesItemsInside="false">
-      <Containable items="wire" />
+    <ItemContainer capacity="22" maxstacksize="64" canbeselected="false" allowdraganddrop="false" drawinventory="false" QuickUseMovesItemsInside="false">
+      <Containable items="wire,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <CircuitBox selectkey="Select" canbeselected="true" msg="ItemMsgInteractSelect" allowuioverlap="true">
       <Requireditem items="idcard" type="Picked" msg="itemmsgunauthorizedaccess" ignoreineditor="true"/>
@@ -66,17 +66,17 @@
       <ConnectionScrewSprite texture="Content/UI/UIAtlasDevices.png" sourcerect="88,92,45,45" origin="0.5,0.5" />
     </CircuitBox>
   </Item>
-  <Item name="" identifier="wire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="210,215,218,255" InventoryIconColor="210,215,218,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="wire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="16" spritecolor="210,215,218,255" InventoryIconColor="210,215,218,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,64,64,64" origin="0.5,0.5" />
     <Sprite texture="signalcomp.png" depth="0.8" sourcerect="169,224,84,32" origin="0.5,0.5" />
@@ -84,17 +84,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="redwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="254,23,17,255" InventoryIconColor="254,23,17,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="redwire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="16" spritecolor="254,23,17,255" InventoryIconColor="254,23,17,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -106,17 +106,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="bluewire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="51,121,173,255" InventoryIconColor="51,121,173,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="bluewire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="16" spritecolor="51,121,173,255" InventoryIconColor="51,121,173,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -128,17 +128,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="orangewire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="255,140,13,255" InventoryIconColor="255,140,13,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="orangewire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="16" spritecolor="255,140,13,255" InventoryIconColor="255,140,13,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -150,17 +150,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="greenwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="56,143,111,255" InventoryIconColor="56,143,111,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="greenwire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="16" spritecolor="56,143,111,255" InventoryIconColor="56,143,111,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -172,17 +172,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="blackwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="50,50,50,255" InventoryIconColor="50,50,50,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="blackwire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="16" spritecolor="50,50,50,255" InventoryIconColor="50,50,50,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -194,17 +194,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="brownwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="123,77,62,255" InventoryIconColor="123,77,62,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="brownwire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="16" spritecolor="123,77,62,255" InventoryIconColor="123,77,62,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -216,17 +216,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="fpgacircuit" category="Electrical" Tags="smallitem,signal" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fpgacircuit" category="Electrical" Tags="smallitem,signal" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="80">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="5">
       <Item identifier="copper" />
     </Deconstruct>
@@ -252,17 +252,17 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="andcomponent" category="Electrical" Tags="smallitem,logic, circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6c7dd5">
+  <Item name="" identifier="andcomponent" category="Electrical" Tags="smallitem,logic, circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6c7dd5">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -274,7 +274,7 @@
     <AndComponent canbeselected="true" />
     <Body width="31" height="25" density="15" />
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="85,-10" handle1="0,0" attachable="true" aimable="true">
-      <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
+      <RequiredItem items="wrench,deattachtool" type="Equipped" />
     </Holdable>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -285,17 +285,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="equalscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#694341">
+  <Item name="" identifier="equalscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#694341">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -318,17 +318,17 @@
       <input name="set_output" displayname="connection.setoutput" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="greatercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a1d681">
+  <Item name="" identifier="greatercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a1d681">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -351,17 +351,17 @@
       <input name="set_output" displayname="connection.setoutput" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="addercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a1d681">
+  <Item name="" identifier="addercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a1d681">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -383,17 +383,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="colorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#b3b3b4">
+  <Item name="" identifier="colorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#b3b3b4">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -417,17 +417,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="subtractcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a0dbc8">
+  <Item name="" identifier="subtractcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a0dbc8">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -449,17 +449,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="multiplycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8bafd7">
+  <Item name="" identifier="multiplycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8bafd7">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -481,17 +481,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="dividecomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8bafd7">
+  <Item name="" identifier="dividecomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8bafd7">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -513,17 +513,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="powcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#9b7eff">
+  <Item name="" identifier="powcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#9b7eff">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -545,17 +545,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="orcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#d1b788">
+  <Item name="" identifier="orcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#d1b788">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -578,17 +578,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="xorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#c3a27a">
+  <Item name="" identifier="xorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#c3a27a">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -611,17 +611,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="notcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#ad7a79">
+  <Item name="" identifier="notcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#ad7a79">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -642,17 +642,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="concatcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#eb5505">
+  <Item name="" identifier="concatcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#eb5505">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -674,17 +674,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="sincomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#38a54f">
+  <Item name="" identifier="sincomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#38a54f">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -705,17 +705,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="coscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#3d9d9e">
+  <Item name="" identifier="coscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#3d9d9e">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -736,17 +736,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="tancomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8e5a4c">
+  <Item name="" identifier="tancomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8e5a4c">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -767,17 +767,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="asincomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a56dc2">
+  <Item name="" identifier="asincomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a56dc2">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -798,17 +798,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="acoscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#7594ba">
+  <Item name="" identifier="acoscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#7594ba">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -829,17 +829,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="atancomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6cabbc">
+  <Item name="" identifier="atancomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6cabbc">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -862,17 +862,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="roundcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#404095">
+  <Item name="" identifier="roundcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#404095">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -893,17 +893,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ceilcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#983f3c">
+  <Item name="" identifier="ceilcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#983f3c">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -924,17 +924,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="floorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#50884d">
+  <Item name="" identifier="floorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#50884d">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -955,17 +955,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="factorialcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#563697">
+  <Item name="" identifier="factorialcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#563697">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -986,17 +986,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="abscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#2fdca2">
+  <Item name="" identifier="abscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#2fdca2">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1017,17 +1017,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="squarerootcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#ff8e70">
+  <Item name="" identifier="squarerootcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#ff8e70">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1048,17 +1048,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="modulocomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#1745b7">
+  <Item name="" identifier="modulocomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#1745b7">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1080,17 +1080,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="relaycomponent" category="Electrical" Tags="smallitem,signal,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#694341">
+  <Item name="" identifier="relaycomponent" category="Electrical" Tags="smallitem,signal,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#694341">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1122,17 +1122,17 @@
       <output name="power_value_out" displayname="connection.powervalueout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="delaycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#5e76a2">
+  <Item name="" identifier="delaycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#5e76a2">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1154,17 +1154,17 @@
       <input name="set_delay" displayname="connection.setdelay" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="memorycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a66c6b">
+  <Item name="" identifier="memorycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a66c6b">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1186,17 +1186,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="lightcomponent" category="Electrical" Tags="smallitem,lightcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="lightcomponent" category="Electrical" Tags="smallitem,lightcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="110" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="phosphorus" />
@@ -1224,17 +1224,17 @@
       <input name="set_color" displayname="connection.setcolor" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="lightcomponent90" nameidentifier="lightcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" Aliases="Light Component 90Deg" category="Electrical" Tags="smallitem,lightcomponent" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="lightcomponent90" nameidentifier="lightcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" Aliases="Light Component 90Deg" category="Electrical" Tags="smallitem,lightcomponent" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="110" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="phosphorus" />
@@ -1262,17 +1262,17 @@
       <input name="set_color" displayname="connection.setcolor" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="lightcomponentround" nameidentifier="lightcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" category="Electrical" Tags="smallitem,lightcomponent" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="lightcomponentround" nameidentifier="lightcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" category="Electrical" Tags="smallitem,lightcomponent" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="110" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="phosphorus" />
@@ -1300,17 +1300,17 @@
       <input name="set_color" displayname="connection.setcolor" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="oxygendetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="oxygendetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -1336,17 +1336,17 @@
       <output name="low_oxygen" displayname="connection.low_oxygen" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="waterdetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="waterdetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="130" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Upgrade gameversion="0.9.5.0" scale="0.5" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -1373,17 +1373,17 @@
       <output name="high_pressure" displayname="connection.highpressureout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="smokedetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="smokedetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="130" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -1408,17 +1408,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="motiondetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="motiondetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="130" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Upgrade gameversion="0.9.5.0" scale="0.5" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -1443,17 +1443,17 @@
       <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="signalcheckcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#4f6e3f">
+  <Item name="" identifier="signalcheckcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#4f6e3f">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1476,17 +1476,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="regexcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#424d8f">
+  <Item name="" identifier="regexcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#424d8f">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1508,17 +1508,17 @@
       <input name="set_output" displayname="connection.setoutput" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="oscillator" category="Electrical" Tags="smallitem,signal,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#987c6c">
+  <Item name="" identifier="oscillator" category="Electrical" Tags="smallitem,signal,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#987c6c">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1540,17 +1540,17 @@
       <output name="signal_out" displayname="connection.signalout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="wificomponent" category="Electrical" Tags="smallitem,signal,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6e514e">
+  <Item name="" identifier="wificomponent" category="Electrical" Tags="smallitem,signal,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6e514e">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" /> 
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1572,17 +1572,17 @@
       <input name="set_channel" displayname="connection.setchannel" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="multiplexercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" signalcomponentcolor="228,76,67,255" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="multiplexercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" signalcomponentcolor="228,76,67,255" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1615,17 +1615,17 @@
       <output name="selected_input_out" displayname="connection.selectedinputout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="demultiplexercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" signalcomponentcolor="130,157,92,255" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="demultiplexercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" signalcomponentcolor="130,157,92,255" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1658,17 +1658,17 @@
       <output name="selected_output_out" displayname="connection.selectedoutputout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="emergencysiren" category="Electrical" Tags="smallitem,sound" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="emergencysiren" category="Electrical" Tags="smallitem,sound" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="150" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
       <Item identifier="copper" />
@@ -1685,7 +1685,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="0.68" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="0.68" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="Content/Items/WarningSiren.ogg" type="OnActive" range="2000.0" loop="true" volume="0.5" selectionmode="Manual" />
       <sound file="Content/Items/AlarmDivingLoop.ogg" type="OnActive" range="2500.0" loop="true" volume="0.5" selectionmode="Manual" />
@@ -1704,17 +1704,17 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="alarmbuzzer" category="Electrical" Tags="smallitem,sound" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="alarmbuzzer" category="Electrical" Tags="smallitem,sound" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="100" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
       <Item identifier="copper" />
@@ -1731,7 +1731,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="2.6" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="2.6" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="301,963,42,57" origin="0.5,0.5" alpha="1.0" />
       <sound file="Content/Items/AlarmBuzzerLoop.ogg" type="OnActive" range="1000.0" loop="true" volume="0.5" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -1773,11 +1773,11 @@
     <Sprite texture="Content/Items/Electricity/signalcomp.png" depth="0.8" sourcerect="0,368,144,128" origin="0.5,0.3" canflipx="false" />
     <Price baseprice="200" minleveldifficulty="10">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="reactorcab" secondary="engcab" />
     <Deconstruct time="10">
@@ -1821,15 +1821,15 @@
     </Terminal>
   </Item>
   <Item name="" identifier="electriciansgoggles" scale="0.5" category="Equipment" tags="smallitem" allowasextracargo="true" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="engcab" amount="1"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.03" />
-    <Price baseprice="150" minavailable="1">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
+    <PreferredContainer primary="engcab" amount="2"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.06" />
+    <Price baseprice="150" minavailable="3">
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="8" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="24" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="copper" />
diff --git a/Content/Items/Engine/engine.xml b/Content/Items/Engine/engine.xml
index a186df8b..17515382 100644
--- a/Content/Items/Engine/engine.xml
+++ b/Content/Items/Engine/engine.xml
@@ -23,11 +23,11 @@
         <Affliction identifier="bleeding" strength="10" />
       </propellerdamage>
     </Engine>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0"  IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0"  IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Engine" currentvolume="gt 0.01" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="664,0,659,317" origin="0.5,0.5" alpha="0.2" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,0,0,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Repairable" StressDeteriorationMultiplier="gt 2.0" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="664,0,659,317" origin="0.5,0.5" alpha="0.2" />
       <StatusEffect type="OnActive" target="This">
@@ -90,16 +90,16 @@
         <Affliction identifier="bleeding" strength="10" />
       </propellerdamage>
     </Engine>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Engine" currentvolume="gt 0.01" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="0,933,1613,592" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.13.0.9" lightcolor="255,255,255,0" />
       <IsActive targetitemcomponent="Engine" currentvolume="gt 0.01" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="0,933,1613,592" origin="0.5,0.5" alpha="0.2" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,0,0,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Repairable" StressDeteriorationMultiplier="gt 2.0" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="0,933,1613,592" origin="0.5,0.5" alpha="0.2" />
       <StatusEffect type="OnActive" target="This">
@@ -159,7 +159,7 @@
         <Affliction identifier="bleeding" strength="10" />
       </propellerdamage>
     </Engine>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Engine" currentvolume="gt 0.01" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="1614,867,426,178" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
diff --git a/Content/Items/Fabricators/fabricators.xml b/Content/Items/Fabricators/fabricators.xml
index ff4acf55..0eb89de9 100644
--- a/Content/Items/Fabricators/fabricators.xml
+++ b/Content/Items/Fabricators/fabricators.xml
@@ -33,11 +33,11 @@
       <IsActiveConditional Condition="gt 0.0" />
     </DecorativeSprite>
 
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="351,624,336,400" alpha="1.0" />
     </LightComponent>
 
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="688,624,336,400" alpha="1.0" />
     </LightComponent>
     
@@ -78,7 +78,7 @@
       </StatusEffect>
     </Repairable>
 
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="11" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="" allowuioverlap="true"/>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true"/>
   </Item>
 
@@ -104,7 +104,7 @@
     <BrokenSprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" sourcerect="336,0,336,288" origin="0.5,0.5" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" sourcerect="672,0,336,288" origin="0.5,0.5" depth="0.8" maxcondition="0" />
 
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="688,339,336,288" alpha="1.0" />
     </LightComponent>
 
@@ -145,7 +145,7 @@
       </StatusEffect>
     </Repairable>
 
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="11" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="" allowuioverlap="true"/>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true"/>
   </Item>
 
@@ -169,7 +169,7 @@
     <Sprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" depth="0.8" sourcerect="0,304,256,320"/>
     <BrokenSprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" sourcerect="272,304,256,320" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" sourcerect="544,304,256,320" depth="0.8" maxcondition="0" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,665,256,320" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <DecorativeSprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" depth="0.84" sourcerect="866,484,156,105"/>
@@ -240,7 +240,7 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer capacity="3" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true"/>
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="5" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="7" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="11" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="4" uilabel="" allowuioverlap="true"/>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Gardening/ballastflora.xml b/Content/Items/Gardening/ballastflora.xml
index aec0f213..034717f9 100644
--- a/Content/Items/Gardening/ballastflora.xml
+++ b/Content/Items/Gardening/ballastflora.xml
@@ -11,7 +11,7 @@
                       roothealth="200"
                       rootcolor="255,150,150,255"
                       maxanger="5" 
-                      maxpowercapacity="10000"
+                      maxpowercapacity="22000"
                       explosionresistance="0.8"
                       submergedwaterresistance="0.5"
                       firevulnerability="10.0"
diff --git a/Content/Items/Gardening/gardeningtools.xml b/Content/Items/Gardening/gardeningtools.xml
index 810bd168..46443f1a 100644
--- a/Content/Items/Gardening/gardeningtools.xml
+++ b/Content/Items/Gardening/gardeningtools.xml
@@ -4,14 +4,14 @@
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" sourcerect="896,384,128,128" depth="0.75" premultiplyalpha="false" origin="0.5,0.5" />
     <Body width="95" height="106" density="25" />
     <Price baseprice="120" minleveldifficulty="1">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetach" PickingTime="5.0" aimpos="85,-10" handle1="0,0" attachable="true" aimable="true" />
     <Fabricate suitablefabricators="fabricator" requiredtime="45">
       <RequiredSkill identifier="mechanical" level="20" />
@@ -23,10 +23,10 @@
       <Item identifier="steel" mincondition="0.5" />
       <Item identifier="plastic" mincondition="1" />
     </Deconstruct>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" drawinventory="false" uilabel="" allowuioverlap="true" allowdraganddrop="false" showcontainedstateindicator="false">
-      <Containable items="seed" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" drawinventory="false" uilabel="" allowuioverlap="true" allowdraganddrop="false" showcontainedstateindicator="false">
+      <Containable items="seed,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.025" sourcerect="896,512,128,128" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Planter selectkey="Select" canbepicked="true" pickingtime="5.0" msg="ItemMsgPlantSeed">
@@ -40,15 +40,15 @@
     <InventoryIcon texture="Content/Items/Gardening/GrowablePlants_Temp.png" sourcerect="896,0,128,128" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" sourcerect="896,0,128,128" depth="0.55" origin="0.5,0.5" />
     <Price baseprice="80" minleveldifficulty="1">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
       <Price storeidentifier="merchantclown" minavailable="0" maxavailable="2" />
     </Price>
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Body width="121" height="96" density="15" />
     <Fabricate suitablefabricators="fabricator" requiredtime="35">
       <RequiredSkill identifier="mechanical" level="20" />
@@ -65,18 +65,18 @@
     </RepairTool>
   </Item>
   
-  <Item name="" identifier="fertilizer" tags="fertilizer,smallitem" maxstacksize="8" category="Misc" scale="0.5" health="800">
+  <Item name="" identifier="fertilizer" tags="fertilizer,smallitem" maxstacksize="16" category="Misc" scale="0.5" health="800">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" sourcerect="910,128,87,125" depth="0.55" origin="0.5,0.5" />
     <Price baseprice="140" minleveldifficulty="1">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
       <Price storeidentifier="merchantclown" minavailable="0" maxavailable="2" />
     </Price>
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Fabricate suitablefabricators="fabricator" requiredtime="45">
       <RequiredSkill identifier="electrical" level="20" />
       <RequiredItem identifier="uranium" />
@@ -97,15 +97,15 @@
   
   <Item name="" identifier="seedbag" category="Misc" Tags="smallitem" scale="0.5">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" sourcerect="841,704,49,65" depth="0.55" origin="0.5,0.5" />
     <Body width="45" height="60" density="12" />
     <Price baseprice="60" minleveldifficulty="1">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="25">
       <RequiredSkill identifier="electrical" level="15" />
@@ -115,8 +115,8 @@
       <RequiredItem identifier="organicfiber" />
     </Deconstruct>
     <Holdable slots="RightHand+LeftHand,Any" msg="ItemMsgPickUpSelect" holdangle="40" handle1="0,10" />
-    <ItemContainer capacity="12" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="seed" />
+    <ItemContainer capacity="26" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="seed,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Gardening/growableplants.xml b/Content/Items/Gardening/growableplants.xml
index e2ef20b8..76d5ee0a 100644
--- a/Content/Items/Gardening/growableplants.xml
+++ b/Content/Items/Gardening/growableplants.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <!-- -->
-  <Item name="" identifier="creepingorangevineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="255,54,0,255">
+  <Item name="" identifier="creepingorangevineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="255,54,0,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="830,636,31,30" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -49,16 +49,16 @@
     </Upgrade>
   </Item>
   
-  <Item name="" identifier="tobaccovineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="48,122,245,255">
+  <Item name="" identifier="tobaccovineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="48,122,245,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="863,636,30,31" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -96,16 +96,16 @@
     </Upgrade>
   </Item>
   
-  <Item name="" identifier="saltvineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
+  <Item name="" identifier="saltvineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="829,666,33,35" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -143,16 +143,16 @@
     </Upgrade>
   </Item>
   
-  <Item name="" identifier="raptorbaneseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="238,36,98,255">
+  <Item name="" identifier="raptorbaneseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="238,36,98,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="863,668,30,33" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -192,17 +192,17 @@
   </Item>
 
 
-  <Item name="" identifier="banana" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
+  <Item name="" identifier="banana" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
     <!-- TODO: sprite -->
     <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="263,193,38,39" depth="0.2" origin="0.5,0.5" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.06" />
     <Price baseprice="50" canbespecial="false">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="5" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="9" maxavailable="5" sold="true">
         <Reputation faction="clowns" min="50"/>
       </Price>
     </Price>
diff --git a/Content/Items/Gardening/plantproducts.xml b/Content/Items/Gardening/plantproducts.xml
index 5578e7ee..460cb974 100644
--- a/Content/Items/Gardening/plantproducts.xml
+++ b/Content/Items/Gardening/plantproducts.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="creepingorange" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="creepingorange" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="971,649,43,55" origin="0.5,0.5" />
     <Body radius="30" density="9" />
     <Price baseprice="20" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="30" fabricationlimitmin="3" fabricationlimitmax="5"/>
     <Deconstruct time="35">
@@ -32,15 +32,15 @@
     <PreferredContainer secondary="medfabcab,storagecab"/>
   </Item>
   
-  <Item name="" identifier="tobaccobud" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="tobaccobud" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,plantitem" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="904,646,56,61" origin="0.5,0.5" />
     <Body radius="30" density="9" waterdragcoefficient="20"/>
     <Price baseprice="40" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="35">
       <Item identifier="carbon" mincondition="0.5" />
@@ -61,7 +61,7 @@
     <PreferredContainer secondary="medfabcab,storagecab"/>
   </Item>
 
-  <Item name="" identifier="badraptorbane" descriptionidentifier="raptorbane" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="badraptorbane" descriptionidentifier="raptorbane" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="907,838,44,50" origin="0.5,0.5" />
     <Body radius="30" density="9"/>
     <Deconstruct time="35">
@@ -95,15 +95,15 @@
     <PreferredContainer secondary="storagecab"/>
   </Item>
   
-  <Item name="" identifier="saltbulb" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem,explodesinwater" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="saltbulb" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,plantitem,explodesinwater" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="968,712,49,55" origin="0.5,0.5" />
     <Body radius="30" density="9" />
     <Price baseprice="65" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="35">
       <Item identifier="sodium" />
@@ -133,15 +133,15 @@
     <PreferredContainer secondary="storagecab"/>
   </Item>
 
-  <Item name="" identifier="raptorbane" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="raptorbane" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="971,777,44,50" origin="0.5,0.5" />
     <Body radius="30" density="9" waterdragcoefficient="10"/>
     <Price baseprice="40" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="35">
       <Item identifier="carbon" mincondition="0.5" />
@@ -163,7 +163,7 @@
     <PreferredContainer secondary="storagecab"/>
   </Item>
 
-  <Item name="" identifier="badcreepingorange" descriptionidentifier="creepingorange" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="5.5" allowasextracargo="true">
+  <Item name="" identifier="badcreepingorange" descriptionidentifier="creepingorange" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="5.5" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="971,835,43,55" origin="0.5,0.5" />
     <Body radius="30" density="9" />
     <Deconstruct time="35">
diff --git a/Content/Items/Genetic/genetic.xml b/Content/Items/Genetic/genetic.xml
index f07944b3..3266aaf0 100644
--- a/Content/Items/Genetic/genetic.xml
+++ b/Content/Items/Genetic/genetic.xml
@@ -3,7 +3,7 @@
   <Item name="" identifier="op_researchterminal" tags="geneticresearchstation" width="494" height="297" texturescale="1.0,1.0" scale="0.5" category="Machine">
     <sprite texture="Content/Map/Outposts/Art/MedicalItemResearch.png" sourcerect="417,6,494,297" depth="0.79" premultiplyalpha="false" origin="0.5,0.5" />
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="134,969,54,45" origin="0.5,0.45" />
-    <LightComponent range="0.0" powerconsumption="5" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" powerconsumption="5" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/MedicalItemResearchLights.png" sourcerect="417,6,494,297" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Deconstructor canbeselected="true" showoutput="false" powerconsumption="500.0" deconstructitemssimultaneously="true" msg="ItemMsgInteractSelect" activatebuttontext="researchstation.invalidinput" infotext="researchstation.empty.infotext" infoareawidth="0.7">
@@ -12,11 +12,11 @@
       <poweronsound file="Content/Items/PowerOnLight3.ogg" range="600" loop="false" />
       <StatusEffect type="InWater" target="This" condition="-0.5" />
     </Deconstructor>
-    <ItemContainer capacity="2" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true">
-      <Containable items="geneticmaterial,stabilozine,unidentifiedgeneticmaterial,researchmaterial" />
+    <ItemContainer capacity="4" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="2" uilabel="" allowuioverlap="true">
+      <Containable items="geneticmaterial,stabilozine,unidentifiedgeneticmaterial,researchmaterial,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="5" uilabel="" allowuioverlap="true">
-      <Containable items="geneticmaterial,stabilozine,unidentifiedgeneticmaterial,researchmaterial,smallitem,mediumitem" />
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="5" uilabel="" allowuioverlap="true">
+      <Containable items="geneticmaterial,stabilozine,unidentifiedgeneticmaterial,researchmaterial,smallitem,mediumitem,ammobox,deepdiving,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.0" canbeselected="true" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.16" minsize="400,180" maxsize="480,280" anchor="Center" relativeoffset="0.0,0.27" style="ItemUI" />
@@ -42,7 +42,7 @@
   </Item>
   <Item name="" identifier="genesplicer" scale="0.4" category="Equipment" tags="smallitem,geneticdevice" description="" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab" secondary="medcab"/>
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab,researchcontainer" spawnprobability="0.02"/>
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab,researchcontainer" spawnprobability="0.04"/>
     <Price baseprice="500" minleveldifficulty="15">
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -67,8 +67,8 @@
     <InventoryIcon texture="Content/Items/Genetic/Genetic.png" sourcerect="244,62,76,65" origin="0.5,0.5" />
     <Sprite name="Headset" texture="Content/Items/Genetic/Genetic.png" depth="0.6" sourcerect="67,85,73,35" origin="0.5,0.5" />
     <Body radius="15" width="45" density="25" />
-    <ItemContainer capacity="1" maxstacksize="1" autoinject="true" autoinjectthreshold="Infinity" allowswappingcontaineditems="false">
-      <Containable items="geneticmaterial" />
+    <ItemContainer capacity="1" maxstacksize="2" autoinject="true" autoinjectthreshold="Infinity" allowswappingcontaineditems="false">
+      <Containable items="geneticmaterial,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Wearable limbtype="Head" slots="Any,HealthInterface" msg="ItemMsgPickUpSelect" displaycontainedstatus="true">
       <sprite name="Gene Splicer Wearable" texture="Content/Items/Genetic/Genetic.png" limb="Head" hidelimb="false" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.5" hideotherwearables="false" sourcerect="258,131,64,54" origin="0.6,0.0" />
@@ -76,14 +76,14 @@
   </Item>
   <Item name="" identifier="geneticmaterial_unresearched" nameidentifier="unidentifiedgeneticmaterial" 
         aliases="geneticmaterialcrawler_unresearched,geneticmaterialcrawler_unresearched2,geneticmaterialcrawler_unresearched3,geneticmaterialmudraptor_unresearched,geneticmaterialmudraptor_unresearched2,geneticmaterialmudraptor_unresearched3,geneticmaterialmoloch_unresearched,geneticmaterialmoloch_unresearched2,geneticmaterialmoloch_unresearched3,geneticmaterialmantis_unresearched,geneticmaterialmantis_unresearched2,geneticmaterialmantis_unresearched3,geneticmaterialthresher_unresearched,geneticmaterialthresher_unresearched2,geneticmaterialthresher_unresearched3,geneticmaterialhammerhead_unresearched,geneticmaterialhammerhead_unresearched2,geneticmaterialhammerhead_unresearched3,geneticmaterialhammerheadmatriarch_unresearched,geneticmaterialhammerheadmatriarch_unresearched2,geneticmaterialhammerheadmatriarch_unresearched3,geneticmaterialspineling_unresearched,geneticmaterialspineling_unresearched2,geneticmaterialspineling_unresearched3,geneticmaterialhusk_unresearched,geneticmaterialhusk_unresearched2,geneticmaterialhusk_unresearched3,geneticmaterialmollusc_unresearched,geneticmaterialmollusc_unresearched2,geneticmaterialmollusc_unresearched3,geneticmaterialskitter_unresearched,geneticmaterialskitter_unresearched2,geneticmaterialskitter_unresearched3,geneticmaterialhunter_unresearched,geneticmaterialhunter_unresearched2,geneticmaterialhunter_unresearched3" 
-        category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" tags="smallitem,unidentifiedgeneticmaterial,blackmarketgenes" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_soft" hideinmenus="true">
+        category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" tags="smallitem,unidentifiedgeneticmaterial,blackmarketgenes" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_soft" hideinmenus="true">
     <PreferredContainer primary="medfabcab" spawnprobability="0"/>
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab,researchcontainer" spawnprobability="0.3"/>
-    <PreferredContainer secondary="geneticstorage" minamount="1" maxamount="2" spawnprobability="1.0" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="3" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab,researchcontainer" spawnprobability="0.6"/>
+    <PreferredContainer secondary="geneticstorage" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="4" maxamount="6" spawnprobability="0.4" />
     <Price baseprice="300" sold="false" requiresunlock="true">
-      <Price storeidentifier="merchantcity" sold="true" minavailable="5" maxavailable="10"/>
-      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.2" minavailable="10" maxavailable="15" />
+      <Price storeidentifier="merchantcity" sold="true" minavailable="15" maxavailable="10"/>
+      <Price storeidentifier="merchantresearch" sold="true" multiplier="3.6" minavailable="30" maxavailable="15" />
     </Price>
     <Deconstruct time="5" chooserandom="true" amount="1" requireddeconstructor="geneticresearchstation">
       <Item identifier="geneticmaterialcrawler" commonness="3" requiredotheritem="stabilozine" outconditionmin="0.1" outconditionmax="0.2" activatebuttontext="researchstation.research" infotext="researchstation.research.infotext" infotextonotheritemmissing="researchstation.combine.missingitem" />
@@ -127,11 +127,11 @@
     <Body width="15" radius="15" density="20" />
     <Pickable slots="Any" />
   </Item>
-  <Item name="" identifier="geneticmaterialcrawler" nameidentifier="geneticmaterial" category="Material" maxstacksize="1" tags="smallitem,geneticmaterial" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_metal_light" hideconditionbar="true" hideconditionintooltip="false" allowsellingwhenbroken="true">
+  <Item name="" identifier="geneticmaterialcrawler" nameidentifier="geneticmaterial" category="Material" maxstacksize="2" tags="smallitem,geneticmaterial" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_metal_light" hideconditionbar="true" hideconditionintooltip="false" allowsellingwhenbroken="true">
     <PreferredContainer primary="medfabcab" />
     <Price baseprice="750" sold="false">
       <Price storeidentifier="merchantcity"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
     </Price>
     <Deconstruct time="5" requireddeconstructor="geneticresearchstation">
       <Item identifier="geneticmaterialcrawler" requiredotheritem="geneticmaterial" activatebuttontext="researchstation.combine" infotext="researchstation.combine.infotext" infotextonotheritemmissing="researchstation.refine.missingitem" />
@@ -159,7 +159,7 @@
     <Body width="23" height="31" density="20" />
     <Holdable handle1="0,0" slots="Any"></Holdable>
     <ItemContainer capacity="1" canbeselected="false" hideitems="true" allowaccess="false" showcontainedstateindicator="false">
-      <Containable items="geneticmaterial" />
+      <Containable items="geneticmaterial,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="geneticmaterialmudraptor" variantof="geneticmaterialcrawler" nameidentifier="geneticmaterial">
@@ -223,7 +223,7 @@
       <Item identifier="geneticmaterialhusk" multiplier="5" />
     </Deconstruct>
     <Price>
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="4" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="4" sold="true">
         <Reputation faction="huskcult" min="70"/>
       </Price>
     </Price>
diff --git a/Content/Items/Jobgear/Assistant/assistant_gear.xml b/Content/Items/Jobgear/Assistant/assistant_gear.xml
index f2abaeb6..b66cab77 100644
--- a/Content/Items/Jobgear/Assistant/assistant_gear.xml
+++ b/Content/Items/Jobgear/Assistant/assistant_gear.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <Item name="" identifier="assistantclothes" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
diff --git a/Content/Items/Jobgear/Assistant/assistant_talent_items.xml b/Content/Items/Jobgear/Assistant/assistant_talent_items.xml
index f9a8c10b..e874771f 100644
--- a/Content/Items/Jobgear/Assistant/assistant_talent_items.xml
+++ b/Content/Items/Jobgear/Assistant/assistant_talent_items.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="skillbooksailorsguide" category="Misc" cargocontaineridentifier="metalcrate" allowasextracargo="true" Tags="smallitem,skillbook" maxstacksize="8" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="skillbooksailorsguide" category="Misc" cargocontaineridentifier="metalcrate" allowasextracargo="true" Tags="smallitem,skillbook" maxstacksize="16" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="350" buyingpricemodifier="2.5" minleveldifficulty="40">
       <Price storeidentifier="merchantoutpost" maxavailable="1" />
@@ -59,9 +59,9 @@
     <PreferredContainer primary="storagecab"/>
     <Price baseprice="140" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="15">
@@ -85,9 +85,9 @@
   <Item name="" identifier="makeshiftshelf" tags="container,cargocontainer" linkable="true" canflipx="false" pickdistance="150" scale="0.5" isshootable="true">
     <Price baseprice="140" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="15">
@@ -108,21 +108,21 @@
         <DropContainedItems/>
       </StatusEffect>
     </Holdable>
-    <ItemContainer capacity="2" maxstacksize="1" canbeselected="true" hideitems="false" itempos="92,-48" iteminterval="0,-92" AllowAccessWhenDropped="false" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="4" maxstacksize="2" canbeselected="true" hideitems="false" itempos="92,-48" iteminterval="0,-92" AllowAccessWhenDropped="false" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="crate" />
+      <Containable items="crate,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
   <Item name="" identifier="ceremonialsword" category="Weapon" Tags="smallitem,weapon,gunsmith,mountableweapon,sharptool" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
     <Price baseprice="340" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="titaniumaluminiumalloy" />
@@ -197,7 +197,7 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnBroken" target="This">
         <particleemitter particle="mudrapeggbrownchunks" particleamount="100" velocitymin="100" velocitymax="2000" anglemin="0" anglemax="360" scalemin="0.4" scalemax="0.6" />
@@ -211,19 +211,19 @@
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
       <StatusEffect type="Always" target="This" Condition="0" setvalue="true">
         <Conditional Scale="gte 0.5" />
-        <SpawnCharacter speciesname="Mudraptor_pet" totalmaxcount="2" inheritteam="true"/>
+        <SpawnCharacter speciesname="Mudraptor_pet" totalmaxcount="4" inheritteam="true"/>
         <Remove />
       </StatusEffect>
-      <Containable items="antibloodloss1">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <!-- increase scale -->
         <StatusEffect type="OnContaining" target="This" Scale="0.002"/>
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="255,255,255,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+    <LightComponent range="20" lightcolor="255,255,255,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="300,291,98,113" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="40" lightcolor="255,255,255,70" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="160" lightcolor="255,255,255,70" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="410,301,88,95" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
   </Item>
diff --git a/Content/Items/Jobgear/Captain/captain_gear.xml b/Content/Items/Jobgear/Captain/captain_gear.xml
index 38d2d311..aa42a878 100644
--- a/Content/Items/Jobgear/Captain/captain_gear.xml
+++ b/Content/Items/Jobgear/Captain/captain_gear.xml
@@ -2,13 +2,13 @@
 <Items>
   <!-- HATS START -->
   <Item name="" identifier="captainscap1" aliases="captainscap" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
     <Price baseprice="75" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10" />
     <Sprite name="Captain's Cap 1" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="12,130,89,50" origin="0.5,0.5" />
@@ -20,13 +20,13 @@
     </Wearable>
   </Item>
   <Item name="" identifier="captainscap2" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
     <Price baseprice="75" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10" />
     <Sprite name="Captain's Cap 2" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="114,129,83,48" origin="0.5,0.5" />
@@ -38,13 +38,13 @@
     </Wearable>
   </Item>
   <Item name="" identifier="captainscap3" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
     <Price baseprice="75" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10" />
     <Sprite name="Captain's Cap 3" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="212,119,90,53" origin="0.5,0.5" />
@@ -56,13 +56,13 @@
     </Wearable>
   </Item>
   <Item name="" identifier="captainsseparatistcap1" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
     <Price baseprice="75" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10" />
     <Sprite name="Captain's Cap 1" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="314,115,89,59" origin="0.5,0.5" />
@@ -74,13 +74,13 @@
     </Wearable>
   </Item>
   <Item name="" identifier="captainsseparatistcap2" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
     <Price baseprice="75" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10" />
     <Sprite name="Captain's Cap 2" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="424,125,79,38" origin="0.5,0.5" />
@@ -96,11 +96,11 @@
   <Item name="" identifier="captainsuniform1" aliases="captainsuniform" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -130,11 +130,11 @@
   <Item name="" identifier="captainsuniform2" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -164,11 +164,11 @@
   <Item name="" identifier="captainsuniform3" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -198,11 +198,11 @@
   <Item name="" identifier="captainseparatistsuniform1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -232,11 +232,11 @@
   <Item name="" identifier="captainseparatistsuniform2" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -266,11 +266,11 @@
   <Item name="" identifier="captainseparatistsuniform3" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
diff --git a/Content/Items/Jobgear/Captain/captain_talent_items.xml b/Content/Items/Jobgear/Captain/captain_talent_items.xml
index 3e77a424..1ae06422 100644
--- a/Content/Items/Jobgear/Captain/captain_talent_items.xml
+++ b/Content/Items/Jobgear/Captain/captain_talent_items.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="handcannonround" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" Scale="0.5" tags="smallitem,handcannonammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="handcannonround" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="24" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" Scale="0.5" tags="smallitem,handcannonammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
-    <PreferredContainer primary="handcannon" amount="6" spawnprobability="1.0"/>
-    <PreferredContainer secondary="wrecksecarmcab" minamount="1" maxamount="6" spawnprobability="0.02"/>    
+    <PreferredContainer primary="handcannon" amount="12" spawnprobability="1"/>
+    <PreferredContainer secondary="wrecksecarmcab" minamount="2" maxamount="12" spawnprobability="0.04"/>    
     <Price baseprice="50" sold="false" />
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="6">
       <RequiredSkill identifier="weapons" level="45" />
@@ -37,11 +37,11 @@
     <PreferredContainer primary="secarmcab"/>
     <PreferredContainer secondary="armcab,weaponholder" />
     <Price baseprice="600" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="70" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="60" />
@@ -73,12 +73,12 @@
       <RequiredItems items="handcannonammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="60" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="6" hideitems="false" containedstateindicatorstyle="bullet" containedstateindicatorslot="0" containedspritedepth="0.56">
-      <Containable items="handcannonammo" hide="true"/>
+    <ItemContainer capacity="1" maxstacksize="12" hideitems="false" containedstateindicatorstyle="bullet" containedstateindicatorslot="0" containedspritedepth="0.56">
+      <Containable items="handcannonammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="true"/>
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="17,4" setactive="true"/>
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="17,4" setactive="true"/>
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="5000" fadeouttime="5" />
@@ -87,14 +87,14 @@
     </Quality>
     <SkillRequirementHint identifier="weapons" level="60" />
   </Item>
-  <Item name="" identifier="coalitioncommendation" category="Misc" Tags="smallitem" cargocontaineridentifier="metalcrate" allowasextracargo="true" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="coalitioncommendation" category="Misc" Tags="smallitem" cargocontaineridentifier="metalcrate" allowasextracargo="true" maxstacksize="64" maxstacksizecharacterinventory="16" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="300" buyingpricemodifier="5" minleveldifficulty="40">
       <Price storeidentifier="merchantoutpost" maxavailable="0" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" maxavailable="1" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" maxavailable="1" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="2.7" />
       <Price storeidentifier="merchantmilitary" maxavailable="1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="copper" />
@@ -109,21 +109,21 @@
       <StatusEffect type="OnUse" target="This" Condition="-100.0" disabledeltatime="true" />
       <StatusEffect type="OnUse" target="UseTarget" disabledeltatime="true">
         <Sound file="Content/Items/Button/button.ogg" type="OnUse" range="500" />
-        <GiveExperience amount="275" />
+        <GiveExperience amount="1100" />
       </StatusEffect>
       <StatusEffect type="OnBroken" target="This">
         <Remove />
       </StatusEffect>
     </MeleeWeapon>
   </Item>
-  <Item name="" identifier="coalitionmedal" category="Misc" Tags="smallitem" cargocontaineridentifier="metalcrate" allowasextracargo="true" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="coalitionmedal" category="Misc" Tags="smallitem" cargocontaineridentifier="metalcrate" allowasextracargo="true" maxstacksize="64" maxstacksizecharacterinventory="16" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="600" buyingpricemodifier="5" minleveldifficulty="65">
       <Price storeidentifier="merchantoutpost" maxavailable="0" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" maxavailable="1" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" maxavailable="1" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="2.7" />
       <Price storeidentifier="merchantmilitary" maxavailable="1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="copper" />
@@ -139,7 +139,7 @@
       <StatusEffect type="OnUse" target="This" Condition="-100.0" disabledeltatime="true" />
       <StatusEffect type="OnUse" target="UseTarget" disabledeltatime="true">
         <Sound file="Content/Items/Button/button.ogg" type="OnUse" range="500" />
-        <GiveExperience amount="550" />
+        <GiveExperience amount="2200" />
       </StatusEffect>
       <StatusEffect type="OnBroken" target="This">
         <Remove />
@@ -179,10 +179,10 @@
     </Holdable>
   </Item>
 
-  <Rum name="" identifier="rum" category="Medical,Misc" maxstacksize="8" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.01" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true"/>
+  <Rum name="" identifier="rum" category="Medical,Misc" maxstacksize="16" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true"/>
     <PreferredContainer primary="medfabcab" secondary="medcab"/>
     <Price baseprice="130" sold="false">
       <Price storeidentifier="merchantclown" minavailable="0" maxavailable="3" sold="true">
diff --git a/Content/Items/Jobgear/Clown/clown.xml b/Content/Items/Jobgear/Clown/clown.xml
index f4ecae14..60dcc9a3 100644
--- a/Content/Items/Jobgear/Clown/clown.xml
+++ b/Content/Items/Jobgear/Clown/clown.xml
@@ -2,16 +2,16 @@
 <Items>
   <Item name="" identifier="clownmask" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clownmask,clowns" description="" scale="0.5">
     <Price baseprice="40" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" minavailable="3" />
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="5">
+      <Price storeidentifier="merchantclown" minavailable="9" maxavailable="5">
         <Reputation faction="clowns" min="30"/>
       </Price>
     </Price>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.04" />
     <PreferredContainer primary="crewcab"/>
     <Sprite name="Clown Mask" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="414,318,89,71" origin="0.5,0.5" scale="0.5" />
     <Body width="40" radius="30" density="15" />
@@ -25,16 +25,16 @@
   </Item>
   <Item name="" identifier="clowncostume" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing,clowngear,clowns" description="" impactsoundtag="impact_soft" scale="0.5">
     <Price baseprice="40" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" minavailable="3" />
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="5">
+      <Price storeidentifier="merchantclown" minavailable="9" maxavailable="5">
         <Reputation faction="clowns" min="30"/>
       </Price>
     </Price>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.04" />
     <PreferredContainer primary="crewcab"/>
     <InventoryIcon name="Clown Costume Icon" texture="Content/Items/InventoryIconAtlas.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
     <Sprite name="Clown Costume" texture="Content/Items/Jobgear/MiscJobGear.png" sourcerect="247,14,117,55" depth="0.6" origin="0.5,0.5" />
@@ -72,7 +72,7 @@
         <Reputation faction="clowns" min="90"/>
       </Price>
     </Price>
-    <PreferredContainer primary="wreckstoragecab" spawnprobability="0.01" />
+    <PreferredContainer primary="wreckstoragecab" spawnprobability="0.02" />
     <PreferredContainer primary="crewcab"/>
     <Sprite name="Clown Mask" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="414,417,89,71" origin="0.5,0.5" scale="0.5" />
     <Body width="40" radius="30" density="15" />
@@ -87,7 +87,7 @@
   </Item>
   <Item name="" identifier="clownsuitunique" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing,clowngear,clowns" description="" impactsoundtag="impact_soft" hideinmenus="true" scale="0.5">
     <Price baseprice="40" sold="false" canbespecial="false" />
-    <PreferredContainer primary="wreckstoragecab" spawnprobability="0.01" />
+    <PreferredContainer primary="wreckstoragecab" spawnprobability="0.02" />
     <PreferredContainer primary="crewcab"/>
     <InventoryIcon name="Clown Costume Icon" texture="Content/Items/InventoryIconAtlas2.png" sourcerect="320,384,64,64" origin="0.5,0.5" />
     <Sprite name="Clown Costume" texture="Content/Items/Jobgear/MiscJobGear.png" sourcerect="769,74,118,72" depth="0.6" origin="0.5,0.5" />
@@ -125,11 +125,11 @@
   </Item>
   
   <Item name="" identifier="cymbals" category="Misc" tags="smallitem,clowns,provocativetohumanai" scale="0.5" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="crewcab" spawnprobability="0.01" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.01"/>
+    <PreferredContainer primary="crewcab" spawnprobability="0.02" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.02"/>
     <PreferredContainer secondary="locker"/>
     <Price baseprice="100" canbespecial="false" sold="false">
-      <Price storeidentifier="merchantclown" minavailable="1" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="3" sold="true">
         <Reputation faction="clowns" min="70"/>
       </Price>
     </Price>
@@ -150,12 +150,12 @@
     <aitarget soundrange="3000" fadeouttime="5" />
   </Item>
 
-  <Item name="" identifier="bananapeel" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" tags="smallitem,clowns" Scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="crewcab" spawnprobability="0.01" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.01"/>
+  <Item name="" identifier="bananapeel" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" tags="smallitem,clowns" Scale="0.5" impactsoundtag="impact_soft">
+    <PreferredContainer primary="crewcab" spawnprobability="0.02" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.02"/>
     <PreferredContainer secondary="locker"/>
     <Price baseprice="30" canbespecial="false" sold="false">
-      <Price storeidentifier="merchantclown" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="clowns" min="30"/>
       </Price>
     </Price>
@@ -226,8 +226,8 @@
     <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="5,0,158,83" depth="0.54" origin="0.5,0.5" />
     <Body width="150" height="76" density="20" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="12" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem" excludeditems="toolbox,cargoscooter" />
+    <ItemContainer capacity="26" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Controller UserPos="0,-20" direction="Right" canbeselected="true" AllowSelectingWhenSelectedByOther="false" selectkey="Use" drawuserbehind="true" forceusertostayattached="true" msg="itemmsggoinside">
       <limbposition limb="Head" position="74,-40" />
@@ -244,15 +244,15 @@
   </Item>
 
   <Item name="" identifier="bikehorn" category="Misc" tags="smallitem,hornitem,clowns,provocativetohumanai" scale="0.5" cargocontaineridentifier="metalcrate" description="HONK">
-    <PreferredContainer primary="crewcab" spawnprobability="0.05" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.05"/>
+    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.1"/>
     <Price baseprice="5" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1"/>
-      <Price storeidentifier="merchantcity" minavailable="1"/>
+      <Price storeidentifier="merchantoutpost" minavailable="3"/>
+      <Price storeidentifier="merchantcity" minavailable="3"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="5">
+      <Price storeidentifier="merchantclown" minavailable="9" maxavailable="5">
         <Reputation faction="clowns" min="30"/>
       </Price>
     </Price>
@@ -269,14 +269,14 @@
   
   <Item name="" identifier="toyhammer" category="Weapon" Tags="smallitem,mountableweapon,clowns" Scale="0.5" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer primary="crewcab" secondary="armcab"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" spawnprobability="0.06"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" spawnprobability="0.12"/>
     <Price baseprice="80" sold="false" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" sold="true" minavailable="1"/>
-      <Price storeidentifier="merchantcity" sold="true" minavailable="1"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantclown" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantoutpost" sold="true" minavailable="3"/>
+      <Price storeidentifier="merchantcity" sold="true" minavailable="3"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
+      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="clowns" min="50"/>
       </Price>
     </Price>
@@ -314,7 +314,7 @@
   </Item>
   <Item name="" identifier="honkmotherianscriptures1" category="Misc" hideinmenus="true" Tags="smallitem,clowns" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <Price baseprice="20" canbespecial="false" sold="false">
-      <Price storeidentifier="merchantclown" minavailable="2" maxavailable="3" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="6" maxavailable="3" sold="true">
         <Reputation faction="clowns" min="30"/>
       </Price>
     </Price>
@@ -331,7 +331,7 @@
   </Item>
   <Item name="" identifier="honkmotherianscriptures2" variantof="honkmotherianscriptures1">
     <Price baseprice="20" canbespecial="false" sold="false">
-      <Price storeidentifier="merchantclown" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="clowns" min="40"/>
       </Price>
     </Price>
@@ -342,7 +342,7 @@
   </Item>
   <Item name="" identifier="honkmotherianscriptures3" variantof="honkmotherianscriptures1">
     <Price baseprice="20" canbespecial="false" sold="false">
-      <Price storeidentifier="merchantclown" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="clowns" min="50"/>
       </Price>
     </Price>
@@ -377,7 +377,7 @@
     <Wearable slots="OuterClothes+RightHand" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select" allowusewhenworn="true">
       <sprite name="Clown Exosuit Helmet Wearable" texture="Content/Items/JobGear/Clown/ClownExosuit.png" limb="Head" hidelimb="true" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hideotherwearables="true" hidewearablesoftype="" sourcerect="0,0,1,1" origin="0.5,0.5"/>
       <sprite name="Clown Exosuit Torso" texture="Content/Items/JobGear/Clown/ClownExosuit.png" limb="Torso" hidelimb="true" inherittexturescale="true" hideotherwearables="true" inheritorigin="false" origin="0.5,0.7" inheritlimbdepth="false" depth="0.061" inheritsourcerect="false" sourcerect="167,1,203,193">
-        <LightComponent range="100" lightcolor="250,224,165,100" castshadows="false" depth="0.6" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="400" lightcolor="250,224,165,100" castshadows="false" depth="0.6" powerconsumption="10" IsOn="true" allowingameediting="false">
           <Sprite texture="Content/Items/JobGear/Clown/ClownExosuit.png" origin="0.5,0.7" sourcerect="304,271,203,193" alpha="1.0" />
         </LightComponent>
       </sprite>
@@ -437,7 +437,7 @@
       <RequiredItems items="bananapeelprojectile" type="Contained" />
     </RangedWeapon>
     <ItemContainer capacity="0" maxstacksize="0" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0">
-      <Containable items="none" />
+      <Containable items="none,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <StatusEffect type="OnWearing" target="Contained" playsoundonrequireditemfailure="true">
@@ -445,9 +445,9 @@
         <Conditional condition="lte 0.0" />
         <Sound file="Content/Items/WarningBeep.ogg" range="500" loop="true"/>
       </StatusEffect>
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="oxygensource,weldingtoolfuel" />
-        <Containable items="oxygensource">
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="oxygensource,weldingtoolfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
+        <Containable items="oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" />
           <StatusEffect type="OnWearing" target="Contained" Condition="-0.2" comparison="And">
             <Conditional TargetContainer="true" TargetGrandparent="true" IsDead="false" />
@@ -459,14 +459,14 @@
             <Sound file="Content/Items/WarningBeepSlow.ogg" range="250" loop="true"/>
           </StatusEffect>
         </Containable>
-        <Containable items="oxygenitetank">
+        <Containable items="oxygenitetank,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <StatusEffect type="OnWearing" target="Character" SpeedMultiplier="1.2" setvalue="true" targetslot="0" comparison="And">
             <Conditional IsDead="false" />
             <Conditional DecreasedOxygenConsumption="lt 99" />
             <Conditional NeedsAir="true" />
           </StatusEffect>
         </Containable>
-        <Containable items="weldingfueltank" blameequipperfordeath="true">
+        <Containable items="weldingfueltank,ammobox,deepdiving,smallitem,mediumitem,largeitem" blameequipperfordeath="true">
           <StatusEffect type="OnWearing" target="Contained" Condition="-0.5" comparison="And">
             <Conditional TargetContainer="true" TargetGrandparent="true" IsDead="false" />
             <Conditional TargetContainer="true" TargetGrandparent="true" DecreasedOxygenConsumption="lt 99" />
@@ -478,7 +478,7 @@
             <Conditional NeedsAir="true" />
           </StatusEffect>
         </Containable>
-        <Containable items="incendiumfueltank" blameequipperfordeath="true">
+        <Containable items="incendiumfueltank,ammobox,deepdiving,smallitem,mediumitem,largeitem" blameequipperfordeath="true">
           <StatusEffect type="OnWearing" target="Contained" Condition="-0.5" comparison="And">
             <Conditional TargetContainer="true" TargetGrandparent="true" IsDead="false" />
             <Conditional TargetContainer="true" TargetGrandparent="true" DecreasedOxygenConsumption="lt 99" />
@@ -492,16 +492,16 @@
           </StatusEffect>
         </Containable>
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="divingsuitfuel">
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="divingsuitfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <StatusEffect type="OnContaining" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
         </Containable>
       </SubContainer>
     </ItemContainer>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" spawnwithid="bananapeelprojectile">
-      <Containable items="bananapeelprojectile" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" spawnwithid="bananapeelprojectile">
+      <Containable items="bananapeelprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <CustomInterface canbeselected="false" drawhudwhenequipped="true" allowuioverlap="true">
       <GuiFrame relativesize="0.15,0.1" anchor="BottomCenter" pivot="BottomCenter" relativeoffset="0,0.1" style="ItemUI" />
diff --git a/Content/Items/Jobgear/Commoner/commoner_gear.xml b/Content/Items/Jobgear/Commoner/commoner_gear.xml
index 9bd626c9..e0685140 100644
--- a/Content/Items/Jobgear/Commoner/commoner_gear.xml
+++ b/Content/Items/Jobgear/Commoner/commoner_gear.xml
@@ -2,15 +2,15 @@
 <Items>
   <!-- UNIFORMS START -->
   <Item name="" identifier="commonerclothes1" nameidentifier="outpostoutfit1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -37,15 +37,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="commonerclothes2" nameidentifier="outpostoutfit1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -72,15 +72,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="commonerclothes3" nameidentifier="outpostoutfit1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -107,15 +107,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="commonerclothes4" nameidentifier="outpostoutfit1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -142,15 +142,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="commonerclothes5" nameidentifier="outpostoutfit1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -177,15 +177,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="crewchiefclothes" nameidentifier="crewchiefoutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -213,15 +213,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="medicalofficerclothes" nameidentifier="medicalofficeroutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -248,15 +248,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="minerclothes" nameidentifier="mineroutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -285,15 +285,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="quartermasterclothes" nameidentifier="quartermasteroutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -321,15 +321,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="researcherclothes" nameidentifier="researcheroutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -359,15 +359,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="securitypatrolclothes" nameidentifier="securitypatroloutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -395,15 +395,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="administratorclothes" nameidentifier="stationadminoutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -430,11 +430,11 @@
     </Wearable>
   </Item>
   <Item name="" identifier="banditclothes1" nameidentifier="banditoutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="75" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
@@ -465,11 +465,11 @@
     </Wearable>
   </Item>
   <Item name="" identifier="banditclothes2" nameidentifier="banditoutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="75" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
@@ -503,7 +503,7 @@
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="150" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
@@ -537,7 +537,7 @@
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="150" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
@@ -571,7 +571,7 @@
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="150" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
@@ -605,7 +605,7 @@
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="75" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
diff --git a/Content/Items/Jobgear/Cultist/cultist_gear.xml b/Content/Items/Jobgear/Cultist/cultist_gear.xml
index 50a11e09..b586c74e 100644
--- a/Content/Items/Jobgear/Cultist/cultist_gear.xml
+++ b/Content/Items/Jobgear/Cultist/cultist_gear.xml
@@ -3,7 +3,7 @@
   <Item name="" identifier="cultistrobes" category="Equipment" tags="smallitem,clothing,huskcult" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="150" canbespecial="false" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="4" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="4" sold="true">
         <Reputation faction="huskcult" min="50"/>
       </Price>
     </Price>
@@ -38,7 +38,7 @@
   <Item name="" identifier="zealotrobes" category="Equipment" tags="smallitem,clothing,huskcult" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="550" canbespecial="false" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="4" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="4" sold="true">
         <Reputation faction="huskcult" min="90"/>
       </Price>
     </Price>
@@ -76,10 +76,10 @@
       </StatusEffect>
     </Wearable>
   </Item>
-  <Item name="" identifier="rituallantern" category="Equipment" maxstacksize="12" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,huskcult" impactsoundtag="impact_soft" isshootable="true">
+  <Item name="" identifier="rituallantern" category="Equipment" maxstacksize="24" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,huskcult" impactsoundtag="impact_soft" isshootable="true">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="100" canbespecial="false" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="4" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="4" sold="true">
         <Reputation faction="huskcult" min="70"/>
       </Price>
     </Price>
@@ -88,7 +88,7 @@
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="218,137,41,54" depth="0.55" origin="0.5,0.5" />
     <Body width="40" height="50" density="12" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="70,-70" handle1="-5,10" holdangle="0" throwforce="4.0" aimpos="30,-30" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="219,100,239,80" Flicker="0.2" pulsefrequency="0.2" pulseamount="0.5" range="600" IsOn="false">
+    <LightComponent LightColor="219,100,239,80" Flicker="0.2" pulsefrequency="0.2" pulseamount="0.5" range="2400" IsOn="false">
       <StatusEffect type="OnUse" targettype="This" IsOn="true" />
       <StatusEffect type="OnActive" targettype="This" Condition="-0.25" />
       <StatusEffect type="OnActive" targettype="This">
@@ -118,7 +118,7 @@
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="179,83,57,50" depth="0.55" origin="0.5,0.5" />
     <Price baseprice="370" sold="false"/>
     <Price baseprice="300" canbespecial="false" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="huskcult" min="60"/>
       </Price>
     </Price>
@@ -131,7 +131,7 @@
   </Item>
   <Item name="" identifier="bookofchalices1" category="Misc" hideinmenus="true" Tags="smallitem,huskcult" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <Price baseprice="20" canbespecial="false" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="huskcult" min="30"/>
       </Price>
     </Price>
diff --git a/Content/Items/Jobgear/Engineer/engineer_gear.xml b/Content/Items/Jobgear/Engineer/engineer_gear.xml
index 20855ef3..1563b024 100644
--- a/Content/Items/Jobgear/Engineer/engineer_gear.xml
+++ b/Content/Items/Jobgear/Engineer/engineer_gear.xml
@@ -2,13 +2,13 @@
 <Items>
   <Item name="" identifier="orangejumpsuit1" aliases="orangejumpsuit" category="Equipment" tags="smallitem,clothing,radiationproof" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Price baseprice="150" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -37,13 +37,13 @@
   </Item>
   <Item name="" identifier="orangejumpsuit2" category="Equipment" tags="smallitem,clothing" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Price baseprice="150" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -74,11 +74,11 @@
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
     <Price baseprice="150" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -109,11 +109,11 @@
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
     <Price baseprice="150" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
diff --git a/Content/Items/Jobgear/Engineer/engineer_talent_items.xml b/Content/Items/Jobgear/Engineer/engineer_talent_items.xml
index 05f952b5..4d055b3a 100644
--- a/Content/Items/Jobgear/Engineer/engineer_talent_items.xml
+++ b/Content/Items/Jobgear/Engineer/engineer_talent_items.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="depletedfuel" category="Fuel,Material" maxstacksize="8"  Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="depletedfuel" category="Fuel,Material" maxstacksize="16"  Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="reactorcab"/>    
     <Price baseprice="75" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="15" requiresrecipe="true">
       <RequiredSkill identifier="electrical" level="35" />
@@ -46,11 +46,11 @@
   <Item name="" identifier="coilgunammoboxdepletedfuel" scale="0.5" tags="coilgunequipment,coilgunammo,ammobox" allowasextracargo="true" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammoloader,ammoboxcontainer" mincondition="1"/>
     <Price baseprice="280" sold="false" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="40" />
@@ -82,7 +82,7 @@
       <StatusEffect type="OnUse" target="This" condition="-0.5" disabledeltatime="true">
         <RequiredItem items="depletedfuelbolt" type="Contained" />
       </StatusEffect>
-      <Containable items="depletedfuelbolt" />
+      <Containable items="depletedfuelbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="depletedfuelbolt" category="Weapon" scale="0.5" sonarsize="2" hideinmenus="true">
@@ -116,7 +116,7 @@
     </Projectile>
   </Item>
   <Item name="" identifier="wrenchhardened" variantof="wrench" allowasextracargo="true" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" addedrepairspeedmultiplier="0.4">
-    <Preferredcontainer secondary="respawncontainer" amount="1"  spawnprobability="0" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2"  spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="engcab"  spawnprobability="0"/>
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab"  spawnprobability="0" />
     <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,pirateengcab,outpostengcab,beaconengcab"  spawnprobability="0"/>
@@ -124,7 +124,7 @@
     <PreferredContainer secondary="outposttrashcan" spawnprobability="0" />
     <Price baseprice="200" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
@@ -146,7 +146,7 @@
     </MeleeWeapon>
   </Item>
   <Item name="" identifier="crowbarhardened" variantof="crowbar" allowasextracargo="true" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" addedpickingspeedmultiplier="0.6">
-    <PreferredContainer secondary="respawncontainer" amount="1" spawnprobability="0" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer" amount="2" spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="engcab" spawnprobability="0"/>
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" spawnprobability="0" />
     <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" spawnprobability="0" />
@@ -201,9 +201,9 @@
     <PreferredContainer primary="armcab,secarmcab" spawnprobability="0" />
     <Price baseprice="200" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct>
@@ -231,7 +231,7 @@
     <PreferredContainer secondary="secarmcab" spawnprobability="0"/>
     <PreferredContainer secondary="respawncontainer_kingofthehull" spawnprobability="0"/>
     <Price baseprice="20" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
       <Price storeidentifier="merchantcity" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
@@ -287,7 +287,7 @@
       <Item identifier="steel" />
     </Deconstruct>
     <ItemContainer SpawnWithId="smgrounddepletedfuel">
-      <Containable items="smgrounddepletedfuel" />
+      <Containable items="smgrounddepletedfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-4.8" disabledeltatime="true">
         <SpawnItem identifiers="smgrounddepletedfuel" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -310,10 +310,10 @@
   <Item name="" identifier="thermalgoggles" scale="0.5" category="Equipment" tags="smallitem" allowasextracargo="true" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="engcab"/>
     <Price baseprice="350" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="20">
@@ -340,9 +340,9 @@
     <PreferredContainer primary="engcab"/>    
     <Price baseprice="150" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="15">
@@ -361,7 +361,7 @@
     <RemoteController target="reactor" onlyinownsub="true" msg="ItemMsgInteractSelect" AllowInGameEditing="false" drawhudwhenequipped="true" />
   </Item>
 
-  <Item name="" identifier="skillbookhandyseaman" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="8" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="skillbookhandyseaman" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="16" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="350" buyingpricemodifier="2.5" minleveldifficulty="40">
       <Price storeidentifier="merchantoutpost" maxavailable="1" />
@@ -389,13 +389,13 @@
   <Item name="" identifier="nucleargun" category="Weapon" cargocontaineridentifier="metalcrate" allowasextracargo="true" tags="mediumitem,weapon,gun,mountableweapon,provocativetohumanai" Scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="secarmcab" secondary="weaponholder,armcab"/>
     <Price baseprice="900" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="coalition" min="70"/>
       </Price>
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="copper" />
@@ -438,12 +438,12 @@
       <RequiredSkill identifier="weapons" level="25" />
       <RequiredSkill identifier="electrical" level="45" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="10,-5" containedspritedepths="0.562,0.561" containedstateindicatorstyle="default" containedstateindicatorslot="0">
-      <Containable items="reactorfuel" rotation="90"/>
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" itempos="10,-5" containedspritedepths="0.562,0.561" containedstateindicatorstyle="default" containedstateindicatorslot="0">
+      <Containable items="reactorfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" rotation="90"/>
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="25,0" setactive="true"/>
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="25,0" setactive="true"/>
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
@@ -490,11 +490,11 @@
   <Item name="" identifier="cargoscooter" category="Equipment,Diving" Tags="mediumitem,provocative,scooter,mobilecontainer" allowasextracargo="true" cargocontaineridentifier="metalcrate" description="" Scale="0.5" impactsoundtag="impact_metal_heavy" isshootable="true">
     <PreferredContainer primary="divingcab"/>    
     <Price baseprice="400" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="aluminium" />
@@ -512,7 +512,7 @@
     <Sprite texture="Content/Items/JobGear/TalentGear.png" depth="0.55" sourcerect="295,195,149,105" origin="0.5,0.5" />
     <Body width="140" height="100" density="10" />
     <Holdable slots="RightHand+LeftHand" aimpos="90,0" handle1="-35,32" handle2="-27,34" msg="ItemMsgPickUpSelect" holdangle="-10">
-      <LightComponent LightColor="220,255,150,200" range="500" powerconsumption="10" IsOn="true">
+      <LightComponent LightColor="220,255,150,200" range="2000" powerconsumption="10" IsOn="true">
         <Upgrade gameversion="1.1.2.0" powerconsumption="10" />
         <LightTexture texture="Content/Lights/lightcone.png" origin="-0.01, 0.5" size="1.0,1.0" />
       </LightComponent>
@@ -530,11 +530,11 @@
       </StatusEffect>
       <sound file="Content/Items/Diving/ScooterLoop.ogg" type="OnUse" range="500.0" loop="true" />
     </Propulsion>
-    <ItemContainer capacity="1" maxstacksize="1" slotsperrow="3" hideitems="true" containedstateindicatorslot="0" containedstateindicatorstyle="battery">
-      <Containable items="mobilebattery" />
+    <ItemContainer capacity="1" maxstacksize="2" slotsperrow="3" hideitems="true" containedstateindicatorslot="0" containedstateindicatorstyle="battery">
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="11" maxstacksize="32">
-        <Containable items="smallitem,mediumitem" excludeditems="toolbelt,toolbox,bandolier,cargoscooter,largemobilecontainer" />
+      <SubContainer capacity="24" maxstacksize="64">
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       </SubContainer>
     </ItemContainer>
     <AiTarget soundrange="3000" maxsightrange="3000" />
@@ -543,9 +543,9 @@
     <PreferredContainer primary="engcab"/>
     <Price baseprice="150" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="15">
@@ -567,15 +567,15 @@
     </MiniMap>
   </Item>
   <Item name="" identifier="pucs" category="Equipment,Diving" tags="diving,deepdiving,divinggear_wearableindoors,human" allowasextracargo="true" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy" botpriority="5" cargocontaineridentifier="">
-    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.0" />    
+    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0" />    
     <Price baseprice="670" sold="false">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" minavailable="0" maxavailable="3" sold="true">
         <Reputation faction="coalition" min="70"/>
       </Price>
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
     </Price>
     <Deconstruct time="45">
       <Item identifier="titaniumaluminiumalloy" />
@@ -598,7 +598,7 @@
     <Body radius="45" width="34" density="20" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="PUCS Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="127,520,105,124" origin="0.57,0.38">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" Interval="0.1" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -672,12 +672,12 @@
     </Wearable>
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" />
     <ItemContainer capacity="0" maxstacksize="0" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0" autoinject="true">
-      <Containable items="none" />
+      <Containable items="none,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="oxygensource,weldingtoolfuel" excludeditems="oxygenitetank" />
-        <Containable items="oxygenitetank">
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="oxygensource,weldingtoolfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
+        <Containable items="oxygenitetank,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <StatusEffect type="OnWearing" target="Character" SpeedMultiplier="1.2" setvalue="true" comparison="And" targetslot="0">
             <Conditional IsDead="false" />
             <Conditional HullOxygenPercentage="lt 50" />
@@ -685,7 +685,7 @@
             <Conditional NeedsAir="true" />
           </StatusEffect>
         </Containable>
-        <Containable items="weldingfueltank" blameequipperfordeath="true">
+        <Containable items="weldingfueltank,ammobox,deepdiving,smallitem,mediumitem,largeitem" blameequipperfordeath="true">
           <StatusEffect type="OnWearing" target="Contained" Condition="-0.5" comparison="And">
             <Conditional TargetContainer="true" TargetGrandparent="true" IsDead="false" />
             <Conditional TargetContainer="true" TargetGrandparent="true" DecreasedOxygenConsumption="lt 99" />
@@ -697,7 +697,7 @@
             <Conditional NeedsAir="true" />
           </StatusEffect>
         </Containable>
-        <Containable items="incendiumfueltank" blameequipperfordeath="true">
+        <Containable items="incendiumfueltank,ammobox,deepdiving,smallitem,mediumitem,largeitem" blameequipperfordeath="true">
           <StatusEffect type="OnWearing" target="Contained" Condition="-0.5" comparison="And">
             <Conditional TargetContainer="true" TargetGrandparent="true" IsDead="false" />
             <Conditional TargetContainer="true" TargetGrandparent="true" DecreasedOxygenConsumption="lt 99" />
@@ -711,20 +711,20 @@
           </StatusEffect>
         </Containable>
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="chem,syringe" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="chem,syringe,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <aitarget maxsightrange="1500" />
   </Item>
-  <Item name="" identifier="fulguriumfuelrodvolatile" category="Fuel" Tags="smallitem,reactorfuel" maxstacksize="8" allowasextracargo="true" cargocontaineridentifier="metalcrate" health="400" scale="0.5">
+  <Item name="" identifier="fulguriumfuelrodvolatile" category="Fuel" Tags="smallitem,reactorfuel" maxstacksize="16" allowasextracargo="true" cargocontaineridentifier="metalcrate" health="400" scale="0.5">
     <PreferredContainer primary="reactorcab"/>
     <Price baseprice="400" sold="false" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -748,14 +748,14 @@
     <InventoryIcon texture="Content/Items/JobGear/TalentGear.png" sourcerect="67,176,62,61" origin="0.5,0.5" />
     <Sprite texture="Content/Items/JobGear/TalentGear.png" depth="0.55" sourcerect="190,60,20,71" origin="0.5,0.5" />
     <Body radius="6" height="55" density="30" />
-    <LightComponent allowingameediting="false" lightcolor="60,200,150,150" canbeselected="false" range="300.0" ison="true" />
+    <LightComponent allowingameediting="false" lightcolor="60,200,150,150" canbeselected="false" range="1200" ison="true" />
     <Holdable handle1="0,0" slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect">
       <StatusEffect type="Always" target="NearbyCharacters" range="125" interval="1" disabledeltatime="true">
         <Affliction identifier="radiationsickness" strength="1" />
       </StatusEffect>
     </Holdable>
     <ItemContainer hideitems="true" capacity="1" itemrotation="90" drawinventory="false" canbeselected="false" SpawnWithId="nucleargunbolt" removecontaineditemsondeconstruct="true" showcontainedstateindicator="false">
-      <Containable items="nucleargunbolt" />
+      <Containable items="nucleargunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-20" disabledeltatime="true">
         <SpawnItem identifiers="nucleargunbolt" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -768,11 +768,11 @@
   <Item name="" identifier="arcemitter" tags="mediumitem,weapon,gun,mountableweapon,provocativetohumanai" category="Weapon" isshootable="true" Scale="0.5">
     <Sprite texture="Content/Items/JobGear/TalentGear.png" sourcerect="207,430,131,61" depth="0.55" origin="0.5,0.5" />
     <Price baseprice="740" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="75" requiresrecipe="true">
       <RequiredSkill identifier="electrical" level="65" />
@@ -810,9 +810,9 @@
     <Wearable slots="Bag" msg="ItemMsgEquipSelect" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Arc Emitter Worn" texture="Content/Items/JobGear/TalentGear.png" canbehiddenbyotherwearables="false" rotation="90" inheritlimbdepth="false" depth="0.6" sourcerect="207,430,131,61" limb="Torso" scale="0.5" origin="0.5,0.9" />
     </Wearable>
-    <ItemContainer itemrotation="90" capacity="1" maxstacksize="1" hideitems="false" itempos="10,-5" containedspritedepth="0.56" containedstateindicatorstyle="battery">
+    <ItemContainer itemrotation="90" capacity="1" maxstacksize="2" hideitems="false" itempos="10,-5" containedspritedepth="0.56" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <Containable items="mobilebattery">
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>
diff --git a/Content/Items/Jobgear/Mechanic/mechanic_gear.xml b/Content/Items/Jobgear/Mechanic/mechanic_gear.xml
index f3617795..1305591d 100644
--- a/Content/Items/Jobgear/Mechanic/mechanic_gear.xml
+++ b/Content/Items/Jobgear/Mechanic/mechanic_gear.xml
@@ -3,13 +3,13 @@
   <!-- UNIFORMS START-->
   <Item name="" identifier="bluejumpsuit1" aliases="bluejumpsuit" category="Equipment" tags="smallitem,clothing" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -39,13 +39,13 @@
   </Item>
   <Item name="" identifier="bluejumpsuit2" category="Equipment" tags="smallitem,clothing" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -76,12 +76,12 @@
   <Item name="" identifier="mechanicseparatistsuniform1" category="Equipment" tags="smallitem,clothing" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -112,12 +112,12 @@
   <Item name="" identifier="mechanicseparatistsuniform2" category="Equipment" tags="smallitem,clothing" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -147,15 +147,15 @@
   </Item>
   <!-- UNIFORMS END -->
   <Item name="" identifier="baseballcap" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="crewcab" spawnprobability="0.2" notcampaign="true"/>
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" minavailable="2" />
-      <Price storeidentifier="merchantmine" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" minavailable="6" />
+      <Price storeidentifier="merchantmine" minavailable="6" />
     </Price>
     <Deconstruct time="5" />
     <Sprite name="Baseball Cap" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="320,327,88,51" origin="0.5,0.5" />
diff --git a/Content/Items/Jobgear/Mechanic/mechanic_talent_items.xml b/Content/Items/Jobgear/Mechanic/mechanic_talent_items.xml
index b5ce205e..53d90d62 100644
--- a/Content/Items/Jobgear/Mechanic/mechanic_talent_items.xml
+++ b/Content/Items/Jobgear/Mechanic/mechanic_talent_items.xml
@@ -4,9 +4,9 @@
     <PreferredContainer primary="divingcab"/>
     <Price baseprice="140" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="15">
@@ -31,9 +31,9 @@
     <PreferredContainer primary="engcab"/>
     <Price baseprice="43" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="5"/>
@@ -56,11 +56,11 @@
   <Item name="" identifier="portablepump" tags="smallitem,donttakeitems" category="Machine" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2" allowasextracargo="true" impactsoundtag="impact_metal_heavy" isshootable="true">
     <PreferredContainer primary="engcab"/>
     <Price baseprice="520" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.2" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.6" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <InventoryIcon texture="Content/Items/JobGear/TalentGear.png" sourcerect="0,312,58,56" origin="0.5,0.5" />
     <Sprite texture="Content/Items/JobGear/TalentGear.png" depth="0.81" sourcerect="7,129,56,61" origin="0.5,0.5" />
@@ -112,10 +112,10 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="20.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true" limitedattachable="true">
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="entityname.portablepump">
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="entityname.portablepump">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <Containable items="mobilebattery">
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>
@@ -123,11 +123,11 @@
   <Item name="" identifier="safetyharness" category="Equipment" tags="smallitem,clothing" scale="0.35" cargocontaineridentifier="metalcrate" allowasextracargo="true" description="" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" secondary="engcab"/>
     <Price baseprice="120" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.2" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.6" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="rubber" />
@@ -158,7 +158,7 @@
     </Wearable>
   </Item>
   <Item name="" identifier="wrenchdementonite" descriptionidentifier="dementonitetool" variantof="wrench" allowasextracargo="true" inventoryiconcolor="136,142,166,255" spritecolor="136,142,166" addedrepairspeedmultiplier="0.4">
-    <Preferredcontainer secondary="respawncontainer" amount="1"  spawnprobability="0" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2"  spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="engcab"  spawnprobability="0"/>
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab"  spawnprobability="0" />
     <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab"  spawnprobability="0"/>
@@ -166,7 +166,7 @@
     <PreferredContainer secondary="outposttrashcan" spawnprobability="0" />
     <Price baseprice="450" sold="false" canbespecial="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
@@ -189,7 +189,7 @@
     </MeleeWeapon>
   </Item>
   <Item name="" identifier="crowbardementonite" descriptionidentifier="dementonitetool" variantof="crowbar" allowasextracargo="true" inventoryiconcolor="136,142,166,255" spritecolor="136,142,166" addedpickingspeedmultiplier="0.6">
-    <PreferredContainer secondary="respawncontainer" amount="1" spawnprobability="0" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer" amount="2" spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="engcab" spawnprobability="0"/>
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" spawnprobability="0" />
     <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" spawnprobability="0" />
@@ -249,9 +249,9 @@
     <PreferredContainer primary="armcab,secarmcab" spawnprobability="0" />
     <Price baseprice="450" sold="false" canbespecial="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct>
@@ -272,14 +272,14 @@
       </StatusEffect>
     </MeleeWeapon>
   </Item>
-  <Item name="" identifier="fixfoamgrenade" category="Equipment" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" allowasextracargo="true" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fixfoamgrenade" category="Equipment" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="explosivecrate" allowasextracargo="true" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="engcab" secondary="locker"/>
     <Price baseprice="95" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -340,7 +340,7 @@
     </Quality>
   </Item>
   <Item name="" identifier="heavywrench" variantof="wrench" addedrepairspeedmultiplier="0.4">
-    <Preferredcontainer secondary="respawncontainer" amount="1"  spawnprobability="0" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2"  spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="engcab"  spawnprobability="0"/>
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab"  spawnprobability="0" />
     <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab"  spawnprobability="0"/>
@@ -386,14 +386,14 @@
   </Item>
   <Item name="" identifier="makeshiftarmor" category="Equipment" tags="smallitem,clothing" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="secarmcab" amount="0" notcampaign="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.01" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.02" />
     <Price baseprice="140" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
       <Price storeidentifier="merchantresearch"  />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
       <Price storeidentifier="merchantmine"  />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Deconstruct time="40">
       <Item identifier="organicfiber" amount="1" />
@@ -433,15 +433,15 @@
   </Item>
   <Item name="" identifier="ironhelmet" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_heavy" scale="0.325">
     <PreferredContainer primary="secarmcab" amount="0" notcampaign="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.01" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.02" />
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
       <Price storeidentifier="merchantresearch"  />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
       <Price storeidentifier="merchantmine"  />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="iron" amount="2" />
@@ -481,7 +481,7 @@
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select" allowusewhenworn="true">
       <sprite name="Exosuit Helmet Wearable" texture="Content/Items/Jobgear/Mechanic/Exosuit.png" limb="Head" hidelimb="true" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hideotherwearables="true" hidewearablesoftype="" sourcerect="0,0,1,1" origin="0.5,0.5" />
       <sprite name="Exosuit Torso" texture="Content/Items/Jobgear/Mechanic/Exosuit.png" limb="Torso" scale="1.2" hidelimb="true" inherittexturescale="true" hideotherwearables="true" inheritorigin="false" origin="0.5,0.8" inheritlimbdepth="true" inheritsourcerect="false" sourcerect="167,1,203,193">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false" offset="-50,-50">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false" offset="-50,-50">
           <LightTexture texture="Content/Lights/divinghelmetlight.png" origin="0.05, 0.5" size="1.0,1.0" />          
         </LightComponent>
       </sprite>
@@ -536,9 +536,9 @@
         <Conditional condition="lte 0.0" />
         <Sound file="Content/Items/WarningBeep.ogg" range="500" loop="true"/>
       </StatusEffect>
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="oxygensource,weldingtoolfuel" />
-        <Containable items="oxygensource">
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="oxygensource,weldingtoolfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
+        <Containable items="oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" />
           <StatusEffect type="OnWearing" target="Contained" Condition="-0.2" comparison="And">
             <Conditional TargetContainer="true" TargetGrandparent="true" IsDead="false" />
@@ -550,14 +550,14 @@
             <Sound file="Content/Items/WarningBeepSlow.ogg" range="250" loop="true"/>
           </StatusEffect>
         </Containable>
-        <Containable items="oxygenitetank">
+        <Containable items="oxygenitetank,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <StatusEffect type="OnWearing" target="Character" SpeedMultiplier="1.2" setvalue="true" targetslot="0" comparison="And">
             <Conditional IsDead="false" />
             <Conditional DecreasedOxygenConsumption="lt 99" />
             <Conditional NeedsAir="true" />
           </StatusEffect>
         </Containable>
-        <Containable items="weldingfueltank" blameequipperfordeath="true">
+        <Containable items="weldingfueltank,ammobox,deepdiving,smallitem,mediumitem,largeitem" blameequipperfordeath="true">
           <StatusEffect type="OnWearing" target="Contained" Condition="-0.5" comparison="And">
             <Conditional TargetContainer="true" TargetGrandparent="true" IsDead="false" />
             <Conditional TargetContainer="true" TargetGrandparent="true" DecreasedOxygenConsumption="lt 99" />
@@ -569,7 +569,7 @@
             <Conditional NeedsAir="true" />
           </StatusEffect>
         </Containable>
-        <Containable items="incendiumfueltank" blameequipperfordeath="true">
+        <Containable items="incendiumfueltank,ammobox,deepdiving,smallitem,mediumitem,largeitem" blameequipperfordeath="true">
           <StatusEffect type="OnWearing" target="Contained" Condition="-0.5" comparison="And">
             <Conditional TargetContainer="true" TargetGrandparent="true" IsDead="false" />
             <Conditional TargetContainer="true" TargetGrandparent="true" DecreasedOxygenConsumption="lt 99" />
@@ -583,15 +583,15 @@
           </StatusEffect>
         </Containable> 
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="divingsuitfuel">
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="divingsuitfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <StatusEffect type="OnContaining" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
         </Containable>
       </SubContainer>
-      <SubContainer capacity="10" maxstacksize="32">
-        <Containable items="smallitem" />
+      <SubContainer capacity="22" maxstacksize="64">
+        <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <aitarget maxsightrange="1500" />
@@ -600,15 +600,15 @@
   <Item name="" identifier="scrapcannon" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gun,mountableweapon,provocativetohumanai" Scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="secarmcab" secondary="weaponholder,armcab"/>
     <Price baseprice="640" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="0" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="0" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="70"/>
       </Price>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="70"/>
       </Price>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="copper" />
@@ -646,11 +646,11 @@
       <RequiredSkill identifier="weapons" level="25" />
       <RequiredSkill identifier="mechanical" level="45" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="32" slotsperrow="3" hideitems="true" containedstateindicatorslot="1" containedstateindicatorstyle="battery">
-      <Containable items="scrapcannonammo" />
+    <ItemContainer capacity="1" maxstacksize="64" slotsperrow="3" hideitems="true" containedstateindicatorslot="1" containedstateindicatorstyle="battery">
+      <Containable items="scrapcannonammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1"  maxstacksize="1">
-        <Containable items="mobilebattery" />
+      <SubContainer capacity="1"  maxstacksize="2">
+        <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
@@ -664,11 +664,11 @@
   <!-- This is the item we normally spawn in-game. Doesn't work when placed in the sub editor, because the OnSpawn effect doesn't trigger. -->
   <Item name="" identifier="defensebotspawner" hideinmenus="true" category="Machine" >
     <Price baseprice="700" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="35" requiresrecipe="true" movetoslot="Any">
       <RequiredSkill identifier="electrical" level="40" />
@@ -681,7 +681,7 @@
     <Pickable slots="Any">
       <StatusEffect type="OnSpawn" targettype="This" delay="0.2">
         <RemoveItem />
-        <SpawnCharacter speciesname="Defensebot" totalmaxcount="2" inheritteam="true"/>
+        <SpawnCharacter speciesname="Defensebot" totalmaxcount="4" inheritteam="true"/>
       </StatusEffect>
     </Pickable>
   </Item>
@@ -692,7 +692,7 @@
     <Pickable slots="Any">
       <StatusEffect type="Always" targettype="This">
         <RemoveItem />
-        <SpawnCharacter speciesname="Defensebot" totalmaxcount="2" inheritteam="true"/>
+        <SpawnCharacter speciesname="Defensebot" totalmaxcount="4" inheritteam="true"/>
       </StatusEffect>
     </Pickable>
   </Item>
@@ -720,11 +720,11 @@
     </Projectile>
   </Item>
 
-  <Item name="" identifier="defensebotammobox" maxstacksize="1" scale="0.3" category="Weapons,Machine" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,defensebotammo" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="defensebotammobox" maxstacksize="2" scale="0.3" category="Weapons,Machine" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,defensebotammo" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="defensebot,secarmcab" secondary="armcab"/>
     <Price baseprice="200" displaynonempty="true" sold="false">
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="0" maxavailable="2"/>
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="0" maxavailable="2"/>
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="0" maxavailable="2"/>
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" minavailable="0" maxavailable="2"/>
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="25" requiresrecipe="true">
       <RequiredItem tag="munition_propulsion" description="fabricationdescription.munition_propulsion" />
diff --git a/Content/Items/Jobgear/Medic/medic_gear.xml b/Content/Items/Jobgear/Medic/medic_gear.xml
index 76f3f4c2..d914a1a6 100644
--- a/Content/Items/Jobgear/Medic/medic_gear.xml
+++ b/Content/Items/Jobgear/Medic/medic_gear.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <Item name="" identifier="healthscanner" scale="0.5" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="medcab" amount="1" />
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab" spawnprobability="0.03"/>
-    <Price baseprice="150" minavailable="1">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" minavailable="8" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+    <PreferredContainer primary="medcab" amount="2" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab" spawnprobability="0.06"/>
+    <Price baseprice="150" minavailable="3">
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" minavailable="24" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantmedical" minavailable="8" />
+      <Price storeidentifier="merchantmedical" minavailable="24" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="copper" />
@@ -31,13 +31,13 @@
   </Item>
   <Item name="" identifier="doctorsuniform1" aliases="doctorsuniform" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.05" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -62,19 +62,19 @@
       <sprite name="Medic Uniform 1 Left Shoe" texture="Medic1.png" limb="LeftFoot" hidelimb="true" inherittexturescale="true" inheritorigin="true" inheritsourcerect="true" />
       <damagemodifier armorsector="0.0,360.0" afflictionidentifiers="lacerations,bitewounds" damagemultiplier="0.95" />
     </Wearable>
-    <ItemContainer capacity="3" maxstacksize="8">
-      <Containable items="chem,medical" />
+    <ItemContainer capacity="7" maxstacksize="16">
+      <Containable items="chem,medical,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="doctorsuniform2" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.05" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition" >
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition" >
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -99,19 +99,19 @@
       <sprite name="Medic Uniform 2 Left Shoe" texture="Medic2.png" limb="LeftFoot" hidelimb="true" inherittexturescale="true" inheritorigin="true" inheritsourcerect="true" />
       <damagemodifier armorsector="0.0,360.0" afflictionidentifiers="lacerations,bitewounds" damagemultiplier="0.95" />
     </Wearable>
-    <ItemContainer capacity="3" maxstacksize="8">
-      <Containable items="chem,medical" />
+    <ItemContainer capacity="7" maxstacksize="16">
+      <Containable items="chem,medical,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="medicseparatistsuniform1" aliases="doctorsuniform" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -136,19 +136,19 @@
       <sprite name="Medic Uniform 1 Left Shoe" texture="Medic_separatist_01.png" limb="LeftFoot" hidelimb="true" inherittexturescale="true" inheritorigin="true" inheritsourcerect="true" />
       <damagemodifier armorsector="0.0,360.0" afflictionidentifiers="lacerations,bitewounds" damagemultiplier="0.95" />
     </Wearable>
-    <ItemContainer capacity="3" maxstacksize="8">
-      <Containable items="chem,medical" />
+    <ItemContainer capacity="7" maxstacksize="16">
+      <Containable items="chem,medical,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="medicseparatistsuniform2" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -173,8 +173,8 @@
       <sprite name="Medic Uniform 2 Left Shoe" texture="Medic_separatist_02.png" limb="LeftFoot" hidelimb="true" inherittexturescale="true" inheritorigin="true" inheritsourcerect="true" />
       <damagemodifier armorsector="0.0,360.0" afflictionidentifiers="lacerations,bitewounds" damagemultiplier="0.95" />
     </Wearable>
-    <ItemContainer capacity="3" maxstacksize="8">
-      <Containable items="chem,medical" />
+    <ItemContainer capacity="7" maxstacksize="16">
+      <Containable items="chem,medical,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Jobgear/Medic/medic_talent_items.xml b/Content/Items/Jobgear/Medic/medic_talent_items.xml
index 21e81fd6..5cf1dc77 100644
--- a/Content/Items/Jobgear/Medic/medic_talent_items.xml
+++ b/Content/Items/Jobgear/Medic/medic_talent_items.xml
@@ -4,7 +4,7 @@
     <PreferredContainer primary="medcab"/>
     <Price baseprice="140" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
@@ -22,15 +22,15 @@
       <RequiredItem identifier="fpgacircuit" />
     </Fabricate>
     <WifiComponent range="35000.0" LinkToChat="true" MinChatMessageInterval="0.0" />
-    <ItemContainer capacity="1" maxstacksize="1" autoinject="true">
+    <ItemContainer capacity="1" maxstacksize="2" autoinject="true">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
-      <Containable items="chem,syringe" />
+      <Containable items="chem,syringe,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Wearable limbtype="Head" slots="Any,Headset" msg="ItemMsgPickUpSelect" displaycontainedstatus="true">
       <sprite name="Headset Wearable" texture="Content/Items/JobGear/TalentGear.png" sourcerect="255,305,72,58" limb="Head" hidelimb="false" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.7" hideotherwearables="false" origin="0.5,0.5" />
     </Wearable>
   </Item>
-  <Item name="" identifier="skillbookeuropanmedicine" category="Misc" Tags="smallitem,skillbook" maxstacksize="8" scale="0.5" impactsoundtag="impact_soft" cargocontaineridentifier="metalcrate">
+  <Item name="" identifier="skillbookeuropanmedicine" category="Misc" Tags="smallitem,skillbook" maxstacksize="16" scale="0.5" impactsoundtag="impact_soft" cargocontaineridentifier="metalcrate">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="350" buyingpricemodifier="2.5" minleveldifficulty="40" >
       <Price storeidentifier="merchantoutpost" />
@@ -54,14 +54,14 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="combatstimulantsyringe" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="combatstimulantsyringe" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab"/>
     <Price baseprice="340" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="55" requiresrecipe="true">
       <RequiredSkill identifier="medical" level="40" />
@@ -105,14 +105,14 @@
     <Projectile characterusable="false" launchimpulse="18.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon" inheritrequiredskillsfrom="MeleeWeapon"/>
     <SkillRequirementHint identifier="medical" level="35" />
   </Item>
-  <Item name="" identifier="pressurestabilizer" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="pressurestabilizer" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab"/>
     <Price baseprice="200" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="20" requiresrecipe="true">
       <RequiredSkill identifier="medical" level="40" />
@@ -153,13 +153,13 @@
     <Projectile characterusable="false" launchimpulse="18.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon" inheritrequiredskillsfrom="MeleeWeapon"/>
     <SkillRequirementHint identifier="medical" level="35" />
   </Item>
-  <Item name="" identifier="endocrinebooster" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="endocrinebooster" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab"/>
     <Price baseprice="1400" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="50" amount="1" requiresrecipe="true">
@@ -211,13 +211,13 @@
     <PreferredContainer primary="medcab" secondary="medcab"/>
     <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab" spawnprobability="0"/>
     <Price baseprice="550" sold="false" minleveldifficulty="65">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="huskcult" min="50"/>
       </Price>
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="true" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="true" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="10">
@@ -236,18 +236,18 @@
     <InventoryIcon texture="Content/Items/Genetic/Genetic.png" sourcerect="327,62,73,65" origin="0.5,0.5" />
     <Sprite name="Headset" texture="Content/Items/Genetic/Genetic.png" depth="0.6" sourcerect="148,85,73,35" origin="0.5,0.5" />
     <Body radius="8" width="48" density="15" />
-    <ItemContainer capacity="2" maxstacksize="1" />
+    <ItemContainer capacity="4" maxstacksize="2" />
     <Wearable>
       <sprite name="Gene Splicer Wearable" texture="Content/Items/Genetic/Genetic.png" limb="Head" hidelimb="false" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.5" hideotherwearables="false" sourcerect="326,131,67,55" origin="0.6,0.0" />
     </Wearable>
   </Item>
 
   <Item name="" identifier="advancedsyringegun" variantof="syringegun">
-    <PreferredContainer primary="armcab" amount="1" spawnprobability="0" notcampaign="true" />
+    <PreferredContainer primary="armcab" amount="2" spawnprobability="0" notcampaign="true" />
     <PreferredContainer secondary="secarmcab,weaponholder"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab,wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab,wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0" />
     <Price baseprice="310" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="huskcult" min="50"/>
       </Price>
     </Price>
@@ -273,25 +273,25 @@
       <RequiredSkill identifier="weapons" level="30" />
       <RequiredSkill identifier="medical" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="2" maxstacksize="8" itempos="0,25" itemrotation="-90" hideitems="false" containedstateindicatorstyle="syringe" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorslot="0">
+    <ItemContainer capacity="4" maxstacksize="16" itempos="0,25" itemrotation="-90" hideitems="false" containedstateindicatorstyle="syringe" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorslot="0">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
-      <Containable items="syringe" />
+      <Containable items="syringe,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <StatusHUD drawhudwhenequipped="true" />
     <SkillRequirementHint identifier="weapons" level="30" />
     <SkillRequirementHint identifier="medical" level="50" />
   </Item>
 
-  <Item name="" identifier="europabrew" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Item name="" identifier="europabrew" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="200" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="200" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="10" requiresrecipe="true">
       <RequiredSkill identifier="medical" level="30" />
@@ -323,16 +323,16 @@
     <Projectile characterusable="false" launchimpulse="20.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon"/>
   </Item>
 
-  <Item name="" identifier="sulphuricacidsyringe" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Item name="" identifier="sulphuricacidsyringe" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer secondary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
     <Price baseprice="160" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9"  />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7"  />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" amount="2" requiredtime="5" requiresrecipe="true">
       <RequiredSkill identifier="medical" level="30" />
@@ -377,17 +377,17 @@
     <Projectile characterusable="false" launchimpulse="18.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon"/>
   </Item>
 
-  <Item name="" identifier="chemgrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="3" spawnprobability="0.75" notcampaign="true" notpvp="true"/>
-    <PreferredContainer primary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0.05"/>
+  <Item name="" identifier="chemgrenade" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_heavy">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0.1"/>
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="80" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" mindifficulty="60" sold="true" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" mindifficulty="60" sold="true" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" mindifficulty="60" sold="true" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" mindifficulty="60" sold="true" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="20" amount="2" requiresrecipe="true">
@@ -443,17 +443,17 @@
     </Quality>
   </Item>
 
-  <Item name="" identifier="40mmchemgrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="grenadelauncher" amount="1" spawnprobability="0"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0"/>
+  <Item name="" identifier="40mmchemgrenade" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="grenadelauncher" amount="2" spawnprobability="0"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0"/>
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
     <Price baseprice="130" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" />
diff --git a/Content/Items/Jobgear/Security/securityofficer_gear.xml b/Content/Items/Jobgear/Security/securityofficer_gear.xml
index 3835ee51..92b0de37 100644
--- a/Content/Items/Jobgear/Security/securityofficer_gear.xml
+++ b/Content/Items/Jobgear/Security/securityofficer_gear.xml
@@ -3,13 +3,13 @@
   <!-- UNIFORMS START -->
   <Item name="" identifier="securityuniform1" aliases="securityuniform" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.05" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -38,13 +38,13 @@
   </Item>
   <Item name="" identifier="securityuniform2" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.05" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -73,13 +73,13 @@
   </Item>
   <Item name="" identifier="securityuniform3" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.05" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -109,12 +109,12 @@
   <Item name="" identifier="securityseparatistsuniform1" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <PreferredContainer secondary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -144,12 +144,12 @@
   <Item name="" identifier="securityseparatistsuniform2" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <PreferredContainer secondary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -179,12 +179,12 @@
   <Item name="" identifier="securityseparatistsuniform3" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <PreferredContainer secondary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -214,16 +214,16 @@
   <!-- UNIFORMS END -->
   <Item name="" identifier="bodyarmor" category="Equipment" tags="smallitem,clothing" scale="0.35" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.35" />
-    <PreferredContainer primary="secarmcab" amount="3" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="secarmcab" amount="6" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.1" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="480">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="40">
       <Item identifier="ballisticfiber" amount="2" />
@@ -246,16 +246,16 @@
   <!-- HEADGEAR START -->
   <Item name="" identifier="ballistichelmet1" aliases="ballistichelmet" category="Equipment" tags="smallitem,helmet" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_heavy" scale="0.325">
     <Upgrade gameversion="0.9.6.0" scale="0.325" />
-    <PreferredContainer primary="secarmcab" amount="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="secarmcab" amount="2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.1" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="320">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -275,16 +275,16 @@
     </Wearable>
   </Item>
   <Item name="" identifier="ballistichelmet2" category="Equipment" tags="smallitem,helmet" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_heavy" scale="0.325">
-    <PreferredContainer primary="secarmcab" amount="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="secarmcab" amount="2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.1" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="320">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -305,16 +305,16 @@
     </Wearable>
   </Item>
   <Item name="" identifier="ballistichelmet3" category="Equipment" tags="smallitem,helmet" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_heavy" scale="0.325">
-    <PreferredContainer primary="secarmcab" amount="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="secarmcab" amount="2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.1" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="320">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -334,17 +334,17 @@
     </Wearable>
   </Item>
   <!-- HEADGEAR END -->
-  <Item name="" identifier="handcuffs" category="Equipment" maxstacksize="8" cargocontaineridentifier="metalcrate" tags="smallitem,handlocker" scale="0.5" impactsoundtag="impact_metal_light" equipconfirmationtext="handcuffequipconfirmation">
+  <Item name="" identifier="handcuffs" category="Equipment" maxstacksize="16" cargocontaineridentifier="metalcrate" tags="smallitem,handlocker" scale="0.5" impactsoundtag="impact_metal_light" equipconfirmationtext="handcuffequipconfirmation">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.1" />
     <PreferredContainer primary="armcab" secondary="secarmcab" />
     <Price baseprice="30">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" sold="false" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="10">
diff --git a/Content/Items/Jobgear/Security/securityofficer_talent_items.xml b/Content/Items/Jobgear/Security/securityofficer_talent_items.xml
index 2cf97aa1..6a1d3b91 100644
--- a/Content/Items/Jobgear/Security/securityofficer_talent_items.xml
+++ b/Content/Items/Jobgear/Security/securityofficer_talent_items.xml
@@ -3,13 +3,13 @@
   <Item name="" identifier="autoshotgun" category="Weapon" cargocontaineridentifier="metalcrate" allowasextracargo="true" tags="mediumitem,weapon,gun,gunsmith,mountableweapon,provocativetohumanai" Scale="0.62" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="secarmcab" secondary="armcab,weaponholder"/>
     <Price baseprice="710" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="0" maxavailable="1" sold="true">
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="0" maxavailable="1" sold="true">
         <Reputation faction="coalition" min="70"/>
       </Price>
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="65" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="55" />
@@ -45,13 +45,13 @@
       <RequiredItems items="shotgunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="75" />
     </RangedWeapon>
-    <ItemContainer capacity="2" maxstacksize="12" hideitems="false" containedstateindicatorstyle="bullet" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorslot="0" containedspritedepth="0.56">
-      <Containable items="shotgunammo" hide="true"/>
+    <ItemContainer capacity="4" maxstacksize="24" hideitems="false" containedstateindicatorstyle="bullet" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorslot="0" containedspritedepth="0.56">
+      <Containable items="shotgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="true"/>
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="26,-2" setactive="true"/>
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="26,-2" setactive="true"/>
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
@@ -63,11 +63,11 @@
   <Item name="" identifier="assaultrifle" category="Weapon" cargocontaineridentifier="metalcrate" allowasextracargo="true" tags="mediumitem,weapon,gun,gunsmith,mountableweapon,provocativetohumanai" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="secarmcab" secondary="armcab,weaponholder"/>
     <Price baseprice="720" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="75" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="65" />
@@ -108,12 +108,12 @@
       <RequiredItems items="assaultriflemagazine" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
-      <Containable items="assaultrifleammo" itempos="4,-12" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+      <Containable items="assaultrifleammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" itempos="4,-12" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />   
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="24,4" setactive="true"/>
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="24,4" setactive="true"/>
       </SubContainer>
     </ItemContainer> 
     <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
@@ -122,15 +122,15 @@
     </Quality>
     <SkillRequirementHint identifier="weapons" level="50" />
   </Item>
-  <Item name="" identifier="assaultriflemagazine" maxstacksize="8" maxstacksizecharacterinventory="2" scale="0.5" category="Weapon" allowasextracargo="true" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,assaultrifleammo,handheldammo" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="assaultrifle" minamount="1" maxamount="1" spawnprobability="1"/>
+  <Item name="" identifier="assaultriflemagazine" maxstacksize="16" maxstacksizecharacterinventory="4" scale="0.5" category="Weapon" allowasextracargo="true" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,assaultrifleammo,handheldammo" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="assaultrifle" minamount="2" maxamount="2" spawnprobability="1"/>
     <PreferredContainer primary="armcab" secondary="secarmcab"/>
     <Price baseprice="300" sold="false" minleveldifficulty="60" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="0" maxavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="0" maxavailable="4" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="35" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="40" />
@@ -155,7 +155,7 @@
     <Sprite texture="Content/Items/JobGear/TalentGear.png" sourcerect="476,3,36,48" depth="0.55" origin="0.5,0.5" />
     <Body width="28" height="40" density="25" />
     <ItemContainer hideitems="true" capacity="1" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true" SpawnWithId="assaultrifleround" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
-      <Containable items="assaultrifleround" />
+      <Containable items="assaultrifleround,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-3.3" disabledeltatime="true">
         <SpawnItem identifiers="assaultrifleround" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -185,14 +185,14 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="shotgunslugexplosive" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="shotgunslugexplosive" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="24" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="armcab" secondary="secarmcab"/>
     <Price baseprice="75" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="5"></Deconstruct>
     <Fabricate suitablefabricators="fabricator" requiredtime="10" requiresrecipe="true" amount="6">
@@ -225,14 +225,14 @@
   <Item name="" identifier="bandolier" category="Equipment" tags="mediumitem,clothing,mobilecontainer" scale="0.5" cargocontaineridentifier="metalcrate" allowasextracargo="true" description="" impactsoundtag="impact_soft">
     <PreferredContainer primary="armcab" secondary="secarmcab"/>
     <Price baseprice="250" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="0" maxavailable="1" sold="true">
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="0" maxavailable="1" sold="true">
         <Reputation faction="separatists" min="50"/>
       </Price>
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" maxavailable="3" sold="true">
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" maxavailable="3" sold="true">
         <Reputation faction="separatists" min="50"/>
       </Price>
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
       <Price storeidentifier="merchantmine" />
     </Price>   
     <Deconstruct time="30">
@@ -254,20 +254,20 @@
       <StatValue stattype="TurretChargeSpeed" value="0.1" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" holdpos="0,-70" handle1="0,0-30" handle2="0,-30" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
-    <ItemContainer capacity="8" maxstacksize="32">
+    <ItemContainer capacity="18" maxstacksize="64">
       <SlotIcon texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
-      <Containable items="handheldammo,grenade,handgrenade" />
+      <Containable items="handheldammo,grenade,handgrenade,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
     
   <Item name="" identifier="boardingaxe" category="Weapon" Tags="mediumitem,weapon,gunsmith,mountableweapon" scale="0.5" allowasextracargo="true" requireaimtouse="true" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
     <Price baseprice="350" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="titaniumaluminiumalloy" />
@@ -300,7 +300,7 @@
     </Quality>
     <aitarget sightrange="500" soundrange="250" fadeouttime="1" />
   </Item>
-  <Item name="" identifier="skillbooksubmarinewarfare" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="8" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="skillbooksubmarinewarfare" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="16" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="350" buyingpricemodifier="2.5" minleveldifficulty="40">
       <Price storeidentifier="merchantoutpost" />
@@ -325,7 +325,7 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="skillbook_warstories" aliases="skillbooksubmarinewarfare_warstories" scale="0.5" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="8" impactsoundtag="impact_soft">
+  <Item name="" identifier="skillbook_warstories" aliases="skillbooksubmarinewarfare_warstories" scale="0.5" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="16" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="200" sold="false" />
     <InventoryIcon texture="Content/Items/JobGear/TalentGear.png" sourcerect="476,295,35,52" origin="0.5,0.5" />
@@ -368,8 +368,8 @@
   </Item>
   <Item name="" identifier="slipsuit" variantof="combatdivingsuit" allowasextracargo="true" botpriority="1.5">
     <Price baseprice="630" sold="false" />
-    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.0"/>
-    <PreferredContainer primary="wreckdivingsuitcontainer"  spawnprobability="0.0"/>
+    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0"/>
+    <PreferredContainer primary="wreckdivingsuitcontainer"  spawnprobability="0"/>
     <Deconstruct time="30">
       <Item identifier="ballisticfiber" />
       <Item identifier="titaniumaluminiumalloy" />
@@ -393,7 +393,7 @@
     <Body radius="45" width="34" density="20" />
     <Wearable>
       <sprite name="Slipsuit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="0,520,105,124" origin="0.5,0.4">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -419,14 +419,14 @@
       <StatValue stattype="WalkingSpeed" value="-0.3" />
     </Wearable>
   </Item>
-  <Item name="" identifier="stungundartfulgurium" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" interactthroughwalls="true" allowasextracargo="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="stungundartfulgurium" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="16" interactthroughwalls="true" allowasextracargo="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="armcab" secondary="secarmcab"/>
     <Price baseprice="120" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="5"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="25" amount="2" requiresrecipe="true">
@@ -472,11 +472,11 @@
   <Item name="" identifier="riotshield" category="Equipment" tags="mediumitem" health="75" impactsoundtag="impact_metal_light" cargocontaineridentifier="metalcrate" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" scale="1" allowasextracargo="true">
     <PreferredContainer primary="armcab" secondary="secarmcab"/>
     <Price baseprice="360" sold="true" minleveldifficulty="50" >
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="0" maxavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="0" maxavailable="2" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
diff --git a/Content/Items/Jobgear/misc.xml b/Content/Items/Jobgear/misc.xml
index a30fb2b0..23baf564 100644
--- a/Content/Items/Jobgear/misc.xml
+++ b/Content/Items/Jobgear/misc.xml
@@ -3,11 +3,11 @@
   <Item name="" identifier="headset" scale="0.5" category="Equipment" tags="smallitem,mobileradio" description="" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="crewcab" secondary="divingcab"/>
     <Price baseprice="40">
-      <Price storeidentifier="merchantoutpost" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" minavailable="6" />
-      <Price storeidentifier="merchantmine" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" minavailable="18" />
+      <Price storeidentifier="merchantmine" minavailable="18" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="256,0,64,64" origin="0.5,0.5" />
     <Sprite name="Headset" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="28,321,49,62" origin="0.5,0.5" />
@@ -45,8 +45,8 @@
         <Remove />
       </StatusEffect>
     </Holdable>
-    <ItemContainer capacity="20" keepopenwhenequipped="false" movableframe="true">
-      <Containable items="smallitem,toolbelt,toolbox,bandolier" excludeditems="largemobilecontainer" />
+    <ItemContainer capacity="44" keepopenwhenequipped="false" movableframe="true">
+      <Containable items="smallitem,toolbelt,toolbox,bandolier,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>  
 </Items>
diff --git a/Content/Items/Labels/labels.xml b/Content/Items/Labels/labels.xml
index bc61ee89..031f218a 100644
--- a/Content/Items/Labels/labels.xml
+++ b/Content/Items/Labels/labels.xml
@@ -17,11 +17,11 @@
     <Sprite texture="labels.png" depth="0.85" sourcerect="0,0,126,48"/>
     <Price baseprice="200">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="reactorcab,engcab"/>
     <Deconstruct time="10">
@@ -40,7 +40,7 @@
     <ItemLabel scrollable="true" padding="10,5,10,12" textcolor="1,1,1,1">
       <Upgrade gameversion="0.12.0.0" padding="10,5,10,12"/>
     </ItemLabel>
-    <LightComponent range="0.0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false">
+    <LightComponent range="0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Items/Labels/labels.png" sourcerect="0,48,126,48"  depth="0.025" origin="0.5,0.5" alpha="1.0"/>
     </LightComponent>
diff --git a/Content/Items/Legacy/legacycontainers.xml b/Content/Items/Legacy/legacycontainers.xml
index 839c8fb0..17869fd6 100644
--- a/Content/Items/Legacy/legacycontainers.xml
+++ b/Content/Items/Legacy/legacycontainers.xml
@@ -11,7 +11,7 @@
 
     <Sprite texture="locker.png" depth="0.84" sourcerect="0,0,128,128"/>
 
-    <ItemContainer capacity="30" slotsperrow="6" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="66" slotsperrow="9" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem"/>
     </ItemContainer>
@@ -29,7 +29,7 @@
 
     <Sprite texture="cabinets.png" depth="0.84" sourcerect="0,0,48,64" canflipx="false"/>
 
-    <ItemContainer capacity="30" slotsperrow="6" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="66" slotsperrow="9" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,chem,medical"/>
     </ItemContainer>
@@ -47,7 +47,7 @@
 
     <Sprite texture="cabinets.png" depth="0.84" sourcerect="0,64,48,64" canflipx="false"/>
 
-    <ItemContainer capacity="30" slotsperrow="6" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="66" slotsperrow="9" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,chem,medical"/>
     </ItemContainer>
diff --git a/Content/Items/Legacy/legacyfabricators.xml b/Content/Items/Legacy/legacyfabricators.xml
index fd9b0b61..0d21d7f6 100644
--- a/Content/Items/Legacy/legacyfabricators.xml
+++ b/Content/Items/Legacy/legacyfabricators.xml
@@ -38,7 +38,7 @@
       </StatusEffect>
     </Repairable>
 
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="Input" allowuioverlap="true"/>
+    <ItemContainer capacity="11" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="Input" allowuioverlap="true"/>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="Output" allowuioverlap="true"/>
   </Item>
 
@@ -79,7 +79,7 @@
       </StatusEffect>
     </Repairable>
 
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="11" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="" allowuioverlap="true"/>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true"/>
   </Item>
 
@@ -121,7 +121,7 @@
       </StatusEffect>
     </Repairable>
     
-    <ItemContainer capacity="3" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true"/>
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="5" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="7" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="11" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="4" uilabel="" allowuioverlap="true"/>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Legacy/legacyoxygengenerator.xml b/Content/Items/Legacy/legacyoxygengenerator.xml
index b04bc922..c9cc75f0 100644
--- a/Content/Items/Legacy/legacyoxygengenerator.xml
+++ b/Content/Items/Legacy/legacyoxygengenerator.xml
@@ -36,7 +36,7 @@
   
     <trigger/>
 
-    <ItemContainer capacity="5" maxstacksize="1" canbeselected = "true" msg="ItemMsgOxygenRefill">
+    <ItemContainer capacity="11" maxstacksize="2" canbeselected = "true" msg="ItemMsgOxygenRefill">
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="oxygentank,oxygenitetank"/>
     </ItemContainer>
diff --git a/Content/Items/Legacy/legacyrailgun.xml b/Content/Items/Legacy/legacyrailgun.xml
index 727a58ef..d7ba0420 100644
--- a/Content/Items/Legacy/legacyrailgun.xml
+++ b/Content/Items/Legacy/legacyrailgun.xml
@@ -68,9 +68,9 @@
   <Item name="" identifier="railgunloader" tags="railgunequipment,railgunammosource,turretammosource" category="Legacy" linkable="true" allowedlinks="railgun" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <SwappableItem canbebought="false" origin="149,276"/>
     <Sprite texture="Content/Items/Weapons/LegacyLoaders.png" depth="0.8" sourcerect="0,0,298,276" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="5" slotsperrow="6" itempos="53,-140" iteminterval="48,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="11" slotsperrow="4" itempos="53,-140" iteminterval="48,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="railgunammo" />
+      <Containable items="railgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="20" mindeteriorationdelay="5" maxdeteriorationdelay="15" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.25" />
@@ -93,7 +93,7 @@
     <Sprite texture="Content/Items/Weapons/LegacyLoaders.png" depth="0.8" sourcerect="0,276,84,236" origin="0.5,0.5" />
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="42,-112" iteminterval="0,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="railgunammo" />
+      <Containable items="railgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="20" mindeteriorationdelay="5" maxdeteriorationdelay="15" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.25" />
@@ -116,7 +116,7 @@
     <Sprite texture="Content/Items/Weapons/LegacyLoaders.png" depth="0.8" sourcerect="86,278,241,86" origin="0.5,0.5" />
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="112,-42" iteminterval="0,0" itemrotation="180" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="railgunammo" />
+      <Containable items="railgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="20" mindeteriorationdelay="5" maxdeteriorationdelay="15" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.25" />
diff --git a/Content/Items/Legacy/legacysearchlight.xml b/Content/Items/Legacy/legacysearchlight.xml
index a1a27d09..ff98bc3b 100644
--- a/Content/Items/Legacy/legacysearchlight.xml
+++ b/Content/Items/Legacy/legacysearchlight.xml
@@ -22,7 +22,7 @@
       springdampinglowskill="5" springdampinghighskill="5"
       rotationspeedlowskill="0.5" rotationspeedhighskill="0.5">
       <BarrelSprite texture="Content/Items/Legacy/SearchLight_legacy.png" origin="0.5, 0.55" />
-      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="2500" IsOn="true" powerconsumption="50" drawbehindsubs="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="10000" IsOn="true" powerconsumption="50" drawbehindsubs="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0"/>
       </LightComponent>
     </Turret>
diff --git a/Content/Items/Materials/materials.xml b/Content/Items/Materials/materials.xml
index 4b53abd9..b5b18d3c 100644
--- a/Content/Items/Materials/materials.xml
+++ b/Content/Items/Materials/materials.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <!-- Elements ************************************************************************************************ -->
-  <Item name="" identifier="carbon" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="carbon" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="10" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="384,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="5,55,46,38" depth="0.55" origin="0.5,0.5" />
@@ -21,15 +21,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="iron" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,munition_jacket,petfood3,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="iron" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,munition_jacket,petfood3,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="8" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="5,92,46,38" depth="0.55" origin="0.5,0.5" />
@@ -59,15 +59,15 @@
     </Projectile>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="tin" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="tin" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,petfood3" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="11" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="832,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="150,92,47,38" depth="0.55" origin="0.5,0.5" />
@@ -80,15 +80,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="lead" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3,munition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="lead" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,petfood3,munition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <Price baseprice="18" sold="true" minavailable="3">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" minavailable="20" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <Price baseprice="18" sold="true" minavailable="9">
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="768,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="101,92,47,38" depth="0.55" origin="0.5,0.5" />
@@ -118,15 +118,15 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="phosphorus" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="phosphorus" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="25" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="153,6,23,44" depth="0.55" origin="0.5,0.5" />
@@ -138,15 +138,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="copper" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3,munition_core,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="copper" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,petfood3,munition_core,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="22" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="576,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="53,92,48,38" depth="0.55" origin="0.5,0.5" />
@@ -159,15 +159,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="zinc" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="zinc" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="26" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="640,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="102,55,46,37" depth="0.55" origin="0.5,0.5" />
@@ -179,21 +179,21 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="sodium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="sodium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medfabcab" />
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="33" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="29,7,23,44" depth="0.55" origin="0.5,0.5" />
     <Body width="22" height="42" density="20" />
     <Holdable canBeCombined="true" removeOnCombined="true" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="100" IsOn="false">
+    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="400" IsOn="false">
       <StatusEffect type="OnActive" target="This" IsOn="false">
         <Conditional target="This" InWater="false" />
       </StatusEffect>
@@ -220,15 +220,15 @@
       </StatusEffect>
     </LightComponent>
   </Item>
-  <Item name="" identifier="silicon" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="silicon" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="17" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="960,128,64,64" />
     <Sprite texture="minerals.png" sourcerect="196,54,46,38" depth="0.55" origin="0.5,0.5" />
@@ -240,15 +240,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="calcium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="calcium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" secondary="medfabcab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="31" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="256,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="129,6,23,44" depth="0.55" origin="0.5,0.5" />
@@ -260,15 +260,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="aluminium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="aluminium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="42" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="53,53,47,39" depth="0.55" origin="0.5,0.5" />
@@ -281,15 +281,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="uranium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,advmunition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+  <Item name="" identifier="uranium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,advmunition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <PreferredContainer primary="storagecab" />
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="5" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="15" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="898,192,61,63" origin="0.5,0.5" />
     <Sprite texture="minerals.png" sourcerect="4,130,49,41" depth="0.55" origin="0.5,0.5" />
@@ -319,20 +319,20 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="potassium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="potassium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
     <Price baseprice="10" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="128,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="77,6,23,44" depth="0.55" origin="0.5,0.5" />
     <Body width="22" height="42" density="15" />
     <Holdable canBeCombined="true" removeOnCombined="true" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="100" IsOn="false">
+    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="400" IsOn="false">
       <StatusEffect type="OnActive" target="This" IsOn="false">
         <Conditional target="This" InWater="false" />
       </StatusEffect>
@@ -359,15 +359,15 @@
       </StatusEffect>
     </LightComponent>
   </Item>
-  <Item name="" identifier="titanium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3,advmunition_core,advmunition_tip" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="titanium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,petfood3,advmunition_core,advmunition_tip" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.04" />
     <Price baseprice="65" sold="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="9" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="150,55,46,37" depth="0.55" origin="0.5,0.5" />
@@ -380,15 +380,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="magnesium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="magnesium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="65">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" minavailable="18" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="192,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="102,6,23,44" depth="0.55" origin="0.5,0.5" />
@@ -400,21 +400,21 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="lithium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="lithium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="88" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="5" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="15" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="0,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="3,7,24,44" depth="0.55" origin="0.5,0.5" />
     <Body width="27" height="47" density="15" />
     <Holdable canBeCombined="true" removeOnCombined="true" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,0,0,255" Flicker="1.0" range="100" IsOn="false">
+    <LightComponent LightColor="255,0,0,255" Flicker="1.0" range="400" IsOn="false">
       <StatusEffect type="OnActive" target="This" IsOn="false">
         <Conditional target="This" InWater="false" />
       </StatusEffect>
@@ -441,15 +441,15 @@
       </StatusEffect>
     </LightComponent>
   </Item>
-  <Item name="" identifier="chlorine" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chlorine" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="11" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="0,256,64,64" />
     <Sprite texture="minerals.png" sourcerect="55,7,22,44" depth="0.6" origin="0.5,0.5" />
@@ -461,15 +461,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="thorium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="thorium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.04" />
     <Price baseprice="125" sold="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="5" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="15" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="960,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="54,131,46,39" depth="0.55" origin="0.5,0.5" />
@@ -482,15 +482,15 @@
     </Holdable>
   </Item>
   <!-- Compounds ************************************************************************************************ -->
-  <Item name="" identifier="steel" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3,munition_core,advmunition_core,advmunition_tip,scrapcannonammo" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="steel" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,petfood3,munition_core,advmunition_core,advmunition_tip,scrapcannonammo" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="28">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="7" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="10" />
-      <Price storeidentifier="merchantresearch" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="21" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="30" />
+      <Price storeidentifier="merchantresearch" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="45" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="60" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="20" />
@@ -529,15 +529,15 @@
     </Projectile>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="titaniumaluminiumalloy" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="titaniumaluminiumalloy" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.04" />
     <Price baseprice="150" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="9" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="30" />
@@ -559,15 +559,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="plastic" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="plastic" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="45">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="7" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="10" />
-      <Price storeidentifier="merchantresearch" minavailable="12" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="21" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="30" />
+      <Price storeidentifier="merchantresearch" minavailable="36" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="27" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="45" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="20" />
@@ -588,15 +588,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="ballisticfiber" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="ballisticfiber" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1" />
     <Price baseprice="160" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="6" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="40" />
@@ -617,15 +617,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="organicfiber" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+  <Item name="" identifier="organicfiber" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <PreferredContainer primary="medfabcab" />
     <Price baseprice="30">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantresearch" minavailable="7" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantresearch" minavailable="21" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,768,64,64" />
     <Sprite texture="minerals.png" sourcerect="178,8,42,45" depth="0.55" origin="0.5,0.5" />
@@ -637,15 +637,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="rubber" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="rubber" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.2" />
     <Price baseprice="20">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="9" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="13" />
-      <Price storeidentifier="merchantresearch" minavailable="7" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="27" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="39" />
+      <Price storeidentifier="merchantresearch" minavailable="21" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="18" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="0,770,64,64" />
     <Sprite texture="minerals.png" sourcerect="133,221,35,32" depth="0.55" origin="0.5,0.5" />
@@ -657,15 +657,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="flashpowder" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,explosive" impacttolerance="8" useinhealthinterface="true" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="flashpowder" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,explosive" impacttolerance="8" useinhealthinterface="true" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="90">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="7" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="21" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Fabricate suitablefabricators="fabricator,medicalfabricator" requiredtime="5">
       <RequiredItem identifier="magnesium" />
@@ -695,9 +695,9 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="" identifier="scrap" sonarsize="2" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" aliases="scrap1,scrap2,scrap3,scrap4,scrap5,scrap6,scrap7,scrap8">
+  <Item name="" identifier="scrap" sonarsize="2" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" aliases="scrap1,scrap2,scrap3,scrap4,scrap5,scrap6,scrap7,scrap8">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,wreckreactorcab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="wreckstoragecab,wreckreactorcab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="1" />
     <Price baseprice="5" sold="false" />
     <Deconstruct time="10" chooserandom="true" amount="2">
       <Item identifier="iron" commonness="0.8" />
@@ -738,18 +738,18 @@
     </Projectile>
   </Item>
   <!-- ALIEN MATERIALS -->
-  <Item name="" identifier="incendium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="incendium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" sold="false" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" />
       <Price storeidentifier="merchantresearch" sold="true" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.7" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="260,835,53,61" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienMaterials.png" sourcerect="105,439,52,61" depth="0.55" origin="0.5,0.5" />
@@ -782,18 +782,18 @@
       <RequiredItem items="cuttingequipment" type="Equipped" />
     </LevelResource>
   </Item>
-  <Item name="" identifier="fulgurium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fulgurium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="3" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="3" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="328,833,51,63" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienMaterials.png" sourcerect="186,351,59,67" depth="0.55" origin="0.5,0.5" />
@@ -814,18 +814,18 @@
       <RequiredItem items="cuttingequipment" type="Equipped" />
     </LevelResource>
   </Item>
-  <Item name="" identifier="physicorium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
+  <Item name="" identifier="physicorium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" sold="false" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" />
       <Price storeidentifier="merchantresearch" sold="true" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.7" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="70,835,52,59" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienMaterials.png" sourcerect="97,349,58,71" depth="0.55" origin="0.5,0.5" />
@@ -846,18 +846,18 @@
       <RequiredItem items="cuttingequipment" type="Equipped" />
     </LevelResource>
   </Item>
-  <Item name="" identifier="dementonite" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
+  <Item name="" identifier="dementonite" category="Material,Alien" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" sold="false" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" />
       <Price storeidentifier="merchantresearch" sold="true" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.7" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="0,830,64,64" />
     <Sprite texture="Content/Items/Alien/AlienMaterials.png" sourcerect="15,356,60,54" depth="0.55" origin="0.5,0.5" />
diff --git a/Content/Items/Materials/medmaterials.xml b/Content/Items/Materials/medmaterials.xml
index ec607ad4..132a9464 100644
--- a/Content/Items/Materials/medmaterials.xml
+++ b/Content/Items/Materials/medmaterials.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="fiberplant" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="fiberplant" category="Material" Tags="smallitem,plant" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="100">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="organicfiber" />
@@ -17,7 +17,7 @@
     </Deconstruct>
     <!--   <InventoryIcon texture="Content/Items/Materials/Minerals.png" sourcerect="0,0,108,166" -->
     <ContainedSprite texture="Content/Items/Materials/Minerals.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="257,0,96,128" origin="0.5,0.5" />
-    <LightComponent lightcolor="208,139,211,150" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="208,139,211,150" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Sprite texture="Content/Items/Materials/Minerals.png" depth="0.2" sourcerect="545,386,54,78" origin="0.5,0.5" />
@@ -42,18 +42,18 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="elastinplant" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="elastinplant" category="Material" Tags="smallitem,plant" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="139,211,197,100" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="139,211,197,100" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="elastin" />
@@ -83,18 +83,18 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="aquaticpoppy" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="aquaticpoppy" category="Material" Tags="smallitem,plant" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="139,211,197,100" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="139,211,197,100" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="opium" />
@@ -122,18 +122,18 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="yeastshroom" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="yeastshroom" category="Material" Tags="smallitem,plant" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="112,174,199,150" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="112,174,199,150" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="200">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ethanol" />
@@ -160,18 +160,18 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="slimebacteria" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="slimebacteria" category="Material" Tags="smallitem,plant" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="222,153,79,150" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="222,153,79,150" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibiotics" />
@@ -198,15 +198,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="paralyxis" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,ore" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
+  <Item name="" identifier="paralyxis" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,ore" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.1" />
     <Price baseprice="190" sold="false" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" />
       <Price storeidentifier="merchantresearch" sold="true" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="960,832,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienMaterials.png" sourcerect="266,430,45,76" depth="0.55" />
diff --git a/Content/Items/Materials/minerals.xml b/Content/Items/Materials/minerals.xml
index 093b484a..febe210b 100644
--- a/Content/Items/Materials/minerals.xml
+++ b/Content/Items/Materials/minerals.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="titanite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="titanite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="1" />
     <Price baseprice="250" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titanium" />
@@ -18,7 +18,7 @@
       <Item identifier="iron" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,730,86,147" origin="0.5,0.5" />
@@ -41,23 +41,23 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="brockite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="brockite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="1" />
     <Price baseprice="150" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="phosphorus" />
       <Item identifier="thorium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="178,108,109,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="178,108,109,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,731,86,147" origin="0.5,0.5" />
@@ -80,21 +80,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="thorianite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="thorianite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="300" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="thorium" />
       <Item identifier="thorium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="85,877,88,147" origin="0.5,0.5" />
@@ -117,16 +117,16 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="amblygonite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="amblygonite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="1" />
     <Price baseprice="200" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lithium" />
@@ -134,7 +134,7 @@
       <Item identifier="sodium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="211,189,89,120" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="211,189,89,120" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.5" sourcerect="0,5,84,144" origin="0.5,0.5" />
@@ -157,14 +157,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="sphalerite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="sphalerite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="zinc" />
@@ -172,7 +172,7 @@
       <Item identifier="zinc" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="196,196,196,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="196,196,196,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="172,585,84,147" origin="0.5,0.5" />
@@ -194,21 +194,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="pyromorphite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="pyromorphite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="30" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chlorine" />
       <Item identifier="chlorine" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="115,154,127,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="115,154,127,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="853,292,86,147" origin="0.5,0.5" />
@@ -230,20 +230,20 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="quartz" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="quartz" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="silicon" />
       <Item identifier="silicon" />
     </Deconstruct>
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,585,86,147" origin="0.5,0.5" />
@@ -266,21 +266,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="diamond" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="diamond" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="30" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="carbon" />
       <Item identifier="carbon" />
       <Item identifier="carbon" />
     </Deconstruct>
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="938,0,86,147" origin="0.5,0.5" />
@@ -303,14 +303,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="hydroxyapatite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="hydroxyapatite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calcium" />
@@ -318,7 +318,7 @@
       <Item identifier="phosphorus" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="179,173,154,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="179,173,154,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="426,292,86,147" origin="0.5,0.5" />
@@ -341,14 +341,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="uraniumore" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="uraniumore" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="200" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uranium" />
@@ -356,7 +356,7 @@
       <Item identifier="uranium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="83,160,100,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="83,160,100,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="768,731,86,147" origin="0.5,0.5" />
@@ -379,20 +379,20 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="ilmenite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ilmenite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titanium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="117,143,123,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="117,143,123,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="597,292,84,147" origin="0.5,0.5" />
@@ -415,14 +415,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="stannite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="stannite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" />
@@ -430,7 +430,7 @@
       <Item identifier="tin" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="766,883,88,133" origin="0.5,0.5" />
@@ -453,21 +453,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="chalcopyrite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chalcopyrite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="60" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" />
       <Item identifier="copper" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="162,135,83,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="162,135,83,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,438,86,148" origin="0.5,0.5" />
@@ -489,14 +489,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="esperite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="esperite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="zinc" />
@@ -521,21 +521,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="galena" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="galena" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" />
     <Price baseprice="70" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lead" />
       <Item identifier="lead" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="117,139,162,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="117,139,162,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="341,877,86,147" origin="0.5,0.5" />
@@ -557,20 +557,20 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="triphylite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="triphylite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lithium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="127,174,170,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="127,174,170,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="256,0,86,147" origin="0.5,0.5" />
@@ -592,14 +592,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="langbeinite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="langbeinite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="200" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="potassium" />
@@ -607,7 +607,7 @@
       <Item identifier="magnesium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="150,125,105,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="150,125,105,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,146,86,147" origin="0.5,0.5" />
@@ -630,14 +630,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="chamosite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chamosite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="130" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" />
@@ -646,7 +646,7 @@
       <Item identifier="aluminium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="69,158,142,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="69,158,142,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="341,438,86,148" origin="0.5,0.5" />
@@ -669,14 +669,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="ironore" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ironore" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="25" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" />
@@ -685,7 +685,7 @@
       <Item identifier="iron" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,438,86,148" origin="0.5,0.5" />
@@ -708,21 +708,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="polyhalite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="polyhalite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="potassium" />
       <Item identifier="calcium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="134,99,88" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="134,99,88" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="768,146,86,147" origin="0.5,0.5" />
@@ -745,21 +745,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="graphite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="graphite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="25" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="carbon" />
       <Item identifier="carbon" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,0,86,147" origin="0.5,0.5" />
@@ -782,14 +782,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="sylvite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="sylvite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="70" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sodium" />
@@ -797,7 +797,7 @@
       <Item identifier="potassium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,89,67,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,89,67,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="256,146,86,147" origin="0.5,0.5" />
@@ -820,21 +820,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="lazulite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="lazulite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="25" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="phosphorus" />
       <Item identifier="iron" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="88,121,142,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="88,121,142,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="341,731,86,147" origin="0.5,0.5" />
@@ -857,21 +857,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="bornite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="bornite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="60" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" />
       <Item identifier="copper" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="119,82,124,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="119,82,124,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="853,438,86,148" origin="0.5,0.5" />
@@ -894,14 +894,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="cassiterite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="cassiterite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="40" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tin" />
@@ -909,7 +909,7 @@
       <Item identifier="tin" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="153,82,66,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="153,82,66,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="597,877,84,147" origin="0.5,0.5" />
@@ -931,21 +931,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="cryolite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="cryolite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="80" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sodium" />
       <Item identifier="sodium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,144,86,147" origin="0.5,0.5" />
@@ -968,21 +968,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="aragonite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="aragonite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="80" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calcium" />
       <Item identifier="calcium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="187,157,67,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="187,157,67,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,292,86,147" origin="0.5,0.5" />
@@ -1005,20 +1005,20 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="chrysoprase" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chrysoprase" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="16" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="40" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="silicon" amount="2" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="115,148,82,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="115,148,82,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="853,585,86,147" origin="0.5,0.5" />
@@ -1044,7 +1044,7 @@
   <Item name="" identifier="piezocrystal" category="Material" Tags="" canbepicked="false" description="" scale="0.5" sonarsize="30" health="60" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true">
     <Sprite texture="Content/Items/Materials/Crystal.png" depth="1.0" sourcerect="0,4,1024,1020" origin="0.5,0.6" />
     <Body width="500" height="500" density="25" bodytype="Static" />
-    <LightComponent lightcolor="178,196,207,255" range="4000.0" powerconsumption="0" flicker="0.2" flickerspeed="0.5" pulsefrequency="0.2" pulseamount="0.8" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="178,196,207,255" range="16000" powerconsumption="0" flicker="0.2" flickerspeed="0.5" pulsefrequency="0.2" pulseamount="0.8" ison="true" drawbehindsubs="true">
       <StatusEffect type="OnBroken" target="This" disabledeltatime="true">
         <particleemitter particle="iceshards" particleamount="200" velocitymin="100" velocitymax="3000" anglemin="0" anglemax="360" scalemin="0.5" scalemax="3.0" />
         <Explosion range="1000.0" ballastfloradamage="1000" structuredamage="600" itemdamage="1000" force="50.0" severlimbsprobability="1.5" decal="explosion" decalsize="1.0" camerashake="500" camerashakerange="50000" flashrange="10000" flashduration="5.0" screencolor="255,255,255,255" screencolorrange="5000" screencolorduration="3.0">
@@ -1058,7 +1058,7 @@
         <RemoveItem />
       </StatusEffect>
     </LightComponent>
-    <LightComponent lightcolor="178,196,207,255" range="4000.0" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="1.0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="178,196,207,255" range="16000" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="1.0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ElectricalDischarger duration="0.2" outdoorsonly="true" powerconsumption="0" range="3500" rangemultiplierinwalls="1">
diff --git a/Content/Items/Medical/buffs.xml b/Content/Items/Medical/buffs.xml
index 46bd40d6..2c608e3e 100644
--- a/Content/Items/Medical/buffs.xml
+++ b/Content/Items/Medical/buffs.xml
@@ -3,19 +3,19 @@
   <!-- Name: Methamphetamine -->
   <!-- Description: A potent nervous system stimulant. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Methamphetamine name="" identifier="meth" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Methamphetamine name="" identifier="meth" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
     <Price baseprice="50">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantnightclub" minavailable="4" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantnightclub" minavailable="12" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
       <RequiredSkill identifier="medical" level="30" />
@@ -77,18 +77,18 @@
   <!-- Name: Anabolic Steroids -->
   <!-- Description: Temporarily increases muscular strength and physical performance. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <AnabolicSteroids name="" identifier="steroids" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <AnabolicSteroids name="" identifier="steroids" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
     <Price baseprice="350">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="45">
@@ -146,19 +146,19 @@
   <!-- Name: Hyperzine -->
   <!-- Description: An extremely potent muscle stimulant for those moments when you gotta go fast. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Hyperzine name="" identifier="hyperzine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Hyperzine name="" identifier="hyperzine" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true"/>
-    <Price baseprice="450" minavailable="1">
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
+    <Price baseprice="450" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" sold="false" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantnightclub" minavailable="3" />
+      <Price storeidentifier="merchantcity" sold="false" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantnightclub" minavailable="9" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
       <RequiredSkill identifier="medical" level="40" />
@@ -221,21 +221,21 @@
   <!-- Medical alcohol used as an ingredient in the manufacture of various medicines. Drinking while on duty is not advised. 
        Pouring on skin treats mild infections yet causes small burns.-->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Ethanol name="" identifier="ethanol" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical,petfood2" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Ethanol name="" identifier="ethanol" category="Medical,Material" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical,petfood2" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="sprayer" amount="1" spawnprobability="1"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="sprayer" amount="2" spawnprobability="1"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
     <PreferredContainer primary="medfabcab" secondary="medcab"/>
-    <Price baseprice="60" minavailable="6" >
+    <Price baseprice="60" minavailable="18" >
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
       <Price storeidentifier="merchantclown" minavailable="0" maxavailable="2" />
-      <Price storeidentifier="merchantnightclub" minavailable="4" />
+      <Price storeidentifier="merchantnightclub" minavailable="12" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="80" fabricationlimitmin="5" fabricationlimitmax="10"/>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="256,768,64,64" origin="0.5,0.5" />
@@ -275,12 +275,12 @@
   <!-- Name: Energy Drink -->
   <!-- Applies heightened speed for a while, but also has a probability to cause nausea. Only at vending machines. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <EnergyDrink name="" identifier="energydrink" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <EnergyDrink name="" identifier="energydrink" category="Medical,Material" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="2" spawnprobability="0.15" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="4" spawnprobability="0.3" />
     <Price baseprice="40" sold="false">
-      <Price storeidentifier="merchantnightclub" minavailable="4" sold="true" />
+      <Price storeidentifier="merchantnightclub" minavailable="12" sold="true" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="40" fabricationlimitmin="5" fabricationlimitmax="10"/>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="64,768,64,64" origin="0.5,0.5" />
@@ -308,10 +308,10 @@
   <!-- Name: Protein bar -->
   <!-- Provides slow healing for damage and burns. Only at vending machines. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <ProteinBar name="" identifier="proteinbar" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <ProteinBar name="" identifier="proteinbar" category="Medical,Material" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="2" spawnprobability="0.15" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="4" spawnprobability="0.3" />
     <PreferredContainer primary="crewcab"/>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="40" fabricationlimitmin="5" fabricationlimitmax="10"/>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="0,768,64,64" origin="0.5,0.5" />
@@ -340,17 +340,17 @@
   <!-- Name: Mind Sense -->
   <!-- Gives the user temporarily the ability to highlight enemies, similar to Thermal Goggles -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <MindSense identifier="mindsense" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <MindSense identifier="mindsense" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
     <Price baseprice="280" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" sold="true" maxavailable="1" mindifficulty="35" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine"  multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" sold="true" maxavailable="1" mindifficulty="35" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine"  multiplier="3.3" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
       <RequiredSkill identifier="medical" level="40" />
@@ -392,11 +392,11 @@
   <!-- Name: Mind Wipe -->
   <!-- Resets the talent points of the character, overuse can lose points -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <MindWipe identifier="mindwipe" category="Medical" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <MindWipe identifier="mindwipe" category="Medical" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab"/>
     <PreferredContainer secondary="crewcab" />
-    <PreferredContainer primary="ruinstoragelarge" amount="1" spawnprobability="0.03" />
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="ruinstoragelarge" amount="2" spawnprobability="0.06" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.2" />
     <Price baseprice="860" sold="false">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" />
@@ -428,16 +428,16 @@
       </StatusEffect>
     </Holdable>
   </MindWipe>
-  <Item name="" nameidentifier="beerbottle" identifier="beerbottle1" category="Medical,Misc" maxstacksize="8" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
+  <Item name="" nameidentifier="beerbottle" identifier="beerbottle1" category="Medical,Misc" maxstacksize="16" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true" notpvp="true"/>
     <PreferredContainer primary="medfabcab" secondary="medcab"/>
     <Price baseprice="60" sold="false">
       <Price storeidentifier="merchantclown" minavailable="0" maxavailable="3" sold="true">
         <Reputation faction="clowns" min="30"/>
       </Price>
-      <Price storeidentifier="merchantnightclub" minavailable="20" sold="true" />
+      <Price storeidentifier="merchantnightclub" minavailable="60" sold="true" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="60" fabricationlimitmin="2" fabricationlimitmax="6"/>
     <Sprite texture="Content/Map/Outposts/Art/AdminResidentAssets.png" sourcerect="835,0,20,63" depth="0.6" origin="0.5,0.5" />
diff --git a/Content/Items/Medical/medical.xml b/Content/Items/Medical/medical.xml
index 374c3913..adfb558b 100644
--- a/Content/Items/Medical/medical.xml
+++ b/Content/Items/Medical/medical.xml
@@ -6,22 +6,22 @@
   <!-- Name: Bandage -->
   <!-- Description: Basic bandages, useful in the treatment of bleeding wounds and burns. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Bandage name="" identifier="antibleeding1" aliases="Bandage" category="Medical" Tags="smallitem,medical" maxstacksize="32" maxstacksizecharacterinventory="8" useinhealthinterface="true" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
+  <Bandage name="" identifier="antibleeding1" aliases="Bandage" category="Medical" Tags="smallitem,medical" maxstacksize="64" maxstacksizecharacterinventory="16" useinhealthinterface="true" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="supplycab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true"/>
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.8" />
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.5" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.02"/>
+    <PreferredContainer secondary="supplycab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.04"/>
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <Price baseprice="30" minavailable="25">
+    <Price baseprice="30" minavailable="75">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" multiplier="0.9"/>
+      <Price storeidentifier="merchantmedical" multiplier="2.7"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="15" amount="2">
       <RequiredSkill identifier="medical" level="5" />
@@ -57,15 +57,15 @@
   <!-- Name: Plastiseal -->
   <!-- Description: A synthetic skin with hemostatic properties, able to quickly seal most wounds. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Plastiseal name="" identifier="antibleeding2" category="Medical" Tags="smallitem,medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
+  <Plastiseal name="" identifier="antibleeding2" category="Medical" Tags="smallitem,medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.4" />
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.3" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.02"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.8" />
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="0.6" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.04"/>
     <Price baseprice="100">
-      <Price storeidentifier="merchantmedical" minavailable="12" />
+      <Price storeidentifier="merchantmedical" minavailable="36" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="25" amount="3">
       <RequiredSkill identifier="medical" level="16" />
@@ -103,14 +103,14 @@
   <!-- Description: An antibiotic glue with hemostatic properties. Seals bleeding wounds almost immediately and treats burns and infections very effectively. Use with care as it may cause mobile 
   clots in the bloodstream. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <AntibioticGlue name="" identifier="antibleeding3" category="Medical" Tags="smallitem,medical" maxstacksize="8" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <AntibioticGlue name="" identifier="antibleeding3" category="Medical" Tags="smallitem,medical" maxstacksize="16" maxstacksizecharacterinventory="2" MaxStackSizeHoldableOrWearableInventory="1" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.1" />
     <Price baseprice="190">
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="10" minleveldifficulty="25" />
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="30" minleveldifficulty="25" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="45" amount="1" >
       <RequiredSkill identifier="medical" level="48" />
@@ -161,23 +161,23 @@
   <!-- Name: Morphine -->
   <!-- Description: A powerful opiate for treating pain associated with internal injuries, but will cause shortness of breath and eventual dependency with overuse. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Morphine name="" identifier="antidama1" aliases="Corrigodone" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Morphine name="" identifier="antidama1" aliases="Corrigodone" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="supplycab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.8" />
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.5" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.02"/>
+    <PreferredContainer secondary="supplycab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.04"/>
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <Price baseprice="100" minavailable="12">
+    <Price baseprice="100" minavailable="36">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" multiplier="0.9"/>
+      <Price storeidentifier="merchantmedical" multiplier="2.7"/>
     </Price>
     <SuitableTreatment type="damage" suitability="40" />
     <SuitableTreatment identifier="opiatewithdrawal" suitability="5" />
@@ -236,16 +236,16 @@
   <!-- Name: Fentanyl -->
   <!-- Description: A powerful opiate for treating pain associated with internal injuries, but will cause shortness of breath and eventual dependency with overuse. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Fentanyl name="" identifier="antidama2" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Fentanyl name="" identifier="antidama2" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.4" />
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.3" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.02"/>
-    <Price baseprice="190" minavailable="1">
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="12" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.8" />
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="0.6" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.04"/>
+    <Price baseprice="190" minavailable="3">
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="36" />
     </Price>
     <SuitableTreatment type="damage" suitability="75" />
     <SuitableTreatment identifier="opiateoverdose" suitability="-50" />
@@ -311,18 +311,18 @@
   <!-- Name: Pomegrenade Extract -->
   <!-- Description: A crappy but non lethal alternative to opiods, made from pomegrenades.-->
   <!-- *************************************************************************************************************************************************************************** -->
-  <pomegrenadeextract name="" identifier="pomegrenadeextract" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <pomegrenadeextract name="" identifier="pomegrenadeextract" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="medcab" minamount="4" maxamount="8" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer secondary="medcontainer"/>
-    <Price baseprice="80" minavailable="4">
+    <Price baseprice="80" minavailable="12">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <SuitableTreatment type="damage" suitability="8" />
     <SuitableTreatment type="burn" suitability="8" />
@@ -378,18 +378,18 @@
   <!-- Name: Saline -->
   <!-- Description: A sodium chloride infusion mildly useful in the treatment of blood loss. Small relief when used on infected tissue. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Saline name="" identifier="antibloodloss1" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1,petfood2,petfood3" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
+  <Saline name="" identifier="antibloodloss1" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1,petfood2,petfood3" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="6" spawnprobability="1" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <Price baseprice="50" minavailable="12">
+    <Price baseprice="50" minavailable="36">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" multiplier="0.9"/>
+      <Price storeidentifier="merchantmedical" multiplier="2.7"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="15" amount="2" >
       <RequiredSkill identifier="medical" level="5" />
@@ -432,16 +432,16 @@
   <!-- Name: Blood Pack -->
   <!-- Description: A pack of blood substitute for the treatment of blood loss. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <BloodPack name="" identifier="antibloodloss2" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
+  <BloodPack name="" identifier="antibloodloss2" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" minamount="2" maxamount="3" notcampaign="true"/>
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="2" spawnprobability="0.2"/>
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="medcab" minamount="4" maxamount="6" notcampaign="true"/>
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="4" spawnprobability="0.4"/>
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer secondary="medcontainer"/>
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.02"/>
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.04"/>
     <Price baseprice="240">
-      <Price storeidentifier="merchantmedical" multiplier="0.9"/>
+      <Price storeidentifier="merchantmedical" multiplier="2.7"/>
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="25" amount="2" >
@@ -481,13 +481,13 @@
   <!-- Description: A highly potent stimulant effective in the treatment of internal damage, oxygen deprivation, blood loss and, to a lesser extent, bleeding. Produces mild burns as a side 
   effect. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Deusizine name="" identifier="deusizine" aliases="Auxiliriozine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Deusizine name="" identifier="deusizine" aliases="Auxiliriozine" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.02" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.04" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
     <Price baseprice="500">
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minleveldifficulty="50"/>
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minleveldifficulty="50"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="60" >
       <RequiredSkill identifier="medical" level="70" />
@@ -585,18 +585,18 @@
   <!-- Name: Liquid Oxygenite -->
   <!-- Description: A mildly toxic solution that slowly releases oxygen into the bloodstream when injected. Avoid dropping. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <LiquidOxygenite name="" identifier="liquidoxygenite" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" impacttolerance="8" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <LiquidOxygenite name="" identifier="liquidoxygenite" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" impacttolerance="8" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="80">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="12" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="12" />
     </Price>
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.1" />  
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.2" />  
     <SuitableTreatment identifier="organdamage" suitability="-30" />
     <SuitableTreatment identifier="oxygenlow" suitability="30" />
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,640,64,64" origin="0.5,0.5" />
@@ -669,20 +669,20 @@
   <!-- Name: Calyxanide -->
   <!-- An antiparasitic drug used in the treatment of husk parasite infections. Might require higher dosage to cure the infection at later stages. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Calyxanide name="" identifier="calyxanide" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Calyxanide name="" identifier="calyxanide" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.06" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
     <Price baseprice="510">
-      <Price storeidentifier="merchantoutpost" minavailable="5" />
-      <Price storeidentifier="merchantcity" minavailable="5" />
-      <Price storeidentifier="merchantresearch" minavailable="7" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="5" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" minavailable="5" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="7" />
-      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="5">
+      <Price storeidentifier="merchantoutpost" minavailable="15" />
+      <Price storeidentifier="merchantcity" minavailable="15" />
+      <Price storeidentifier="merchantresearch" minavailable="21" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="15" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" minavailable="15" />
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="21" />
+      <Price storeidentifier="merchanthusk" minavailable="9" maxavailable="5">
         <Reputation faction="huskcult" min="30"/>
       </Price>
     </Price>
@@ -751,19 +751,19 @@
   <!-- Name: Haloperidol -->
   <!-- A strong antipsychotic drug. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Haloperidol name="" identifier="antipsychosis" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Haloperidol name="" identifier="antipsychosis" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <Price baseprice="130" minavailable="4">
+    <Price baseprice="130" minavailable="12">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" multiplier="0.9"/>
+      <Price storeidentifier="merchantmedical" multiplier="2.7"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
       <RequiredSkill identifier="medical" level="21" />
@@ -814,14 +814,14 @@
   <!-- Name: Naloxone -->
   <!-- An opioid antagonist for the treatment of opiate-based withdrawal and overdose. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Naloxone name="" identifier="antinarc" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Naloxone name="" identifier="antinarc" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.2" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <Price baseprice="100" minavailable="2">
-      <Price storeidentifier="merchantmedical" multiplier="0.9"/>
+    <Price baseprice="100" minavailable="6">
+      <Price storeidentifier="merchantmedical" multiplier="2.7"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
       <RequiredSkill identifier="medical" level="23" />
@@ -874,12 +874,12 @@
   <!-- Name: Morbusine Antidote -->
   <!-- An antidote for acute morbusine poisoning. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <MorbusineAntidote name="" identifier="morbusineantidote" aliases="Morbusanide" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <MorbusineAntidote name="" identifier="morbusineantidote" aliases="Morbusanide" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer secondary="medcontainer"/>
     <Price baseprice="250" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost"/>
@@ -887,7 +887,7 @@
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="2"/>
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="6"/>
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
@@ -934,12 +934,12 @@
   <!-- Name: Cyanide Antidote -->
   <!-- An antidote for acute cyanide poisoning. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <CyanideAntidote name="" identifier="cyanideantidote" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <CyanideAntidote name="" identifier="cyanideantidote" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer secondary="medcontainer"/>
     <Price baseprice="350" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost"/>
@@ -947,7 +947,7 @@
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="2"/>
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="6"/>
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
@@ -994,12 +994,12 @@
   <!-- Name: Sufforin Antidote -->
   <!-- An antidote for acute sufforin poisoning. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <SufforinAntidote name="" identifier="sufforinantidote" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <SufforinAntidote name="" identifier="sufforinantidote" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer secondary="medcontainer"/>
     <Price baseprice="125" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost"/>
@@ -1007,7 +1007,7 @@
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="2"/>
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="6"/>
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
@@ -1054,12 +1054,12 @@
   <!-- Name: Deliriumine Antidote -->
   <!-- An antidote for acute deliriumine poisoning. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <DeliriumineAntidote name="" identifier="deliriumineantidote" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <DeliriumineAntidote name="" identifier="deliriumineantidote" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer secondary="medcontainer"/>
     <Price baseprice="125" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost"/>
@@ -1067,7 +1067,7 @@
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" minavailable="2" multiplier="0.9"/>
+      <Price storeidentifier="merchantmedical" minavailable="2" multiplier="2.7"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
       <RequiredSkill identifier="medical" level="25" />
@@ -1113,11 +1113,11 @@
   <!-- Name: AntiRad -->
   <!-- Slows down cellular degradation caused by radiation. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <AntiRad name="" identifier="antirad" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <AntiRad name="" identifier="antirad" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
     <Price baseprice="125" minleveldifficulty="11">
       <Price storeidentifier="merchantoutpost"/>
@@ -1125,7 +1125,7 @@
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" minavailable="2" multiplier="0.9"/>
+      <Price storeidentifier="merchantmedical" minavailable="2" multiplier="2.7"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
       <RequiredSkill identifier="medical" level="35" />
@@ -1171,20 +1171,20 @@
   <!-- Name: Paralysis Antidote -->
   <!-- An antidote for paralysis. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <ParalysisAntidote name="" identifier="antiparalysis" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <ParalysisAntidote name="" identifier="antiparalysis" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wrecksupplycab" amount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.8" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer secondary="wrecksupplycab" amount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
     <Price baseprice="200" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
-      <Price storeidentifier="merchantmedical" minavailable="2" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
+      <Price storeidentifier="merchantmedical" minavailable="2" multiplier="2.7" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
       <RequiredSkill identifier="medical" level="24" />
@@ -1236,17 +1236,17 @@
   <!-- Name: Elastin -->
   <!-- A highly elastic, naturally occurring protein. Useful for crafting. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Elastin name="" identifier="elastin" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem" cargocontaineridentifier="mediccrate" scale="0.5" impactsoundtag="impact_soft">
+  <Elastin name="" identifier="elastin" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,chem" cargocontaineridentifier="mediccrate" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer primary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
     <Price baseprice="40">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="8" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="24" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="772,771,52,59" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Medical/Medicines.png" sourcerect="465,452,47,60" depth="0.6" origin="0.5,0.5" />
@@ -1261,19 +1261,19 @@
   <!-- Name: Opium -->
   <!-- A relatively mild opioid obtained from aquatic poppy. Most commonly used to manufacture morphine and fentanyl. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Opium name="" identifier="opium" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
+  <Opium name="" identifier="opium" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,chem" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.2" />
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.4" />
     <Price baseprice="40">
-      <Price storeidentifier="merchantoutpost" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantnightclub" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantnightclub" minavailable="12" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="60" fabricationlimitmin="5" fabricationlimitmax="10"/>
     <SuitableTreatment type="damage" suitability="20" />
@@ -1315,17 +1315,17 @@
   <!-- Name: Broad-spectrum Antibiotics -->
   <!-- An antibiotic that acts against a wide range of disease-causing bacteria, though with the side effect of internal damage and Alcohol Sensitivity. Used as an ingredient in many medical compounds. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Antibiotics name="" identifier="antibiotics" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem,medical,syringe" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
+  <Antibiotics name="" identifier="antibiotics" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,chem,medical,syringe" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
     <Price baseprice="40">
-      <Price storeidentifier="merchantoutpost" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="36" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="30" />
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="60" fabricationlimitmin="5" fabricationlimitmax="10"/>
@@ -1392,17 +1392,17 @@
   </Antibiotics>
   <!-- Name: Stabilozine -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Stabilozine name="" identifier="stabilozine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" tags="smallitem,chem,medical,syringe" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Stabilozine name="" identifier="stabilozine" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" tags="smallitem,chem,medical,syringe" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
     <Price baseprice="40">
-      <Price storeidentifier="merchantoutpost" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantoutpost" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="45" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="45" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="384,640,64,64" origin="0.5,0.5" />
     <Sprite texture="Medicines.png" sourcerect="112,139,37,70" depth="0.6" origin="0.5,0.5" />
@@ -1444,17 +1444,17 @@
   <!-- Name: Adrenaline -->
   <!-- A naturally occurring hormone, useful as short-term treatment and prevention for stun, while also keeping the patient from falling to life-threatening unconsciousness. Can be used to manufacture medicine or combat stimulants. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Adrenaline name="" identifier="adrenaline" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Adrenaline name="" identifier="adrenaline" category="Medical,Material" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
     <Price baseprice="60">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="12" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="129,448,62,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Medical/Medicines.png" sourcerect="301,209,37,72" depth="0.6" origin="0.5,0.5" />
@@ -1485,22 +1485,22 @@
   <!-- Name: Tonic Liquid  -->
   <!-- Description: A medical solution that's mildly effective as a treatment for internal damage, but is more commonly used to increase the duration of performance enhancing drugs. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <TonicLiquid name="" identifier="tonicliquid" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.3" impactsoundtag="impact_metal_light">
+  <TonicLiquid name="" identifier="tonicliquid" category="Medical,Material" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.3" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.2" />
     <SuitableTreatment type="damage" suitability="1" />
     <SuitableTreatment type="burn" suitability="-10" />
     <SuitableTreatment identifier="opiateoverdose" suitability="-10" />
     <SuitableTreatment identifier="oxygenlow" suitability="-10" />
     <SuitableTreatment identifier="opiatewithdrawal" suitability="-10" />
-    <Price baseprice="75" minavailable="3">
+    <Price baseprice="75" minavailable="9">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="7" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
-      <Price storeidentifier="merchantnightclub" minavailable="1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="21" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
+      <Price storeidentifier="merchantnightclub" minavailable="3" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="100" fabricationlimitmin="5" fabricationlimitmax="10"/>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="20" amount="2">
diff --git a/Content/Items/Medical/poisons.xml b/Content/Items/Medical/poisons.xml
index d9c4c3b9..8ae193fe 100644
--- a/Content/Items/Medical/poisons.xml
+++ b/Content/Items/Medical/poisons.xml
@@ -6,16 +6,16 @@
   <!-- Name: Morbusine -->
   <!-- Description: Causes oxygen deprivation. Kills relatively quickly, but not effective on bigger creatures -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Morbusine name="" identifier="morbusine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Morbusine name="" identifier="morbusine" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.02" />
-    <Price baseprice="200" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.04" />
+    <Price baseprice="200" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="1">
         <Reputation faction="huskcult" min="50"/>
       </Price>
@@ -72,16 +72,16 @@
   <!-- Name: Chloral Hydrate -->
   <!-- Description: A sedative that can be used to knock someone out for a short period of time. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <ChloralHydrate name="" identifier="chloralhydrate" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <ChloralHydrate name="" identifier="chloralhydrate" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
-    <Price baseprice="100" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.2" />
+    <Price baseprice="100" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
       <RequiredSkill identifier="medical" level="50" />
@@ -129,16 +129,16 @@
   <!-- Name: Cyanide -->
   <!-- Description: Sudden death for normal characters. Works even on the strongest creatures, but it might take time. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Cyanide name="" identifier="cyanide" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Cyanide name="" identifier="cyanide" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="250" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="250" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="1" >
         <Reputation faction="huskcult" min="50"/>
       </Price>
@@ -193,16 +193,16 @@
   <!-- Name: Radiotoxin -->
   <!-- Description: A highly potent neurotoxin. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Radiotoxin name="" identifier="radiotoxin" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Radiotoxin name="" identifier="radiotoxin" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="200" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="200" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
       <RequiredSkill identifier="medical" level="56" />
@@ -248,16 +248,16 @@
   <!-- Name: Sufforin -->
   <!-- Description: disables slowly, makes very sick, eventually lethal. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Sufforin name="" identifier="sufforin" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Sufforin name="" identifier="sufforin" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="100" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="100" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="1" >
         <Reputation faction="huskcult" min="50"/>
       </Price>
@@ -311,16 +311,16 @@
   <!-- Name: Deliriumine -->
   <!-- Description: A psychosis-inducing toxin. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Deliriumine name="" identifier="deliriumine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Deliriumine name="" identifier="deliriumine" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="250" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="250" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="60" amount="2">
       <RequiredSkill identifier="medical" level="50" />
@@ -364,16 +364,16 @@
   <!-- Name: Paralyzant -->
   <!-- Description: slows down effectively, but doesn't kill. In high doses effective even on the biggest monsters.-->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Paralyzant name="" identifier="paralyzant" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Paralyzant name="" identifier="paralyzant" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="380" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="380" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
       <RequiredSkill identifier="medical" level="40" />
@@ -426,16 +426,16 @@
   <!-- Name: Raptor bane extract -->
   <!-- Description: Causes vomiting in humans, severely harms raptors. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <raptorbaneextract name="" identifier="raptorbaneextract" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <raptorbaneextract name="" identifier="raptorbaneextract" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="250" minavailable="1">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.3" />
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="250" minavailable="3">
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.9" />
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="40">
       <RequiredSkill identifier="medical" level="20" />
@@ -490,9 +490,9 @@
   <!-- Name: Hallucinogenic Bufotoxin -->
   <!-- Description: A hallucinogenic toxin. Has an antiparalyzant effect. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Bufotoxin name="" identifier="hallucinogenicbufotoxin" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Bufotoxin name="" identifier="hallucinogenicbufotoxin" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
     <Price baseprice="200" sold="false" />
     <Deconstruct time="20">
       <Item identifier="antibloodloss1" />
@@ -517,17 +517,17 @@
   <!-- Name: Sulphuric Acid -->
   <!-- A strong acid that causes burns when in contact with skin. Used as an ingredient in several poisons. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <SulphuricAcid name="" identifier="sulphuricacid" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" description="" Tags="smallitem,chem,poison" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <SulphuricAcid name="" identifier="sulphuricacid" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" description="" Tags="smallitem,chem,poison" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.5" />
+    <PreferredContainer secondary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="1" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
     <Price baseprice="80">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false"/>
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false"/>
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,768,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Medical/Medicines.png" sourcerect="346,452,33,60" depth="0.6" origin="0.5,0.5" />
diff --git a/Content/Items/Misc/misc.xml b/Content/Items/Misc/misc.xml
index bc40921a..1788a829 100644
--- a/Content/Items/Misc/misc.xml
+++ b/Content/Items/Misc/misc.xml
@@ -3,8 +3,8 @@
   <Item name="" identifier="guitar" category="Misc" Tags="bigitem,instrument" scale="0.5" description="" price="300" isshootable="true">
     <Upgrade gameversion="0.9.2.0" scale="0.5"/>
     <Price baseprice="50">
-      <Price storeidentifier="merchantoutpost" minavailable="1"/>
-      <Price storeidentifier="merchantcity" minavailable="1"/>
+      <Price storeidentifier="merchantoutpost" minavailable="3"/>
+      <Price storeidentifier="merchantcity" minavailable="3"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
@@ -27,11 +27,11 @@
     </Holdable>
   </Item>
   <Item name="" identifier="harmonica" category="Misc" Tags="smallitem,instrument" cargocontaineridentifier="metalcrate" scale="0.5" description="" price="300" impactsoundtag="impact_metal_light" isshootable="true">
-    <PreferredContainer primary="crewcab" spawnprobability="0.05" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.1"/>
+    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.2"/>
     <Price baseprice="50">
-      <Price storeidentifier="merchantoutpost" minavailable="1"/>
-      <Price storeidentifier="merchantcity" minavailable="1"/>
+      <Price storeidentifier="merchantoutpost" minavailable="3"/>
+      <Price storeidentifier="merchantcity" minavailable="3"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
@@ -48,11 +48,11 @@
     </Holdable>
   </Item>
   <Item name="" identifier="accordion" category="Misc" Tags="smallitem,instrument" scale="0.5" description="" price="300" impactsoundtag="impact_metal_light" isshootable="true">
-    <PreferredContainer primary="crewcab" spawnprobability="0.05" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.1"/>
+    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.2"/>
     <Price baseprice="50">
-      <Price storeidentifier="merchantoutpost" minavailable="1"/>
-      <Price storeidentifier="merchantcity" minavailable="1"/>
+      <Price storeidentifier="merchantoutpost" minavailable="3"/>
+      <Price storeidentifier="merchantcity" minavailable="3"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
@@ -68,8 +68,8 @@
   </Item>
   
   <Item name="" identifier="captainspipe" category="Misc" Tags="smallitem" scale="0.5" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" isshootable="true" requireaimtouse="true">
-    <PreferredContainer primary="crewcab" spawnprobability="0.05" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.1"/>
+    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.2"/>
     <Price baseprice="50">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
@@ -101,19 +101,19 @@
         <RequiredItem items="pipetobacco" type="Contained" />
       </StatusEffect>
     </Holdable>
-    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="74,-281" iteminterval="0,0" itemrotation="0" canbeselected="false" containedspritedepth="0.79">
+    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="6" itempos="74,-281" iteminterval="0,0" itemrotation="0" canbeselected="false" containedspritedepth="0.79">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="0,384,64,64" origin="0.5,0.5" />
-      <Containable items="pipetobacco" />
+      <Containable items="pipetobacco,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
-  <Item name="" identifier="pipetobacco" category="Misc" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,pipetobacco" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="pipetobacco" category="Misc" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,pipetobacco" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <PreferredContainer primary="captainspipe" spawnprobability="1"/>
-    <PreferredContainer primary="crewcab" spawnprobability="0.05" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.1"/>  
+    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.2"/>  
     <Price baseprice="120">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" minavailable="1"/>
-      <Price storeidentifier="merchantcity" multiplier="0.9"  minavailable="2"/>
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" minavailable="3"/>
+      <Price storeidentifier="merchantcity" multiplier="2.7"  minavailable="6"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
@@ -165,7 +165,7 @@
 
   <Item name="" identifier="researcherscribble1" nameidentifier="alientranslator" descriptionidentifier=" " allowstealingalways="true" spritecolor="20,39,162,255" category="Misc" hideinmenus="true" Tags="smallitem" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" secondary="locker"/>
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.05"/>
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.1"/>
     <InventoryIcon texture="Content/Items/Misc/scribble1.png" sourcerect="0,0,768,1024" origin="0.5,0.5" />
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="367,194,12,44"  origin="0.5,0.5" depth="0.8" />
     <Body width="35" height="40" density="8" />
diff --git a/Content/Items/Misc/pvp_items.xml b/Content/Items/Misc/pvp_items.xml
index a351fa84..7923bed6 100644
--- a/Content/Items/Misc/pvp_items.xml
+++ b/Content/Items/Misc/pvp_items.xml
@@ -8,8 +8,8 @@
     <Sprite texture="Content/Items/Containers/containers.png" depth="0.54" sourcerect="407,376,152,89" origin="0.5,0.5" />
     <Body width="150" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="20" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem,mediumitem" excludeditems="toolbelt,toolbox,bandolier,cargoscooter,largemobilecontainer" />
+    <ItemContainer capacity="44" maxstacksize="64" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       <StatusEffect type="OnSpawn" target="this">
         <SpawnItem identifier="revolver" spawnposition="ThisInventory" count="1" />
         <SpawnItem identifier="revolverround" spawnposition="ThisInventory" mincount="12" maxcount="24" />
@@ -21,7 +21,7 @@
         <Remove />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="157,1,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -59,7 +59,7 @@
         <SpawnItem identifier="medicinebelt_tier1" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -137,7 +137,7 @@
         <SpawnItem identifiers="piratehelmet" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -209,7 +209,7 @@
         <SpawnItem identifier="chitinhelmet" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -226,7 +226,7 @@
         <SpawnItem identifiers="piratehelmet" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -276,7 +276,7 @@
         <SpawnItem identifiers="ballistichelmet1" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -291,7 +291,7 @@
         <SpawnItem identifiers="ballistichelmet1" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -306,7 +306,7 @@
         <SpawnItem identifiers="ballistichelmet1" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -323,8 +323,8 @@
       <sprite name="ToolBelt" texture="Content/Items/Tools/tools.png" sourcerect="256,102,112,54" limb="Torso" inherittexturescale="true" origin="0.5,-0.2" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" holdpos="0,-70" handle1="-5,0" handle2="10,-20" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
-    <ItemContainer capacity="6" maxstacksize="32" depth="0.5" >
-      <Containable items="smallitem" excludeditems="toolbelt,toolbox,bandolier" />
+    <ItemContainer capacity="13" maxstacksize="64" depth="0.5" >
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
       <StatusEffect type="OnSpawn" target="this">
         <SpawnItem identifier="antibleeding1" spawnposition="ThisInventory" mincount="4" maxcount="8" />
         <SpawnItem identifier="antibloodloss1" spawnposition="ThisInventory" mincount="4" maxcount="8" />
diff --git a/Content/Items/Misc/traitor_items.xml b/Content/Items/Misc/traitor_items.xml
index e576eae7..b6240d5e 100644
--- a/Content/Items/Misc/traitor_items.xml
+++ b/Content/Items/Misc/traitor_items.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="deepdiverduck" category="Misc" Tags="smallitem,traitormissionitem" maxstacksize="1" impacttolerance="4" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" impactsoundtag="impact_metal_heavy">
+  <Item name="" identifier="deepdiverduck" category="Misc" Tags="smallitem,traitormissionitem" maxstacksize="2" impacttolerance="4" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="storagecab" />
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" spawnprobability="0" />
     <Price baseprice="38" sold="false" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <Fabricate suitablefabricators="fabricator" hidefornontraitors="true" requiredtime="10">
       <RequiredSkill identifier="helm" level="10" />
@@ -46,7 +46,7 @@
     </Projectile>
   </Item>
 
-  <Item name="" identifier="huskfigurine" category="Misc" maxstacksize="2" Tags="smallitem,traitormissionitem" scale="0.5" health="10" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="huskfigurine" category="Misc" maxstacksize="4" Tags="smallitem,traitormissionitem" scale="0.5" health="10" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="50" sold="false" canbespecial="false">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
@@ -111,7 +111,7 @@
   </Item>
 
   <!-- Basic time bomb, can be dumped into water to get rid of -->
-  <Item name="" identifier="traitortimebomb" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="1" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="traitortimebomb" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="2" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
     <Price baseprice="160" sold="false" canbespecial="false" />
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" depth="0.55" sourcerect="448,198,38,76" origin="0.5,0.5" />
     <Body width="30" height="70" density="20" />
@@ -138,7 +138,7 @@
         <sound file="Content/Items/Weapons/ExplosionDebris2.ogg" range="6000" />
       </StatusEffect>
     </Throwable>
-    <LightComponent LightColor="248,81,81,100" range="20" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
+    <LightComponent LightColor="248,81,81,100" range="80" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
       <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="492,218,17,7" origin="0.5,0.5"/>
       <StatusEffect type="OnActive" target="This" interval="1" Condition="-1.0" disabledeltatime="true">
         <sound file="Content/Items/Button/Switch1.ogg" range="200" frequencymultiplier="1.5" volume="0.75" />
@@ -147,7 +147,7 @@
   </Item>
 
   <!-- Variant that cannot be dumped into the water to get rid of, it explodes and probably still nukes the ship -->
-  <Item name="" identifier="traitortimebomb2" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="1" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="traitortimebomb2" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="2" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
     <Price baseprice="160" sold="false" canbespecial="false" />
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" depth="0.55" sourcerect="448,198,38,76" origin="0.5,0.5" />
     <Body width="30" height="70" density="20" />
@@ -174,7 +174,7 @@
         <sound file="Content/Items/Weapons/ExplosionDebris2.ogg" range="6000" />
       </StatusEffect>
     </Throwable>
-    <LightComponent LightColor="248,81,81,100" range="20" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
+    <LightComponent LightColor="248,81,81,100" range="80" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
       <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="492,218,17,7" origin="0.5,0.5"/>
       <StatusEffect type="OnActive" target="This" interval="1" Condition="-1.0" disabledeltatime="true">
         <sound file="Content/Items/Button/Switch1.ogg" range="200" frequencymultiplier="1.5" volume="0.75" />
@@ -193,7 +193,7 @@
   </Item>
 
   <!-- Variant that needs battery renewed, water = boom -->
-  <Item name="" identifier="traitortimebomb3" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="1" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="traitortimebomb3" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="2" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
     <Price baseprice="160" sold="false" canbespecial="false" />
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" depth="0.55" sourcerect="448,198,38,76" origin="0.5,0.5" />
     <Body width="30" height="70" density="20" />
@@ -232,7 +232,7 @@
         <Conditional InWater="true"/>
       </StatusEffect>
     </Powered>
-    <LightComponent LightColor="248,81,81,100" range="20" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
+    <LightComponent LightColor="248,81,81,100" range="80" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
       <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="492,218,17,7" origin="0.5,0.5"/>
       <StatusEffect type="OnActive" target="Contained" Condition="-0.1" interval="1" disabledeltatime="true">
         <RequiredItem items="mobilebattery" type="Contained" />
@@ -248,15 +248,15 @@
         <sound file="Content/Items/AlarmBuzzerLoop.ogg" range="1000.0" frequencymultiplier="2.0" />
       </StatusEffect>
     </LightComponent>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <Containable items="mobilebattery">
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>
   </Item>
 
-  <Item name="" identifier="bloodsamplevial" hideinmenus="true" category="Medical" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="mediccrate" Tags="smallitem,traitormissionitem" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Item name="" identifier="bloodsamplevial" hideinmenus="true" category="Medical" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="mediccrate" Tags="smallitem,traitormissionitem" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
     <Deconstruct time="20">
       <Item identifier="opium" />
@@ -329,7 +329,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="231,102,25,54" depth="0.55" origin="0.5,0.5" />    
     <Body width="23" height="50" density="12" />
     <Holdable slots="Any,RightHand,LeftHand" holdangle="30" handle1="0,-15" msg="ItemMsgPickUpSelect" />    
-    <LightComponent LightColor="0,255,0,255" range="25" powerconsumption="10" flicker="1" blinkfrequency="2" castshadows="false" IsOn="false" canbeselected="false">
+    <LightComponent LightColor="0,255,0,255" range="100" powerconsumption="10" flicker="1" blinkfrequency="2" castshadows="false" IsOn="false" canbeselected="false">
       <StatusEffect type="OnActive" targettype="Contained" Condition="-1.66" Interval="1" disabledeltatime="true">
         <RequiredItem items="mobilebattery" type="Contained" />
       </StatusEffect>
@@ -346,9 +346,9 @@
         <StatusEffect type="OnSecondaryUse" targettype="This" IsOn="false" />
       </TickBox>
     </CustomInterface>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <Containable items="mobilebattery">
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>
@@ -426,7 +426,7 @@
   <Item name="" identifier="coilgunammobox_blanks" nameidentifier="coilgunammobox" variantof="coilgunammobox" hideinmenus="true">
     <PreferredContainer primary="coilgunammoloader" spawnprobability="0" />
     <PreferredContainer spawnprobability="0" />
-    <PreferredContainer spawnprobability="0.01" /><!-- Tiny chance Thalamus/wrecks get the funny ammo -->
+    <PreferredContainer spawnprobability="0.02" /><!-- Tiny chance Thalamus/wrecks get the funny ammo -->
     <PreferredContainer spawnprobability="0" />
     <Price sold="false" />
     <Deconstruct time="10">
@@ -445,7 +445,7 @@
         <Conditional health="lte 90" />
         <Sound file="Content/Items/Weapons/honk.ogg" type="OnUse" range="1000" />
       </StatusEffect>
-      <Containable items="coilgunbolt_blank" />
+      <Containable items="coilgunbolt_blank,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
@@ -462,7 +462,7 @@
     </Projectile>
   </Item>
 
-  <Item name="" identifier="huskeggs_huskroulette_harmless" nameidentifier="huskeggs" variantof="huskeggs" Tags="smallitem,syringe,huskroulette,traitormissionitem" hideinmenus="true" maxstacksize="1" maxstacksizecharacterinventory="1">
+  <Item name="" identifier="huskeggs_huskroulette_harmless" nameidentifier="huskeggs" variantof="huskeggs" Tags="smallitem,syringe,huskroulette,traitormissionitem" hideinmenus="true" maxstacksize="2" maxstacksizecharacterinventory="2">
     <PreferredContainer primary="toxcontainer" spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0" />
     <PreferredContainer secondary="medfabcab"/>
@@ -478,7 +478,7 @@
     </MeleeWeapon>
   </Item>
 
-  <Item name="" identifier="huskeggs_huskroulette_infect" nameidentifier="huskeggs" variantof="huskeggs" Tags="smallitem,syringe,huskroulette,traitormissionitem" hideinmenus="true" maxstacksize="1" maxstacksizecharacterinventory="1">
+  <Item name="" identifier="huskeggs_huskroulette_infect" nameidentifier="huskeggs" variantof="huskeggs" Tags="smallitem,syringe,huskroulette,traitormissionitem" hideinmenus="true" maxstacksize="2" maxstacksizecharacterinventory="2">
     <PreferredContainer primary="toxcontainer" spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0" />
     <PreferredContainer secondary="medfabcab"/>
diff --git a/Content/Items/OxygenGenerator/oxygengenerator.xml b/Content/Items/OxygenGenerator/oxygengenerator.xml
index e77eadd4..67450e35 100644
--- a/Content/Items/OxygenGenerator/oxygengenerator.xml
+++ b/Content/Items/OxygenGenerator/oxygengenerator.xml
@@ -40,7 +40,7 @@
                       offset="0,5" offsetanim="Sine" offsetanimspeed="0.5">
       <AnimationConditional Voltage="gt 0.5" targetitemcomponent="OxygenGenerator" />
     </DecorativeSprite>
-   <LightComponent range="140.0" lightcolor="255,184,108,193" powerconsumption="5" IsOn="false" castshadows="false" allowingameediting="false" />
+   <LightComponent range="560" lightcolor="255,184,108,193" powerconsumption="5" IsOn="false" castshadows="false" allowingameediting="false" />
 
     <OxygenGenerator powerconsumption="1000.0" minvoltage="0.5" canbeselected="true" msg="ItemMsgInteractSelect">
       <poweronsound file="Content/Items/PowerOnLight2.ogg" range="1500" loop="false" />
@@ -59,7 +59,7 @@
   
     <trigger/>
 
-    <ItemContainer capacity="5" maxstacksize="1" canbeselected="true" hideitems="false" itempos="31,-250" iteminterval="44.5,0" msg="ItemMsgOxygenRefill">
+    <ItemContainer capacity="11" maxstacksize="2" canbeselected="true" hideitems="false" itempos="31,-250" iteminterval="44.5,0" msg="ItemMsgOxygenRefill">
       <Upgrade gameversion="0.15.22.1" itempos="31,-250" iteminterval="44.5,0" />
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
@@ -67,7 +67,7 @@
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="3" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="4" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingfuel" excludebroken="false" excludefullcondition="true">
+      <Containable items="oxygensource,weldingfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" excludebroken="false" excludefullcondition="true">
         <StatusEffect type="OnContaining" targettype="Contained" Condition="2.0" Comparison="And">
           <Conditional Voltage="gt 0.1" targetcontainer="true" targetitemcomponent="OxygenGenerator"/>
           <Conditional HasTag="refillableoxygensource"/>
@@ -160,14 +160,14 @@
 
     <trigger/>
 
-    <ItemContainer capacity="3" maxstacksize="1" canbeselected = "true" hideitems="false" itempos="185,-172" iteminterval="27,0" msg="ItemMsgOxygenRefill" containedspritedepth="0.81">
+    <ItemContainer capacity="7" maxstacksize="2" canbeselected = "true" hideitems="false" itempos="185,-172" iteminterval="27,0" msg="ItemMsgOxygenRefill" containedspritedepth="0.81">
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="3" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="4" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingfuel" excludebroken="false" excludefullcondition="true">
+      <Containable items="oxygensource,weldingfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" excludebroken="false" excludefullcondition="true">
         <StatusEffect type="OnContaining" targettype="Contained" Condition="2.0" Comparison="And">
           <Conditional Voltage="gt 0.1" targetcontainer="true" targetitemcomponent="OxygenGenerator"/>
           <Conditional HasTag="refillableoxygensource"/>
@@ -249,7 +249,7 @@
     </Vent>    
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.11,0.17" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
diff --git a/Content/Items/Pets/PetEggs.xml b/Content/Items/Pets/PetEggs.xml
index 1c2b427c..ac373bde 100644
--- a/Content/Items/Pets/PetEggs.xml
+++ b/Content/Items/Pets/PetEggs.xml
@@ -1,14 +1,14 @@
 <Items>
   <Item name="" identifier="peanutegg" nameidentifier="petegg" Tags="smallitem,monsterfood" hideinmenus="true" health="100" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.1" />
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="265,5,43,55" origin="0.5,0.5" />
     <Price baseprice="500" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2"  />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" minavailable="1" />
+      <Price storeidentifier="merchantcity" multiplier="3.6"  />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" minavailable="3" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="alienblood" />
@@ -26,8 +26,8 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="1">
-      <Containable items="antibloodloss1">
+    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="2">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
         <StatusEffect type="OnContaining" target="This" Condition="0" setvalue="true">
           <SpawnCharacter speciesname="peanut"/>
@@ -38,14 +38,14 @@
   </Item>
   <Item name="" identifier="psilotoadegg" nameidentifier="petegg" Tags="smallitem,monsterfood" hideinmenus="true" health="100" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.1" />
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="265,133,43,55" origin="0.5,0.5" />
     <Price baseprice="500" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2"  />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" minavailable="1" />
+      <Price storeidentifier="merchantcity" multiplier="3.6"  />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" minavailable="3" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="alienblood" />
@@ -63,8 +63,8 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="1">
-      <Containable items="antibloodloss1">
+    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="2">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
         <StatusEffect type="OnContaining" target="This" Condition="0" setvalue="true">
           <SpawnCharacter speciesname="psilotoad"/>
@@ -75,14 +75,14 @@
   </Item>
   <Item name="" identifier="orangeboyegg" nameidentifier="petegg" Tags="smallitem,monsterfood" hideinmenus="true" health="100" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.1" />
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="266,259,44,56" origin="0.5,0.5" />
     <Price baseprice="500" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2"  />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" minavailable="1" />
+      <Price storeidentifier="merchantcity" multiplier="3.6"  />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" minavailable="3" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="alienblood" />
@@ -100,8 +100,8 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="1">
-      <Containable items="antibloodloss1">
+    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="2">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
         <StatusEffect type="OnContaining" target="This" Condition="0" setvalue="true">
           <SpawnCharacter speciesname="orangeboy"/>
@@ -112,14 +112,14 @@
   </Item>
   <Item name="" identifier="balloonegg" nameidentifier="petegg" Tags="smallitem,monsterfood" hideinmenus="true" health="100" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.1" />
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="11,389,43,55" origin="0.5,0.5" />
     <Price baseprice="500" sold="false" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="1.2"  />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" />
+      <Price storeidentifier="merchantcity" multiplier="3.6"  />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="alienblood" />
@@ -137,8 +137,8 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="1">
-      <Containable items="antibloodloss1">
+    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="2">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
         <StatusEffect type="OnContaining" target="This" Condition="0" setvalue="true">
           <SpawnCharacter speciesname="balloon"/>
diff --git a/Content/Items/Pets/PetItems.xml b/Content/Items/Pets/PetItems.xml
index 28bb4e48..8f39b815 100644
--- a/Content/Items/Pets/PetItems.xml
+++ b/Content/Items/Pets/PetItems.xml
@@ -1,5 +1,5 @@
 <Items>
-  <Item name="" identifier="poop" nameidentifier="poop" Tags="smallitem" maxstacksize="8" hideinmenus="true" health="20" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6">
+  <Item name="" identifier="poop" nameidentifier="poop" Tags="smallitem" maxstacksize="16" hideinmenus="true" health="20" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6">
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="387,15,53,41" origin="0.5,0.5" />
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -17,7 +17,7 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="" identifier="food" nameidentifier="food" Tags="smallitem,petfood1,petfood2,petfood3,monsterfood" maxstacksize="8" hideinmenus="true" health="50" damagedbyexplosions="true" category="Misc" scale="0.5" impactsoundtag="impact_metal_light" cargocontaineridentifier="metalcrate">
+  <Item name="" identifier="food" nameidentifier="food" Tags="smallitem,petfood1,petfood2,petfood3,monsterfood" maxstacksize="16" hideinmenus="true" health="50" damagedbyexplosions="true" category="Misc" scale="0.5" impactsoundtag="impact_metal_light" cargocontaineridentifier="metalcrate">
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="206,390,34,53" origin="0.5,0.5" />
     <Price baseprice="120" minleveldifficulty="10">
       <Price storeidentifier="merchantoutpost"/>
@@ -49,7 +49,7 @@
     <Pickable slots="Card,Any" msg="ItemMsgPickUpSelect" />
   </Item>
 
-  <Item identifier="mucusball" Tags="smallitem" maxstacksize="8" hideinmenus="true" health="20" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6" cargocontaineridentifier="metalcrate">
+  <Item identifier="mucusball" Tags="smallitem" maxstacksize="16" hideinmenus="true" health="20" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6" cargocontaineridentifier="metalcrate">
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.2" sourcerect="330,11,42,44" origin="0.5,0.5" />
     <Price baseprice="1" sold="false" canbespecial="false" />
     <Deconstruct time="10">
@@ -71,7 +71,7 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item identifier="chitin" Tags="smallitem" maxstacksize="8" hideinmenus="true" health="20" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6" cargocontaineridentifier="metalcrate">
+  <Item identifier="chitin" Tags="smallitem" maxstacksize="16" hideinmenus="true" health="20" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6" cargocontaineridentifier="metalcrate">
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.2" sourcerect="330,265,52,44" origin="0.5,0.5" />
     <Price baseprice="1" sold="false" canbespecial="false" />
     <Deconstruct time="10">
@@ -85,7 +85,7 @@
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" />
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.8" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="10">
diff --git a/Content/Items/Pump/pump.xml b/Content/Items/Pump/pump.xml
index 54bf3f22..a64a5e18 100644
--- a/Content/Items/Pump/pump.xml
+++ b/Content/Items/Pump/pump.xml
@@ -14,7 +14,7 @@
       <IsActiveConditional Condition="gt 0.0" />
     </DecorativeSprite>
     <DecorativeSprite texture="Content/Items/Pump/Pumps.png" depth="0.78" offset="-130,70" sourcerect="109,456,43,43"/>
-    <LightComponent range="40.0" lightcolor="199,96,64,88" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" />
+    <LightComponent range="160" lightcolor="199,96,64,88" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" />
     <Pump canbeselected="true" maxflow="600" PowerConsumption="300.0" MinVoltage="0.3" IsOn="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.2" minsize="420,220" anchor="Center" style="ItemUI" />
       <sound file="Content/Items/Pump/Pump.ogg" type="OnActive" range="800.0" volumeproperty="CurrFlow" volume="0.01" loop="true" />
diff --git a/Content/Items/Reactor/reactor.xml b/Content/Items/Reactor/reactor.xml
index 159bcec7..2a798f54 100644
--- a/Content/Items/Reactor/reactor.xml
+++ b/Content/Items/Reactor/reactor.xml
@@ -63,12 +63,12 @@
       <StatusEffect type="OnBroken" target="Contained" Condition="0.0" setvalue="true" />
       <SkillRequirementHint identifier="electrical" level="50" />
     </Reactor>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" alphablend="false" allowingameediting="false">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
       <sprite texture="Content/Items/Reactor/reactor.png" depth="0.025" sourcerect="523,0,482,336" origin="0.5,0.45" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" alphablend="false" allowingameediting="false" blinkfrequency="1">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" alphablend="false" allowingameediting="false" blinkfrequency="1">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
       <IsActive targetitemcomponent="Reactor" temperaturecritical="eq true" />
       <sprite texture="Content/Items/Reactor/reactor.png" depth="0.025" sourcerect="523,337,482,336" origin="0.5,0.45" alpha="1.0" />
@@ -104,24 +104,24 @@
       <output name="condition_out" displayname="connection.conditionout" />
       <output name="fuel_percentage_left" displayname="connection.fuelpercentageout" />
     </ConnectionPanel>
-    <ItemContainer capacity="4" maxstacksize="1" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
+    <ItemContainer capacity="9" maxstacksize="2" canbeselected="true" hudpos="0.5,0.15" slotsperrow="3" uilabel="FuelRods">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="3" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
-      <Containable items="fuelrod">
+      <Containable items="fuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="80.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="fulguriumfuelrod">
+      <Containable items="fulguriumfuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="150.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="thoriumfuelrod">
+      <Containable items="thoriumfuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="100.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="fulguriumfuelrodvolatile">
+      <Containable items="fulguriumfuelrodvolatile,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="150.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="huskfigurine">
+      <Containable items="huskfigurine,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="0" disabledeltatime="true" />
       </Containable>
     </ItemContainer>
diff --git a/Content/Items/SearchLight/searchlight.xml b/Content/Items/SearchLight/searchlight.xml
index ead0c572..d9a4be2a 100644
--- a/Content/Items/SearchLight/searchlight.xml
+++ b/Content/Items/SearchLight/searchlight.xml
@@ -25,7 +25,7 @@
       springdampinglowskill="5" springdampinghighskill="5"
       rotationspeedlowskill="0.5" rotationspeedhighskill="0.5">
       <BarrelSprite texture="Content/Items/SearchLight/SearchLightBase.png" sourcerect="99,0,64,88" origin="0.5, 0.75" />
-      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" powerconsumption="50" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" powerconsumption="50" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0,0.5" size="1.0,1.0"/>
       </LightComponent>
     </Turret>
diff --git a/Content/Items/Shipwrecks/wreckeditems.xml b/Content/Items/Shipwrecks/wreckeditems.xml
index ceb8da23..ac47292c 100644
--- a/Content/Items/Shipwrecks/wreckeditems.xml
+++ b/Content/Items/Shipwrecks/wreckeditems.xml
@@ -435,7 +435,7 @@
   <Item name="" identifier="railgunshellrackwrecked" nameidentifier="railgunshellrack" variantof="railgunshellrack" tags="container,wreckrailgunammocontainer" category="Wrecked">
     <Upgrade gameversion="0.20.4.0" scale="0.5" condition="0" />
     <Sprite texture="Content/Items/Shipwrecks/MiscWrecked.png" sourcerect="936,1869,182,176" />
-    <ItemContainer capacity="6" slotsperrow="6" itempos="28,-100" iteminterval="30,0" />
+    <ItemContainer capacity="13" slotsperrow="4" itempos="28,-100" iteminterval="30,0" />
   </Item>
   <Item name="" identifier="coilgunammoshelfwrecked" nameidentifier="coilgunammoshelf" variantof="coilgunammoshelf" tags="container,wreckammoboxcontainer" category="Wrecked" spritecolor="200,150,100,255">
     <Upgrade gameversion="0.20.4.0" scale="0.5" condition="0" spritecolor="200,150,100,255" />
@@ -455,17 +455,17 @@
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="0,0" iteminterval="0,0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/Map/LabelIcons.png" sourcerect="512,0,256,256" origin="0.5,0.5" />
-      <Containable items="deepdiving" excludeditems="deepdivinglarge" />
+      <Containable items="deepdiving,ammobox,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="oxygentankshelf2wrecked" nameidentifier="oxygentankshelf" tags="wreckoxygentankcontainer" pickdistance="50" scale="0.5" category="Wrecked">
     <Sprite name="Diving Suit Locker Small" texture="Content/Items/Shipwrecks/MiscWrecked.png" sourcerect="1126,1964,99,83" depth="0.84" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="3" maxstacksize="1" slotsperrow="3" itempos="27,-42" iteminterval="22.5,0" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="7" maxstacksize="2" slotsperrow="3" itempos="27,-42" iteminterval="22.5,0" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.16,0.18" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingfuel" />
+      <Containable items="oxygensource,weldingfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="extinguisherbracketwrecked" nameidentifier="extinguisherbracket" variantof="extinguisherbracket" tags="wreckextinguisherholder" spritecolor="200,150,100,255" category="Wrecked">
@@ -543,7 +543,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm01wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1170,1402,85,124" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,528,80,112" origin="0.5,0.5" />
     </LightComponent>
@@ -557,7 +557,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm02wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1258,1401,74,126" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="560,528,80,112" />
     </LightComponent>
@@ -571,7 +571,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm03wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1335,1401,68,124" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="640,528,64,112" />
     </LightComponent>
@@ -585,7 +585,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm04wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1407,1400,85,126" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="704,528,80,112" origin="0.5,0.5" />
     </LightComponent>
@@ -599,7 +599,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentl01wrecked" category="Wrecked" Tags="largeitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1228,1711,346,90" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,816,240,64" />
     </LightComponent>
@@ -613,7 +613,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentl02wrecked" category="Wrecked" Tags="largeitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1169,1650,367,59" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/light_fluorescent_L2.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,896,288,48" />
     </LightComponent>
@@ -627,7 +627,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm01wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1171,1528,76,124" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,672,80,128" origin="0.5,0.5" />
     </LightComponent>
@@ -641,7 +641,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm02wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1248,1547,124,77" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="560,672,128,80" origin="0.5,0.5" />
     </LightComponent>
@@ -655,7 +655,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm03wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1370,1526,103,123" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="688,672,112,128" />
     </LightComponent>
@@ -669,7 +669,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lighthalogenm04wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1473,1534,124,101" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="800,672,128,96" origin="0.5,0.5" />
     </LightComponent>
@@ -683,7 +683,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightleds01wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1492,1402,99,99" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="842,794,59,59" origin="0.5,0.5" />
     </LightComponent>
diff --git a/Content/Items/Tools/tools.xml b/Content/Items/Tools/tools.xml
index 4983107a..3f7eec6a 100644
--- a/Content/Items/Tools/tools.xml
+++ b/Content/Items/Tools/tools.xml
@@ -2,8 +2,8 @@
 <Items>
   <Item name="" identifier="toolbelt" category="Equipment" tags="mediumitem,mobilecontainer,tool" showcontentsintooltip="true" Scale="0.5" fireproof="true" description="" impactsoundtag="impact_soft">
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2"/>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
     </Deconstruct>
@@ -11,12 +11,12 @@
       <Item identifier="organicfiber" amount="2" />
     </Fabricate>
     <Price baseprice="65">
-      <Price storeidentifier="merchantoutpost" minavailable="4" />
-      <Price storeidentifier="merchantcity" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantengineering" minavailable="4" multiplier="0.9"/>
+      <Price storeidentifier="merchantoutpost" minavailable="12" />
+      <Price storeidentifier="merchantcity" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantengineering" minavailable="4" multiplier="2.7"/>
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="832,576,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="256,102,112,54" depth="0.6" />
@@ -25,8 +25,8 @@
       <sprite name="ToolBelt" texture="Content/Items/Tools/tools.png" sourcerect="256,102,112,54" limb="Torso" inherittexturescale="true" origin="0.5,-0.2" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" holdpos="0,-70" handle1="-5,0" handle2="10,-20" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
-    <ItemContainer capacity="6" maxstacksize="32" depth="0.5" >
-      <Containable items="smallitem" excludeditems="toolbelt,toolbox,bandolier" />
+    <ItemContainer capacity="13" maxstacksize="64" depth="0.5" >
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
@@ -42,12 +42,12 @@
       <Item identifier="organicfiber" amount="5" />
     </Fabricate>
     <Price baseprice="200" minleveldifficulty="50">
-      <Price storeidentifier="merchantoutpost" minavailable="4" />
-      <Price storeidentifier="merchantcity" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantengineering" minavailable="4" multiplier="0.9"/>
+      <Price storeidentifier="merchantoutpost" minavailable="12" />
+      <Price storeidentifier="merchantcity" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantengineering" minavailable="4" multiplier="2.7"/>
     </Price>
     <InventoryIcon texture="Content/Items/Tools/tools.png" sourcerect="3,259,68,110" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="3,259,68,110" depth="0.6" />
@@ -62,8 +62,8 @@
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" disabledeltatime="true" />
       <StatValue stattype="PropulsionSpeed" value="-0.3" />
     </Holdable>
-    <ItemContainer capacity="12" maxstacksize="32" depth="0.5" >
-      <Containable items="smallitem" excludeditems="toolbelt,toolbox,bandolier" />
+    <ItemContainer capacity="26" maxstacksize="64" depth="0.5" >
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   
@@ -79,11 +79,11 @@
       <Item identifier="steel" amount="2" />
     </Fabricate>
     <Price baseprice="60">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="12" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="640,256,64,64" origin="0.5,0.6" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="314,1,94,74" origin="0.5,0.5" depth="0.6" />
@@ -99,34 +99,34 @@
         </StatusEffect>
       </Attack>
     </MeleeWeapon>
-    <ItemContainer capacity="12" maxstacksize="32" keepopenwhenequipped="true" movableframe="true" QuickUseMovesItemsInside="false">
-      <Containable items="smallitem" />
+    <ItemContainer capacity="26" maxstacksize="64" keepopenwhenequipped="true" movableframe="true" QuickUseMovesItemsInside="false">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="1000" soundrange="1000" fadeouttime="2" />
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="128">
+      <ItemContainer maxstacksize="128" />
     </Upgrade>
   </Item>
   
   <Item name="" identifier="weldingtool" category="Equipment" Tags="smallitem,weldingequipment,tool,mountableweapon" cargocontaineridentifier="metalcrate" description="" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="2" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer primary="engcab" amount="1" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer secondary="supplycab" amount="1" spawnprobability="0.2" notcampaign="true" notpvp="true"/>
-    <PreferredContainer primary="outpostsupplycab" amount="1" spawnprobability="0.5"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1"/>
-    <PreferredContainer primary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="4" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer primary="engcab" amount="2" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="supplycab" amount="2" spawnprobability="0.4" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="outpostsupplycab" amount="2" spawnprobability="1"/>
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2"/>
+    <PreferredContainer primary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2"/>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" minavailable="3" />
-      <Price storeidentifier="merchantcity" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantengineering" minavailable="5" multiplier="0.9"/>
+      <Price storeidentifier="merchantoutpost" minavailable="9" />
+      <Price storeidentifier="merchantcity" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantengineering" minavailable="5" multiplier="2.7"/>
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,64,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="0,3,152,88" depth="0.55" origin="0.5,0.5" />
@@ -144,7 +144,7 @@
     <Body width="150" height="60" density="25" />
     <!-- the character will hold the item 50 pixels in front of him, with his hands at the handle1 and handle2 positions -->
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="60,0" handle1="-62,-16" handle2="-10,-6" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="10.0" structurefixamount="2.0" range="150" barrelpos="35,12" particles="weld" repairmultiple="true" repairthroughwalls="false" combatpriority="3" levelwallfixamount="-0.425" targetforce="10">
+    <RepairTool firedamage="10.0" structurefixamount="2.0" range="600" barrelpos="35,12" particles="weld" repairmultiple="true" repairthroughwalls="true" combatpriority="3" levelwallfixamount="-0.425" targetforce="10">
       <!-- the item must contain a welding fuel tank for it to work -->
       <RequiredItems items="weldingtoolfuel,oxygensource" type="Contained" msg="ItemMsgWeldingFuelRequired" />
       <RequiredSkill identifier="mechanical" level="50" />
@@ -194,9 +194,9 @@
       </LightComponent>
     </RepairTool>
     <!-- one welding fuel or oxygen tank can be contained inside the welding tool -->
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="8,-35" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" itempos="8,-35" containedspritedepth="0.56" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="weldingtoolfuel,oxygensource" />
+      <Containable items="weldingtoolfuel,oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="500" fadeouttime="3" />
     <Quality>
@@ -215,17 +215,17 @@
   </Item>
   
   <Item name="" identifier="plasmacutter" category="Equipment" Tags="smallitem,cuttingequipment,tool,mountableweapon" cargocontaineridentifier="metalcrate" description="" Scale="0.5" impactsoundtag="impact_metal_light">
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckdivingcab" amount="1" spawnprobability="0.05"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckdivingcab" amount="2" spawnprobability="0.1"/>
     <PreferredContainer primary="divingcab" secondary="engcab"/>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" minavailable="3" />
-      <Price storeidentifier="merchantcity" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantengineering" minavailable="5" multiplier="0.9"/>
+      <Price storeidentifier="merchantoutpost" minavailable="9" />
+      <Price storeidentifier="merchantcity" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantengineering" minavailable="5" multiplier="2.7"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -240,7 +240,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="0,166,159,87" depth="0.55" origin="0.5,0.5" />
     <Body radius="40" width="60" density="25" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="60,0" handle1="-60,-21" handle2="-21,-20" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="10.0" structurefixamount="-0.5" range="150" barrelpos="55,10" combatpriority="5" repairmultiple="true" repairthroughwalls="false" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-5.0" targetforce="10">
+    <RepairTool firedamage="10.0" structurefixamount="-0.5" range="600" barrelpos="55,10" combatpriority="5" repairmultiple="true" repairthroughwalls="true" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-5.0" targetforce="10">
       <RequiredItems items="oxygensource,weldingtoolfuel" type="Contained" msg="ItemMsgOxygenTankRequired" />
       <RequiredSkill identifier="mechanical" level="50" />
       <StatusEffect type="OnUse" targettype="Contained" targets="oxygensource" Condition="-1.0" />
@@ -276,13 +276,13 @@
       <ParticleEmitterHitCharacter particle="fleshsmoke" particlespersecond="3" anglemin="-5" anglemax="5" velocitymin="0" velocitymax="50" />
       <sound file="Content/Items/Tools/PlasmaCutterLoop.ogg" type="OnUse" range="750.0" loop="true" />
       <Fixable identifier="structure" />
-      <LightComponent LightColor="204,178,255,100" range="150" Flicker="0.5">
+      <LightComponent LightColor="204,178,255,100" range="600" Flicker="0.5">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5" />
       </LightComponent>      
     </RepairTool>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="0,-39" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" itempos="0,-39" containedspritedepth="0.56" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="weldingtoolfuel,oxygensource" />
+      <Containable items="weldingtoolfuel,oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="500" fadeouttime="3" />
     <Quality>
@@ -298,20 +298,20 @@
     <SkillRequirementHint identifier="mechanical" level="50" />
   </Item>
   
-  <Item name="" identifier="weldingfueltank" category="Equipment,Fuel" health="200" maxstacksize="8" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="weldingfueltank" category="Equipment,Fuel" health="200" maxstacksize="16" maxstacksizecharacterinventory="2" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="weldingtool,flamer" spawnprobability="1"/>
-    <PreferredContainer primary="engcab" minamount="4" maxamount="6" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" minamount="1" maxamount="3" spawnprobability="0.2"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05"/>
+    <PreferredContainer primary="engcab" minamount="8" maxamount="12" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" minamount="2" maxamount="6" spawnprobability="0.4"/>
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1"/>
     <PreferredContainer secondary="supplycab"/>
     <Price baseprice="120" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" minavailable="6" />
-      <Price storeidentifier="merchantcity" minavailable="7" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantengineering" minavailable="10" multiplier="0.9"/>
-      <Price storeidentifier="merchanttutorial" multiplier="0.5" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" minavailable="18" />
+      <Price storeidentifier="merchantcity" minavailable="21" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="45" />
+      <Price storeidentifier="merchantengineering" minavailable="10" multiplier="2.7"/>
+      <Price storeidentifier="merchanttutorial" multiplier="1.5" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -349,16 +349,16 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   
-  <Item name="" identifier="incendiumfueltank" category="Equipment,Fuel" health="200" maxstacksize="8" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="incendiumfueltank" category="Equipment,Fuel" health="200" maxstacksize="16" maxstacksizecharacterinventory="2" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="engcab" secondary="supplycab"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.02"/> 
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.04"/> 
     <Price baseprice="250" sold="false" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
       <Price storeidentifier="merchantcity" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
-      <Price storeidentifier="merchantmine" multiplier="1.4" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
+      <Price storeidentifier="merchantmine" multiplier="4.2" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -396,15 +396,15 @@
   </Item>
   <Item name="" identifier="extinguisher" category="Equipment" Tags="mediumitem,fireextinguisher,provocative" cargocontaineridentifier="metalcrate" description="" Scale="0.5" impactsoundtag="impact_metal_light" donttransferbetweensubs="true">
     <Upgrade gameversion="0.9.600.0" Tags="mediumitem,fireextinguisher,provocative" />
-    <PreferredContainer primary="extinguisherholder" spawnprobability="1.0"/>
-    <PreferredContainer primary="wreckextinguisherholder" spawnprobability="0.6"/>
+    <PreferredContainer primary="extinguisherholder" spawnprobability="1"/>
+    <PreferredContainer primary="wreckextinguisherholder" spawnprobability="1"/>
     <PreferredContainer secondary="engcab,reactorcab"/>
     <Price baseprice="100" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" minavailable="2" />
-      <Price storeidentifier="merchantmine" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" minavailable="6" />
+      <Price storeidentifier="merchantmine" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -419,12 +419,12 @@
     <Sprite texture="Content/Items/Tools/tools.png" depth="0.55" sourcerect="161,105,64,128" origin="0.5,0.5" />
     <Body width="30" height="100" density="8" />
     <Holdable slots="RightHand+LeftHand" controlpose="true" aimpos="40,-20" handle1="-6,10" handle2="-10,40" msg="ItemMsgPickUpSelect" />
-    <RepairTool extinguishamount="60.0" range="500" barrelpos="21,25" repairthroughholes="true" hititems="false" IgnoreCharacters="true">
+    <RepairTool extinguishamount="60.0" range="2000" barrelpos="21,25" repairthroughholes="true" hititems="false" IgnoreCharacters="true">
       <ParticleEmitter particle="extinguisher" velocitymin="1000.0" velocitymax="1650.0" particlespersecond="100" />
       <StatusEffect type="OnUse" targettype="This" Condition="-2.0" />
       <sound file="Content/Items/Tools/Extinguisher.ogg" type="OnUse" range="500.0" loop="true" />
     </RepairTool>
-    <RepairTool range="500" barrelpos="21,25" IgnoreCharacters="false">
+    <RepairTool range="2000" barrelpos="21,25" IgnoreCharacters="false">
       <!-- Remove 'burning' affliction from characters-->
       <StatusEffect type="OnUse" target="UseTarget">
         <ReduceAffliction identifier="burning" amount="15.0" />
@@ -437,14 +437,14 @@
 
   <Item name="" identifier="sprayer" category="Equipment" Tags="smallitem,tool,mountableweapon" cargocontaineridentifier="metalcrate" description="" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab" amount="2" spawnprobability="0.2"/>
     <Price baseprice="120">
-      <Price storeidentifier="merchantoutpost" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="128,256,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="373,165,124,73" depth="0.55" origin="0.5,0.5" />
@@ -487,27 +487,27 @@
       </PaintColors>
     </Sprayer>
     <!-- one welding fuel or oxygen tank can be contained inside the welding tool -->
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="8,-35" containedspritedepth="0.56" containedstateindicatorstyle="tank">
-      <Containable items="ethanol, paint" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" itempos="8,-35" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+      <Containable items="ethanol, paint,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="500" fadeouttime="3" />
   </Item>
   
   <Item name="" identifier="screwdriver" category="Equipment" Tags="smallitem,simpletool,tool,electricalrepairtool,screwdriveritem" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
     <PreferredContainer primary="engcab" secondary="reactorcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.2"/>  
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.5"/>
-    <PreferredContainer primary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="1" spawnprobability="0.5"/>   
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.3"/>
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.1" />
-    <Price baseprice="10" minavailable="10">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.4"/>  
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="1"/>
+    <PreferredContainer primary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="2" spawnprobability="1"/>   
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.6"/>
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.2" />
+    <Price baseprice="10" minavailable="30">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" minavailable="5"  />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" minavailable="15"  />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" minavailable="10" multiplier="0.9"/>
+      <Price storeidentifier="merchantengineering" minavailable="10" multiplier="2.7"/>
     </Price>
     <Deconstruct time="20">
       <Item identifier="iron" />
@@ -543,19 +543,19 @@
   </Item>
   
   <Item name="" identifier="wrench" category="Equipment" Tags="smallitem,tool,simpletool,mechanicalrepairtool,wrenchitem,mountableweapon,deattachtool" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.2"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.5"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.3"/>
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.1" />
-    <Price baseprice="20" minavailable="10">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.4"/>
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="1"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.6"/>
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.2" />
+    <Price baseprice="20" minavailable="30">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" minavailable="5" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" minavailable="15" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" minavailable="10" multiplier="0.9"/>
+      <Price storeidentifier="merchantengineering" minavailable="10" multiplier="2.7"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -586,16 +586,16 @@
   </Item>
   
   <Item name="" identifier="crowbar" category="Equipment" Tags="smallitem,tool,simpletool,dooropeningtool,crowbaritem,mountableweapon" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.2"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.2"/>
-    <Price baseprice="20" minavailable="10">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2"/>
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.4"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.4"/>
+    <Price baseprice="20" minavailable="30">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="45" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="10">
@@ -627,16 +627,16 @@
   </Item>
   
   <Item name="" identifier="handheldsonar" category="Equipment,Diving" Tags="smallitem,sonar,provocative" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light">
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer primary="divingcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,wreckdivingcab" amount="1" spawnprobability="0.05"/>
-    <Price baseprice="150" minavailable="1">
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer primary="divingcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,wreckdivingcab" amount="2" spawnprobability="0.1"/>
+    <Price baseprice="150" minavailable="3">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="copper" />
@@ -675,13 +675,13 @@
       <icon identifier="location" texture="Content/UI/MainIconsAtlas.png" sourcerect="349,435,11,11" origin="0.5,0.5"/>
       <icon identifier="mineral" texture="Content/UI/MainIconsAtlas.png" sourcerect="336,434,7,12" origin="0.5,0.5"/>
       <icon identifier="" texture="Content/UI/MainIconsAtlas.png" sourcerect="346,416,4,4" origin="0.5,0.5"/>
-      <LightComponent LightColor="120,255,120,255" range="25" powerconsumption="10" pulsefrequency="0.5" pulseamount="0.8" castshadows="false" IsOn="false" canbeselected="false">
+      <LightComponent LightColor="120,255,120,255" range="100" powerconsumption="10" pulsefrequency="0.5" pulseamount="0.8" castshadows="false" IsOn="false" canbeselected="false">
         <IsActive TargetItemComponent="Sonar" CurrentMode="Active"/>        
       </LightComponent>
     </Sonar>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <Containable items="mobilebattery">
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>
@@ -689,15 +689,15 @@
   </Item>
   
   <Item name="" identifier="sonarbeacon" category="Equipment,Diving" Tags="smallitem,sonar,provocative" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="divingcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,wreckdivingcab" amount="1" spawnprobability="0.05"/>
-    <Price baseprice="150" minavailable="1">
+    <PreferredContainer primary="divingcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,wreckdivingcab" amount="2" spawnprobability="0.1"/>
+    <Price baseprice="150" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="copper" />
@@ -713,7 +713,7 @@
     <Body width="27" height="60" density="12" />
     <Holdable slots="Any,RightHand,LeftHand" holdangle="30" handle1="0,-15" msg="ItemMsgPickUpSelect" />
     <AiTarget soundrange="50000" sonarlabel="entityname.sonarbeacon" sight="500" staticsight="true"/>
-    <LightComponent LightColor="0.0,1.0,0.0,1.0" range="50" powerconsumption="10" blinkfrequency="2" IsOn="false" canbeselected="false">
+    <LightComponent LightColor="0.0,1.0,0.0,1.0" range="200" powerconsumption="10" blinkfrequency="2" IsOn="false" canbeselected="false">
       <StatusEffect type="OnActive" targettype="Contained" Condition="-0.1">
         <RequiredItem items="mobilebattery" type="Contained" />
       </StatusEffect>
@@ -730,22 +730,22 @@
       </TickBox>
       <TextBox text="sonarbeacon.beaconsignal" propertyname="SonarLabel" maxtextlength="32"/>
     </CustomInterface>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <Containable items="mobilebattery">
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>
   </Item>
   <Item name="" identifier="flashlight" category="Equipment" Tags="smallitem,tool,provocative" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="divingcab" minamount="1" maxamount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.1"/>
-    <Price baseprice="200" minavailable="2">
+    <PreferredContainer primary="divingcab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.2"/>
+    <Price baseprice="200" minavailable="6">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="10">
@@ -765,18 +765,18 @@
         <RequiredItem items="mobilebattery" type="Contained" />
       </StatusEffect>
       <!-- the child LightComponent is only active when the Holdable is active, i.e. when the item is being held -->
-      <LightComponent LightColor="0.5,0.5,0.5,1.0" directional="true" Flicker="0.02" range="800" powerconsumption="10" IsOn="true">
+      <LightComponent LightColor="0.5,0.5,0.5,1.0" directional="true" Flicker="0.02" range="3200" powerconsumption="10" IsOn="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
         <IsActive targetcontaineditem="true" condition="gt 1.0"/>
       </LightComponent>
-      <LightComponent LightColor="0.5,0.5,0.5,1.0" directional="true" range="800" powerconsumption="10" IsOn="true" flicker="0.8" flickerspeed="1.0" pulsefrequency="0.1" pulseamount="0.5">
+      <LightComponent LightColor="0.5,0.5,0.5,1.0" directional="true" range="3200" powerconsumption="10" IsOn="true" flicker="0.8" flickerspeed="1.0" pulsefrequency="0.1" pulseamount="0.5">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
         <IsActive targetcontaineditem="true" condition="lte 1.0"/>
       </LightComponent>
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <Containable items="mobilebattery">
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>
@@ -784,17 +784,17 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   
-  <Item name="" identifier="flare" category="Equipment" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
-    <PreferredContainer primary="divingcab" minamount="2" maxamount="5" spawnprobability="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.1"/>
-    <Price baseprice="30" minavailable="6">
+  <Item name="" identifier="flare" category="Equipment" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
+    <PreferredContainer primary="divingcab" minamount="4" maxamount="10" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.2"/>
+    <Price baseprice="30" minavailable="18">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmine" minavailable="10" />
-      <Price storeidentifier="merchantarmory" multiplier="1.25" minavailable="8" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantmine" minavailable="30" />
+      <Price storeidentifier="merchantarmory" multiplier="3.75" minavailable="24" />
     </Price>
     <Deconstruct time="5"/>      
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="12">
@@ -805,7 +805,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="227,204,54,18" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="15" density="10"/>
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="90" throwforce="2.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,0.0,0.0,255" Flicker="0.5" range="600" IsOn="false">
+    <LightComponent LightColor="255,0.0,0.0,255" Flicker="0.5" range="2400" IsOn="false">
       <StatusEffect type="OnUse" targettype="This" IsOn="true" DontCleanUp="True">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
         <sound file="Content/Items/Tools/FlareIgnite.ogg" range="800.0" />
@@ -823,16 +823,16 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
     
-  <Item name="" identifier="alienflare" category="Equipment,Alien" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
+  <Item name="" identifier="alienflare" category="Equipment,Alien" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
     <PreferredContainer primary="divingcab"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.01"/>
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" minamount="1" maxamount="3" spawnprobability="0.2" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="1" maxamount="3" spawnprobability="0.3" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.02"/>
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" minamount="2" maxamount="6" spawnprobability="0.4" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="6" spawnprobability="0.6" />
     <Price baseprice="200" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="10">
@@ -843,7 +843,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="283,204,54,18" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="15" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="90" throwforce="2.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="0,162,232,255" Flicker="0.5" range="1000" IsOn="false">
+    <LightComponent LightColor="0,162,232,255" Flicker="0.5" range="4000" IsOn="false">
       <StatusEffect type="OnUse" targettype="This" IsOn="true" DontCleanUp="True">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
         <sound file="Content/Items/Tools/FlareIgnite.ogg" range="800.0" />
@@ -862,16 +862,16 @@
 
   <Item name="" identifier="flamer" category="Equipment" Tags="smallitem,weapon,gun,mountableweapon" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="0.2" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="0.4" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.2"/>
     <PreferredContainer secondary="armcab,weaponholder"/>
     <Price baseprice="105" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="1.25" minavailable="1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="3.75" minavailable="3" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantarmory" multiplier="1.25" minavailable="1" />
+      <Price storeidentifier="merchantarmory" multiplier="3.75" minavailable="3" />
     </Price>
     <!--<InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,64,64,64" />-->
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,64,64,64" />
@@ -891,7 +891,7 @@
     <Body width="150" height="77" density="25" />
     <!-- the character will hold the item 50 pixels in front of him, with his hands at the handle1 and handle2 positions -->
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="50,0" handle1="-62,-16" handle2="-11,-6" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="25.0" structurefixamount="0.0" usablein="Air" range="500" barrelpos="35,10" fireprobability="0.1" repairmultiple="true" RepairMultipleWalls="false" repairthroughwalls="false" repairthroughholes="true" combatpriority="50" spread="25" unskilledspread="25">
+    <RepairTool firedamage="25.0" structurefixamount="0.0" usablein="Air" range="2000" barrelpos="35,10" fireprobability="0.1" repairmultiple="true" RepairMultipleWalls="false" repairthroughwalls="true" repairthroughholes="true" combatpriority="50" spread="25" unskilledspread="25">
       <!-- the item must contain a welding fuel tank for it to work -->
       <RequiredItems items="weldingtoolfuel,oxygensource" type="Contained" msg="ItemMsgWeldingFuelRequired" />
       <RequiredSkill identifier="weapons" level="50" />
@@ -969,9 +969,9 @@
       </LightComponent>
     </RepairTool>
     <!-- one welding fuel or oxygen tank can be contained inside the welding tool -->
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="8,-20" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" itempos="8,-20" containedspritedepth="0.56" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="weldingtoolfuel,oxygensource" />
+      <Containable items="weldingtoolfuel,oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="5000" soundrange="500" fadeouttime="5" />
     <SkillRequirementHint identifier="weapons" level="50" />
@@ -979,16 +979,16 @@
 
   <Item name="" identifier="syringegun" category="Equipment,Medical,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,gun,mountableweapon" scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="armcab" amount="1" spawnprobability="0.2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="armcab" amount="2" spawnprobability="0.4" notcampaign="true" notpvp="true"/>
     <PreferredContainer secondary="secarmcab,weaponholder"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab,wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.05" />
-    <Price baseprice="190" minavailable="1">
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab,wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.1" />
+    <Price baseprice="190" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" sold="false" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" sold="false" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.75" />
       <Price storeidentifier="merchantmine" sold="false"/>
-      <Price storeidentifier="merchantmedical" multiplier="1.25" />
+      <Price storeidentifier="merchantmedical" multiplier="3.75" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -1012,35 +1012,35 @@
       <RequiredSkill identifier="weapons" level="20" />
       <RequiredSkill identifier="medical" level="30" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="4" itempos="0,25" itemrotation="-90" hideitems="false" containedstateindicatorstyle="syringe">
+    <ItemContainer capacity="1" maxstacksize="8" itempos="0,25" itemrotation="-90" hideitems="false" containedstateindicatorstyle="syringe">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
-      <Containable items="syringe" />
+      <Containable items="syringe,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="0" soundrange="0" />
     <SkillRequirementHint identifier="weapons" level="20" />
     <SkillRequirementHint identifier="medical" level="30" />
   </Item>
 
-  <Item name="" identifier="oxygentank" category="Diving,Equipment" health="200" maxstacksize="8" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,oxygensource,refillableoxygensource" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" allowdroppingonswap="true">
+  <Item name="" identifier="oxygentank" category="Diving,Equipment" health="200" maxstacksize="16" maxstacksizecharacterinventory="2" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,oxygensource,refillableoxygensource" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" allowdroppingonswap="true">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="10"/>
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantresearch" minavailable="10"/>
-      <Price storeidentifier="merchantmilitary" minavailable="10"/>
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" minavailable="30"/>
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="45" />
+      <Price storeidentifier="merchantresearch" minavailable="30"/>
+      <Price storeidentifier="merchantmilitary" minavailable="30"/>
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="60" />
     </Price>
-    <PreferredContainer secondary="respawncontainer" amount="8" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer primary="oxygentankcontainer" amount="3" spawnprobability="1"/>
+    <PreferredContainer secondary="respawncontainer" amount="16" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer primary="oxygentankcontainer" amount="6" spawnprobability="1"/>
     <PreferredContainer primary="oxygengenerator" maxcondition="75"/>
-    <PreferredContainer primary="divingmask,plasmacutter,deepdiving" spawnprobability="1.0" mincondition="25"/>
-    <PreferredContainer secondary="divingcab" minamount="3" maxamount="5" spawnprobability="1" mincondition="25" notcampaign="true"/>
-    <PreferredContainer secondary="supplycab" amount="1" spawnprobability="0.5" mincondition="25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="outpostsupplycab" minamount="1" maxamount="3" spawnprobability="0.5"/>
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.2"/>
-    <PreferredContainer secondary="wreckoxygentankcontainer" minamount="1" maxamount="3" spawnprobability="0.3"/>
-    <PreferredContainer secondary="outpostcrewcabinet" minamount="1" maxamount="3" spawnprobability="0.2"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="3" spawnprobability="0.1"/>
+    <PreferredContainer primary="divingmask,plasmacutter,deepdiving" spawnprobability="1" mincondition="25"/>
+    <PreferredContainer secondary="divingcab" minamount="6" maxamount="10" spawnprobability="1" mincondition="25" notcampaign="true"/>
+    <PreferredContainer secondary="supplycab" amount="2" spawnprobability="1" mincondition="25" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="outpostsupplycab" minamount="2" maxamount="6" spawnprobability="1"/>
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.4"/>
+    <PreferredContainer secondary="wreckoxygentankcontainer" minamount="2" maxamount="6" spawnprobability="0.6"/>
+    <PreferredContainer secondary="outpostcrewcabinet" minamount="2" maxamount="6" spawnprobability="0.4"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="6" spawnprobability="0.2"/>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
     </Deconstruct>
@@ -1069,18 +1069,18 @@
     </Quality>
   </Item>
 
-  <Item name="" identifier="oxygenitetank" category="Diving,Equipment" maxstacksize="8" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" health="400" Tags="smallitem,oxygensource" description="" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="oxygenitetank" category="Diving,Equipment" maxstacksize="16" maxstacksizecharacterinventory="2" MaxStackSizeHoldableOrWearableInventory="1" health="400" Tags="smallitem,oxygensource" description="" scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="175" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" sold="false" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="1"/>
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="3"/>
     </Price>
     <PreferredContainer primary="oxygentankcontainer"/>
-    <PreferredContainer secondary="wrecksupplycab" amount="1" spawnprobability="0.02"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wrecksupplycab" amount="2" spawnprobability="0.04"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.02"/>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
       <Item identifier="liquidoxygenite" mincondition="0.1" />
@@ -1117,20 +1117,20 @@
     </Quality>
   </Item>
 
-  <Item name="" identifier="fuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5">
+  <Item name="" identifier="fuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5">
     <PreferredContainer primary="reactorcab"/>
-    <PreferredContainer secondary="nucleargun" minamount="1" maxamount="1" spawnprobability="1"/>
-    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" minamount="1" maxamount="2" spawnprobability="0.5"/>
-    <PreferredContainer secondary="beaconengcab" amount="1" spawnprobability="0.2"/>
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.05"/>
-    <Price baseprice="150" displaynonempty="true" minavailable="2">
+    <PreferredContainer secondary="nucleargun" minamount="2" maxamount="2" spawnprobability="1"/>
+    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" minamount="2" maxamount="4" spawnprobability="1"/>
+    <PreferredContainer secondary="beaconengcab" amount="2" spawnprobability="0.4"/>
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.1"/>
+    <Price baseprice="150" displaynonempty="true" minavailable="6">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" minavailable="3" />
+      <Price storeidentifier="merchantcity" minavailable="9" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchanttutorial" multiplier="0.5" minavailable="3" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchanttutorial" multiplier="1.5" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1157,7 +1157,7 @@
       </StatusEffect>-->
     </Holdable>
     <ItemContainer hideitems="true" capacity="1" itemrotation="90" drawinventory="false" canbeselected="false" SpawnWithId="nucleargunbolt" removecontaineditemsondeconstruct="true" showcontainedstateindicator="false">
-      <Containable items="nucleargunbolt" />
+      <Containable items="nucleargunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-25.0" disabledeltatime="true">
         <SpawnItem identifiers="nucleargunbolt" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -1167,18 +1167,18 @@
     </Quality>
   </Item>
 
-  <Item name="" identifier="fulguriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="8" cargocontaineridentifier="metalcrate" health="150" scale="0.5">
+  <Item name="" identifier="fulguriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="16" cargocontaineridentifier="metalcrate" health="150" scale="0.5">
     <PreferredContainer primary="reactorcab" />
-    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="1" spawnprobability="0.2"/>
-    <PreferredContainer secondary="beaconengcab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="2" spawnprobability="0.4"/>
+    <PreferredContainer secondary="beaconengcab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.02"/>
     <Price baseprice="250" sold="false" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1201,7 +1201,7 @@
     <Body radius="6" height="55" density="20" />
     <Holdable handle1="0,0" slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect" />
     <ItemContainer hideitems="true" capacity="1" itemrotation="90" drawinventory="false" canbeselected="false" SpawnWithId="nucleargunbolt" removecontaineditemsondeconstruct="true" showcontainedstateindicator="false">
-      <Containable items="nucleargunbolt" />
+      <Containable items="nucleargunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-12.5" disabledeltatime="true">
         <SpawnItem identifiers="nucleargunbolt" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -1211,18 +1211,18 @@
     </Quality>
   </Item>
 
-  <Item name="" identifier="thoriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="8" cargocontaineridentifier="metalcrate" health="200" scale="0.5">
+  <Item name="" identifier="thoriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="16" cargocontaineridentifier="metalcrate" health="200" scale="0.5">
     <PreferredContainer primary="reactorcab" />
-    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="1" spawnprobability="0.1"/>
-    <PreferredContainer secondary="beaconengcab" amount="1" spawnprobability="0.02"/>
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="2" spawnprobability="0.2"/>
+    <PreferredContainer secondary="beaconengcab" amount="2" spawnprobability="0.04"/>
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.02"/>
     <Price baseprice="200" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" minavailable="1" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" minavailable="3" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1250,7 +1250,7 @@
       </StatusEffect>-->
     </Holdable>
     <ItemContainer hideitems="true" capacity="1" itemrotation="90" drawinventory="false" canbeselected="false" SpawnWithId="nucleargunbolt" removecontaineditemsondeconstruct="true" showcontainedstateindicator="false">
-      <Containable items="nucleargunbolt" />
+      <Containable items="nucleargunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-25.0" disabledeltatime="true">
         <SpawnItem identifiers="nucleargunbolt" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -1260,15 +1260,15 @@
     </Quality>
   </Item>
 
-  <redpaint name="" identifier="redpaint" category="Misc" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,0,0,255" InventoryIconColor="255,0,0,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <redpaint name="" identifier="redpaint" category="Misc" maxstacksize="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,0,0,255" InventoryIconColor="255,0,0,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="140" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="256,320,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="379,78,27,58" depth="0.6" origin="0.5,0.5" />
@@ -1294,15 +1294,15 @@
     </Throwable>
   </redpaint>
 
-  <greenpaint name="" identifier="greenpaint" category="Misc" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,128,0,255" InventoryIconColor="0,255,0,255" scale="0.5" impactsoundtag="impact_metal_light"  impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <greenpaint name="" identifier="greenpaint" category="Misc" maxstacksize="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,128,0,255" InventoryIconColor="0,255,0,255" scale="0.5" impactsoundtag="impact_metal_light"  impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="256,320,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="379,78,27,58" depth="0.6" origin="0.5,0.5" />
@@ -1328,15 +1328,15 @@
     </Throwable>
   </greenpaint>
 
-  <bluepaint name="" identifier="bluepaint" category="Misc" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,0,128,255" InventoryIconColor="0,0,255,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <bluepaint name="" identifier="bluepaint" category="Misc" maxstacksize="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,0,128,255" InventoryIconColor="0,0,255,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="256,320,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="379,78,27,58" depth="0.6" origin="0.5,0.5" />
@@ -1362,15 +1362,15 @@
     </Throwable>
   </bluepaint>
 
-  <blackpaint name="" identifier="blackpaint" category="Misc" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="20,20,20,255" InventoryIconColor="20,20,20,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <blackpaint name="" identifier="blackpaint" category="Misc" maxstacksize="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="20,20,20,255" InventoryIconColor="20,20,20,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="256,320,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="379,78,27,58" depth="0.6" origin="0.5,0.5" />
@@ -1396,15 +1396,15 @@
     </Throwable>
   </blackpaint>
 
-  <whitepaint name="" identifier="whitepaint" category="Misc" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,128,128,255" InventoryIconColor="128,128,128,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <whitepaint name="" identifier="whitepaint" category="Misc" maxstacksize="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,128,128,255" InventoryIconColor="128,128,128,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="256,320,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="379,78,27,58" depth="0.6" origin="0.5,0.5" />
@@ -1432,8 +1432,8 @@
   
   <Item name="" identifier="flamerunique" category="Equipment" Tags="smallitem,weapon,gun,mountableweapon" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
     <PreferredContainer primary="secarmcab" secondary="armcab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" spawnprobability="0.02"/>
-    <PreferredContainer secondary="wreckarmcab" spawnprobability="0.05"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" spawnprobability="0.04"/>
+    <PreferredContainer secondary="wreckarmcab" spawnprobability="0.1"/>
     <Price baseprice="755" sold="false" canbespecial="false" />
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="384,256,62,64" />
     <Sprite texture="Content/Items/Weapons/weapons_new.png" sourcerect="263,193,150,87" depth="0.55" origin="0.5,0.5" />
@@ -1443,7 +1443,7 @@
     </Deconstruct>
     <Body width="150" height="77" density="25" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="50,0" handle1="-55,-20" handle2="-15,-10" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="20.0" structurefixamount="0.0" range="500" barrelpos="35,10" fireprobability="0.0" repairmultiple="true" repairthroughwalls="false" repairthroughholes="true" combatpriority="60" spread="25" unskilledspread="25">
+    <RepairTool firedamage="20.0" structurefixamount="0.0" range="2000" barrelpos="35,10" fireprobability="0.0" repairmultiple="true" repairthroughwalls="true" repairthroughholes="true" combatpriority="60" spread="25" unskilledspread="25">
       <RequiredItems items="weldingtoolfuel,oxygensource" type="Contained" msg="ItemMsgWeldingFuelRequired" />
       <RequiredSkill identifier="weapons" level="40" />
       <ParticleEmitterHitCharacter particle="fleshsmoke" particlespersecond="3" anglemin="265" anglemax="275" velocitymin="0" velocitymax="50" />
@@ -1494,24 +1494,24 @@
         <Affliction identifier="burn" strength="5.0" probability="0.5"/>
       </StatusEffect>
     </RepairTool>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="11,-15" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" itempos="11,-15" containedspritedepth="0.56" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="weldingtoolfuel,oxygensource" />
+      <Containable items="weldingtoolfuel,oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="5000" soundrange="500" fadeouttime="5" />
     <SkillRequirementHint identifier="weapons" level="40" />
   </Item>
 
-  <Item name="" identifier="glowstick" category="Equipment" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
-    <PreferredContainer primary="divingcab" minamount="3" maxamount="5" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.1"/>
-    <Price baseprice="45" minavailable="6" displaynonempty="true">
+  <Item name="" identifier="glowstick" category="Equipment" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
+    <PreferredContainer primary="divingcab" minamount="6" maxamount="10" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.2"/>
+    <Price baseprice="45" minavailable="18" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmine" minavailable="10" />
-      <Price storeidentifier="merchantarmory" multiplier="1.25" minavailable="8" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantmine" minavailable="30" />
+      <Price storeidentifier="merchantarmory" multiplier="3.75" minavailable="24" />
     </Price>
     <Deconstruct time="5"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="4">
@@ -1522,7 +1522,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="278,157,50,9" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="9" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="90" throwforce="2.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="50,255,50,255" Flicker="0.0" range="400" IsOn="false">
+    <LightComponent LightColor="50,255,50,255" Flicker="0.0" range="1600" IsOn="false">
       <sprite texture="Content/Items/Tools/tools.png" sourcerect="374,140,62,20" alpha="1.0" origin="0.5,0.5" />
       <StatusEffect type="OnUse" targettype="This" IsOn="true" DontCleanUp="True">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
diff --git a/Content/Items/Weapons/chaingun.xml b/Content/Items/Weapons/chaingun.xml
index 2ba8fe88..d6df5665 100644
--- a/Content/Items/Weapons/chaingun.xml
+++ b/Content/Items/Weapons/chaingun.xml
@@ -30,7 +30,7 @@
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <ChargeSound file="Content/Items/Weapons/CHAINGUN_chargeUp_loop.ogg" volume="2" range="10000"/>
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0,0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashchaingun" particleamount="1" velocitymin="0" velocitymax="0" distancemin="-50" distancemax="-50" />
@@ -82,9 +82,9 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="75,-270" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="6" itempos="75,-270" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.18,0.23" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="chaingunammo" />
+      <Containable items="chaingunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!-- when the chaingun is fired, it triggers this statuseffect, causing contained ammunition boxes to spawn new ammo -->
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="chaingunammo" type="Contained" />
@@ -98,27 +98,27 @@
       <output name="contained_conditions" displayname="connection.ammunitionout" />
     </ConnectionPanel>
 
-    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.685,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 0"/>
     </LightComponent>
-    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.135,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 20"/>
     </LightComponent>
-    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.585,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 40"/>
     </LightComponent>
-    <LightComponent lightcolor="252,230,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="252,230,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.035,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 60"/>
     </LightComponent>
-    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-0.515,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 80"/>
     </LightComponent>
-    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-1.065,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gte 100"/>
     </LightComponent>
@@ -215,18 +215,18 @@
   </Item>
 
   <Item name="" identifier="chaingunammobox" scale="0.5" tags="chaingunequipment,chaingunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
-    <PreferredContainer primary="chaingunammosource" amount="1" mincondition="1"/>
+    <PreferredContainer primary="chaingunammosource" amount="2" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
     <!--Ensure that Thalamus always has at least one ammo box to use-->
-    <PreferredContainer secondary="wreckchaingunloader" amount="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.2"/>
-    <Price baseprice="180" minavailable="1" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false"/>
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+    <PreferredContainer secondary="wreckchaingunloader" amount="2" />
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.4"/>
+    <Price baseprice="180" minavailable="3" displaynonempty="true">
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false"/>
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -254,21 +254,21 @@
       <StatusEffect type="OnUse" target="This" condition="-0.20" disabledeltatime="true">
         <RequiredItem items="chaingunbolt" type="Contained" />
       </StatusEffect>
-      <Containable items="chaingunbolt" />
+      <Containable items="chaingunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
   <Item name="" identifier="chaingunammoboxphysicorium" fallbacknameidentifier="chaingunammobox" scale="0.5" tags="chaingunequipment,chaingunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="chaingunammosource,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckchaingunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckchaingunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="410" sold="false" displaynonempty="true" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3"/>
-      <Price storeidentifier="merchantcity" multiplier="1.2"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.3"/>
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1"/>
-      <Price storeidentifier="merchantmine" multiplier="1.2"/>
-      <Price storeidentifier="merchantarmory" sold="true"  multiplier="0.9" minavailable="1"/>
+      <Price storeidentifier="merchantoutpost" multiplier="3.9"/>
+      <Price storeidentifier="merchantcity" multiplier="3.6"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.9"/>
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="3"/>
+      <Price storeidentifier="merchantmine" multiplier="3.6"/>
+      <Price storeidentifier="merchantarmory" sold="true"  multiplier="2.7" minavailable="3"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="physicorium" mincondition="0.95" />
@@ -299,21 +299,21 @@
       <StatusEffect type="OnUse" target="This" condition="-0.20" disabledeltatime="true">
         <RequiredItem items="chaingunboltphysicorium" type="Contained" />
       </StatusEffect>
-      <Containable items="chaingunboltphysicorium" />
+      <Containable items="chaingunboltphysicorium,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
   <Item name="" identifier="chaingunammoboxshredder" scale="0.5" tags="chaingunequipment,chaingunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="chaingunammosource,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckchaingunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckchaingunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="300" minavailable="0" displaynonempty="true" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false"/>
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false"/>
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -343,7 +343,7 @@
       <StatusEffect type="OnUse" target="This" condition="-0.25" disabledeltatime="true">
         <RequiredItem items="chaingunboltshredder" type="Contained" />
       </StatusEffect>
-      <Containable items="chaingunboltshredder" />
+      <Containable items="chaingunboltshredder,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
diff --git a/Content/Items/Weapons/coilgun.xml b/Content/Items/Weapons/coilgun.xml
index 68a3a2e6..8a4694ed 100644
--- a/Content/Items/Weapons/coilgun.xml
+++ b/Content/Items/Weapons/coilgun.xml
@@ -29,7 +29,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0,0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashcoilgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -77,7 +77,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0,0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashcoilgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -126,9 +126,9 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="82,-270" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="6" itempos="82,-270" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.18,0.23" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="coilgunammo" />
+      <Containable items="coilgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!-- when the coilgun is fired, it triggers this statuseffect, causing contained ammunition boxes to spawn new ammo -->
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="coilgunammo" type="Contained" />
@@ -142,27 +142,27 @@
       <output name="contained_conditions" displayname="connection.ammunitionout" />
     </ConnectionPanel>
     
-    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.685,-4.79" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 0"/>
     </LightComponent>
-    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.135,-4.79" alpha="1.0" />       
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 20"/>
     </LightComponent>
-    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.585,-4.79" alpha="1.0" />   
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 40"/>
     </LightComponent>
-    <LightComponent lightcolor="252,230,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="252,230,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.035,-4.79" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 60"/>
     </LightComponent>
-    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-0.515,-4.79" alpha="1.0" />       
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 80"/>
     </LightComponent>
-    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-1.065,-4.79" alpha="1.0" />     
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gte 100"/>
     </LightComponent>
@@ -283,18 +283,18 @@
   </Item>
 
   <Item name="" identifier="coilgunammobox" scale="0.5" tags="coilgunequipment,coilgunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
-    <PreferredContainer primary="coilgunammoloader" amount="2" mincondition="1"/>
-    <PreferredContainer primary="ammoboxcontainer" amount="2" mincondition="1"/>
+    <PreferredContainer primary="coilgunammoloader" amount="4" mincondition="1"/>
+    <PreferredContainer primary="ammoboxcontainer" amount="4" mincondition="1"/>
     <!--Ensure that Thalamus always has at least one coilgun ammo box to use-->
-    <PreferredContainer secondary="wreckcoilgunloader" amount="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.5"/>
+    <PreferredContainer secondary="wreckcoilgunloader" amount="2" />
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="1"/>
     <Price baseprice="120" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="3"/>
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="6" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="3"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="15"/>
-      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="3"/>
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="15"/>
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="9"/>
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="18" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="9"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="45"/>
+      <Price storeidentifier="merchantmine" multiplier="3.6" minavailable="9"/>
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="45"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium"/>
@@ -315,7 +315,7 @@
     <Holdable canbecombined="true" removeoncombined="false" slots="RightHand,LeftHand" holdpos="0,-30" handle1="0,-30" aimable="false" msg="ItemMsgPickUpSelect">
       <StatValue stattype="MovementSpeed" value="-0.2" />
     </Holdable>
-    <ItemContainer hideitems="true" capacity="2" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
+    <ItemContainer hideitems="true" capacity="4" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
       <!-- we cheat a bit with ammunition boxes - they don't actually contain hundreds of rounds, 
       but spawn a new round every time the OnUse effect is triggered. OnUse also reduces the condition
       of the item, and when the condition is 0, the box is considered empty. -->
@@ -326,20 +326,20 @@
       <StatusEffect type="OnUse" target="This" condition="-0.5" disabledeltatime="true">
         <RequiredItem items="coilgunbolt" type="Contained" />
       </StatusEffect>
-      <Containable items="coilgunbolt" />
+      <Containable items="coilgunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="physicoriumammobox" scale="0.5" tags="coilgunequipment,coilgunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="coilgunammoloader,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckcoilgunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckcoilgunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="330" sold="false" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.2"/>
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.6"/>
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20">
       <RequiredSkill identifier="weapons" level="40"/>
@@ -363,7 +363,7 @@
     <Holdable canbecombined="true" removeoncombined="false" slots="RightHand,LeftHand" holdpos="0,-30" handle1="0,-30" aimable="false" msg="ItemMsgPickUpSelect">
       <StatValue stattype="MovementSpeed" value="-0.2" />
     </Holdable>
-    <ItemContainer hideitems="true" capacity="2" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
+    <ItemContainer hideitems="true" capacity="4" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
       <!-- we cheat a bit with ammunition boxes - they don't actually contain hundreds of rounds, 
       but spawn a new round every time the OnUse effect is triggered. OnUse also reduces the condition
       of the item, and when the condition is 0, the box is considered empty. -->
@@ -374,20 +374,20 @@
       <StatusEffect type="OnUse" target="This" condition="-0.5" disabledeltatime="true">
         <RequiredItem items="physicoriumbolt" type="Contained" />
       </StatusEffect>
-      <Containable items="physicoriumbolt" />
+      <Containable items="physicoriumbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="coilgunammoboxexplosive" scale="0.5" tags="coilgunequipment,coilgunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="coilgunammoloader,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckcoilgunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckcoilgunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="350" sold="false" displaynonempty="true" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" maxavailable="2" minleveldifficulty="5"/>
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" maxavailable="2" minleveldifficulty="5" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" maxavailable="2" minleveldifficulty="5"/>
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" maxavailable="2" minleveldifficulty="5" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="sodium" mincondition="0.95" />
@@ -411,7 +411,7 @@
     <Holdable canbecombined="true" removeoncombined="false" slots="RightHand,LeftHand" holdpos="0,-30" handle1="0,-30" aimable="false" msg="ItemMsgPickUpSelect">
       <StatValue stattype="MovementSpeed" value="-0.2" />
     </Holdable>
-    <ItemContainer hideitems="true" capacity="2" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
+    <ItemContainer hideitems="true" capacity="4" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
       <!-- we cheat a bit with ammunition boxes - they don't actually contain hundreds of rounds, 
       but spawn a new round every time the OnUse effect is triggered. OnUse also reduces the condition
       of the item, and when the condition is 0, the box is considered empty. -->
@@ -422,20 +422,20 @@
       <StatusEffect type="OnUse" target="This" condition="-1.0" disabledeltatime="true">
         <RequiredItem items="coilgunboltexplosive" type="Contained" />
       </StatusEffect>
-      <Containable items="coilgunboltexplosive" />
+      <Containable items="coilgunboltexplosive,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="coilgunammoboxpiercing" scale="0.5" tags="coilgunequipment,coilgunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="coilgunammoloader,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckcoilgunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckcoilgunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="260" displaynonempty="true" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false"/>
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" minleveldifficulty="5"/>
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="8" minleveldifficulty="5"/>
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" sold="false"/>
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" minleveldifficulty="5"/>
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="24" minleveldifficulty="5"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium"/>
@@ -458,7 +458,7 @@
     <Holdable canbecombined="true" removeoncombined="false" slots="RightHand,LeftHand" holdpos="0,-30" handle1="0,-30" aimable="false" msg="ItemMsgPickUpSelect">
       <StatValue stattype="MovementSpeed" value="-0.2" />
     </Holdable>
-    <ItemContainer hideitems="true" capacity="2" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
+    <ItemContainer hideitems="true" capacity="4" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
       <!-- we cheat a bit with ammunition boxes - they don't actually contain hundreds of rounds, 
       but spawn a new round every time the OnUse effect is triggered. OnUse also reduces the condition
       of the item, and when the condition is 0, the box is considered empty. -->
@@ -469,20 +469,20 @@
       <StatusEffect type="OnUse" target="This" condition="-0.67" disabledeltatime="true">
         <RequiredItem items="coilgunboltpiercing" type="Contained" />
       </StatusEffect>
-      <Containable items="coilgunboltpiercing" />
+      <Containable items="coilgunboltpiercing,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   
   <Item name="" identifier="coilgunharpoonbox" scale="0.5" tags="coilgunequipment,coilgunammo,ammobox,noammobelt" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="coilgunammoloader,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckcoilgunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckcoilgunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="120" displaynonempty="true">
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="2"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3"/>
-      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="2"/>
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3"/>
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="6"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9"/>
+      <Price storeidentifier="merchantmine" multiplier="3.6" minavailable="6"/>
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9"/>
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20">
       <RequiredSkill identifier="weapons" level="25"/>
@@ -505,7 +505,7 @@
     <Holdable canbecombined="true" removeoncombined="false" slots="RightHand,LeftHand" holdpos="0,-30" handle1="0,-30" aimable="false" msg="ItemMsgPickUpSelect">
       <StatValue stattype="MovementSpeed" value="-0.2" />
     </Holdable>
-    <ItemContainer hideitems="true" capacity="2" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
+    <ItemContainer hideitems="true" capacity="4" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
       <!--  -35 per usage = 3 shots per box -->
       <StatusEffect type="OnUse" target="This" disabledeltatime="true">
         <SpawnItem identifiers="coilgunharpoon" spawnposition="ThisInventory" />
@@ -513,7 +513,7 @@
       <StatusEffect type="OnUse" target="This" condition="-35" disabledeltatime="true">
         <RequiredItem items="coilgunharpoon" type="Contained" />
       </StatusEffect>
-      <Containable items="coilgunharpoon" />
+      <Containable items="coilgunharpoon,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
diff --git a/Content/Items/Weapons/depthcharge.xml b/Content/Items/Weapons/depthcharge.xml
index b327d6f2..bdf64b4c 100644
--- a/Content/Items/Weapons/depthcharge.xml
+++ b/Content/Items/Weapons/depthcharge.xml
@@ -16,11 +16,11 @@
       <ItemContainer canbepicked="true" pickkey="Use" />
     </Upgrade>
     <Sprite texture="TurretsAndDepthCharges.png" depth="0.8" sourcerect="354,2,125,188" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" autointeractwithcontained="true" autointeractwithcontainedtags="autointeractabledepthchargeammo" drawinventory="true" capacity="1" maxstacksize="1" itempos="62,-117" itemrotation="-90" 
+    <ItemContainer hideitems="false" autointeractwithcontained="true" autointeractwithcontainedtags="autointeractabledepthchargeammo" drawinventory="true" capacity="1" maxstacksize="2" itempos="62,-117" itemrotation="-90" 
                    canbeselected="true" canbepicked="true" pickkey="Use" msg="ItemMsgInteractSelect">
       <!-- the loader can't be "picked" in the sense of picking it up, the picking action is just defined to relay the Use input to the contained boarding pod -->
       <GuiFrame relativesize="0.18,0.23" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="depthchargeammo" />
+      <Containable items="depthchargeammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -32,12 +32,12 @@
   <Item name="" identifier="depthchargeshell" tags="depthchargeammo,demolitionsexpert" category="Weapon" sonarsize="5" scale="0.4" impactsoundtag="impact_metal_heavy" damagedbymonsters="true" damagedbyexplosions="true" damagedbyrepairtools="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" indestructible="true" health="10" cargocontaineridentifier="">
     <Upgrade gameversion="0.20.4.0" scale="0.4"/>
     <PreferredContainer primary="depthchargeloader" secondary="ammoboxcontainer" />
-    <Price baseprice="120" minavailable="1">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+    <Price baseprice="120" minavailable="3">
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -82,10 +82,10 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="2" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem,explosive" />
+      <Containable items="smallitem,explosive,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Quality>
       <QualityStat stattype="ExplosionRadius" value="0.1"/>
@@ -97,11 +97,11 @@
     <Upgrade gameversion="0.20.4.0" scale="0.4"/>
     <PreferredContainer primary="depthchargeloader" secondary="ammoboxcontainer" />
     <Price baseprice="450" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.35" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.05" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="iron" />
@@ -160,10 +160,10 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="2" canbeselected="false">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" containedstateindicatorstyle="explosive" containedspritedepth="0.81" />
-      <Containable items="smallitem,explosive" />
+      <Containable items="smallitem,explosive,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Quality>
       <QualityStat stattype="ExplosionRadius" value="0.1"/>
@@ -196,12 +196,12 @@
   <Item name="" identifier="depthdecoyshell" tags="depthchargeammo,decoy" category="Weapon" sonarsize="5" scale="0.4" impactsoundtag="impact_metal_heavy" damagedbymonsters="true" damagedbyexplosions="true" damagedbyrepairtools="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" health="200" indestructible="true" cargocontaineridentifier="">
     <Upgrade gameversion="0.20.4.0" scale="0.4"/>
     <PreferredContainer primary="depthchargeloader" secondary="ammoboxcontainer" />
-    <Price baseprice="180" minavailable="2">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
+    <Price baseprice="180" minavailable="6">
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -240,15 +240,15 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent LightColor="0,255,100,200" PulseFrequency="1.0" PulseAmount="0.8" Flicker="0.3" FlickerSpeed="3.0" range="700" PowerConsumption="0" IsOn="false">
+    <LightComponent LightColor="0,255,100,200" PulseFrequency="1.0" PulseAmount="0.8" Flicker="0.3" FlickerSpeed="3.0" range="2800" PowerConsumption="0" IsOn="false">
       <LightTexture texture="Content/Lights/pointlight_falloff.png" />
       <Sound file="Content/Items/Weapons/SonarDecoy.ogg" type="OnActive" range="20000" loop="true" dontmuffle="true" />
       <StatusEffect type="OnActive" target="This" setvalue="true" soundrange="10000" sightrange="6000"/>
     </LightComponent>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="2" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem,explosive" />
+      <Containable items="smallitem,explosive,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Quality>
       <QualityStat stattype="ExplosionRadius" value="0.1"/>
@@ -260,11 +260,11 @@
     <Upgrade gameversion="0.20.4.0" scale="0.4"/>
     <PreferredContainer primary="depthchargeloader" secondary="ammoboxcontainer" />
     <Price baseprice="590" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.35" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.05" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="iron" />
@@ -324,15 +324,15 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent LightColor="0,255,100,200" PulseFrequency="1.0" PulseAmount="0.8" Flicker="0.3" FlickerSpeed="3.0" range="700" PowerConsumption="0" IsOn="false">
+    <LightComponent LightColor="0,255,100,200" PulseFrequency="1.0" PulseAmount="0.8" Flicker="0.3" FlickerSpeed="3.0" range="2800" PowerConsumption="0" IsOn="false">
       <LightTexture texture="Content/Lights/pointlight_falloff.png" />
       <Sound file="Content/Items/Weapons/SonarDecoy.ogg" type="OnActive" range="20000" loop="true" dontmuffle="true" />
       <StatusEffect type="OnActive" target="This" setvalue="true" soundrange="10000" sightrange="6000"/>
     </LightComponent>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="2" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem,explosive" />
+      <Containable items="smallitem,explosive,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Quality>
       <QualityStat stattype="ExplosionRadius" value="0.1"/>
@@ -363,8 +363,8 @@
   <Item name="" identifier="boardingpod" tags="depthchargeammo,autointeractabledepthchargeammo" showcontentsintooltip="true" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="" AllowDeselectWhenIdling="false">
     <PreferredContainer primary="depthchargeloader" />
     <Price baseprice="170" sold="false">
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" minavailable="18" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -412,9 +412,9 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="2" canbeselected="false">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem" />
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Controller UserPos="0,-20" direction="Right" canbeselected="true" AllowSelectingWhenSelectedByBot="false" AllowSelectingWhenSelectedByOther="false" selectkey="Use" drawuserbehind="true" forceusertostayattached="true" msg="itemmsggoinside">
       <limbposition limb="Head" position="74,-40" />
@@ -428,11 +428,11 @@
       <limbposition limb="LeftFoot" position="74,-40" />
       <StatusEffect type="OnActive" targettype="Character" delay="0.25" stackable="true" indetectable="true" DisableFocusingOnEntities="true" invisibletimer="0.1" IgnoreMeleeWeapons="true" PressureProtection="6500.0" setvalue="true" />
       <!-- child of the Controller = active when someone's using it -->
-      <LightComponent range="100" PowerConsumption="0" lightcolor="150,255,150,0" blinkfrequency="1" AllowInGameEditing="false" IsOn="true">
+      <LightComponent range="400" PowerConsumption="0" lightcolor="150,255,150,0" blinkfrequency="1" AllowInGameEditing="false" IsOn="true">
         <Sprite texture="Content/Items/Weapons/TurretsAndDepthCharges.png" sourcerect="700,55,33,30" depth="0.54" origin="2.1,0.5" alpha="1.0" />
         <IsActiveConditional ContainerIdentifier="! depthchargeloader"/>
       </LightComponent>
-      <LightComponent range="100" PowerConsumption="0" lightcolor="150,255,150,0" blinkfrequency="1" AllowInGameEditing="false" IsOn="true">
+      <LightComponent range="400" PowerConsumption="0" lightcolor="150,255,150,0" blinkfrequency="1" AllowInGameEditing="false" IsOn="true">
         <Sprite texture="Content/Items/Weapons/TurretsAndDepthCharges.png" sourcerect="700,55,33,30" depth="0.54" origin="0.5,0.0" alpha="1.0" />
         <IsActiveConditional ContainerIdentifier="depthchargeloader"/>
       </LightComponent>
diff --git a/Content/Items/Weapons/explosives.xml b/Content/Items/Weapons/explosives.xml
index fee93185..77b6c4e0 100644
--- a/Content/Items/Weapons/explosives.xml
+++ b/Content/Items/Weapons/explosives.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="uex" category="Weapon" description="" Scale="0.5" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
+  <Item name="" identifier="uex" category="Weapon" description="" Scale="0.5" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.2"/>
     <PreferredContainer secondary="armcab"/>
-    <Price baseprice="95" minavailable="4" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
+    <Price baseprice="95" minavailable="12" minleveldifficulty="5">
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minleveldifficulty="0" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minleveldifficulty="0" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20">
       <RequiredSkill identifier="weapons" level="50" />
@@ -45,18 +45,18 @@
     </Quality>
   </Item>
   
-  <Item name="" identifier="c4block" category="Weapon" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="32" maxstacksizecharacterinventory="8" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
+  <Item name="" identifier="c4block" category="Weapon" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="64" maxstacksizecharacterinventory="16" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.05"/>
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.1"/>
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="160">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false"/>
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.2"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" sold="false"/>
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20">
       <RequiredSkill identifier="weapons" level="70" />
@@ -90,17 +90,17 @@
     </Quality>
   </Item>
   
-  <Item name="" identifier="compoundn" category="Weapon,Material" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="32" maxstacksizecharacterinventory="8" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
+  <Item name="" identifier="compoundn" category="Weapon,Material" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="64" maxstacksizecharacterinventory="16" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.02"/>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false"/>
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.2"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" sold="false"/>
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="12" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="20">
       <RequiredSkill identifier="medical" level="60" />
@@ -136,15 +136,15 @@
     </Quality>
   </Item>
   
-  <Item name="" identifier="volatilecompoundn" category="Weapon,Material" Tags="smallitem,explosive,demolitionsexpert" impacttolerance="2" maxstacksize="32" maxstacksizecharacterinventory="8" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
+  <Item name="" identifier="volatilecompoundn" category="Weapon,Material" Tags="smallitem,explosive,demolitionsexpert" impacttolerance="2" maxstacksize="64" maxstacksizecharacterinventory="16" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.02"/>
     <Price baseprice="250" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
       <Price storeidentifier="merchantmine" sold="false" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="20">
@@ -182,18 +182,18 @@
     </Quality>
   </Item>
   
-  <Item name="" identifier="ic4block" description="" category="Weapon" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="32" maxstacksizecharacterinventory="8" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
+  <Item name="" identifier="ic4block" description="" category="Weapon" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="64" maxstacksizecharacterinventory="16" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.02"/>
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.04"/>
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="400" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25"/>
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.75"/>
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="3" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" minavailable="3" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="960,69,64,56" origin="0.5,0.5" />
     <Sprite texture="weapons_new.png" depth="0.55" sourcerect="204,476,50,34" origin="0.5,0.5" />
@@ -232,17 +232,17 @@
   
   <Item name="" identifier="detonator" description="" health="30" category="Equipment,Weapon" Tags="smallitem,detonator" DamagedByContainedItemExplosions="true" explosiondamagemultiplier="0.3" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light" isshootable="true">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.05"/>
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.1"/>
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="100">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false"/>
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" sold="false"/>
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantengineering" multiplier="1.2" minavailable="1" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantengineering" multiplier="3.6" minavailable="3" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,64,64,64" origin="0.5,0.5" />
     <Sprite texture="weapons_new.png" depth="0.55" sourcerect="215,242,41,21" origin="0.5,0.5" />
@@ -260,12 +260,12 @@
     <Holdable selectkey="Action" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
     </Holdable>
-    <ItemContainer canbeselected="true" capacity="1" maxstacksize="1" itempos="20,-11" hideitems="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer canbeselected="true" capacity="1" maxstacksize="2" itempos="20,-11" hideitems="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.11,0.17" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="explosive" />
+      <Containable items="explosive,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
-    <LightComponent LightColor="248,81,81,80" range="20" powerconsumption="0" IsOn="false" blinkfrequency="4.0" offset="13,0" castshadows="false" allowingameediting="false">
+    <LightComponent LightColor="248,81,81,80" range="80" powerconsumption="0" IsOn="false" blinkfrequency="4.0" offset="13,0" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/weapons_new.png" depth="0.55" sourcerect="239,243,14,18" origin="-0.24,0.5" alpha="1.0"/>
       <StatusEffect type="Always" target="This" IsOn="false" checkconditionalalways="true">
         <Conditional attached="false" targetitemcomponentname="Holdable"/>
@@ -292,17 +292,17 @@
   </Item>
 
   <Item identifier="timeddetonator" health="30" description="" category="Equipment,Weapon" Tags="smallitem,detonator" DamagedByContainedItemExplosions="true" explosiondamagemultiplier="0.3" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light" isshootable="true">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="0.2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.02"/>
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="110" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="6" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantengineering" sold="true" multiplier="1.2" minavailable="1" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantengineering" sold="true" multiplier="3.6" minavailable="3" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,64,64,64" origin="0.5,0.5" /><!-- TODO new InventoryIcon and Sprite-->
     <Sprite texture="weapons_new.png" depth="0.55" sourcerect="215,242,41,21" origin="0.5,0.5" />
@@ -317,22 +317,22 @@
     </Deconstruct>
     <Body width="40" height="22" density="20" />
     <Holdable selectkey="Action" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
-      <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
+      <RequiredItem items="wrench,deattachtool" type="Equipped" />
       <StatusEffect target="This" type="Always">
         <Conditional attached="false" targetitemcomponentname="Holdable"/>
         <Use />
       </StatusEffect>
     </Holdable>
-    <ItemContainer canbeselected="true" capacity="1" maxstacksize="1" itempos="20,-11" hideitems="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer canbeselected="true" capacity="1" maxstacksize="2" itempos="20,-11" hideitems="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.11,0.17" anchor="CenterLeft" pivot="BottomLeft" relativeoffset="0.006,0.016" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="explosive">
+      <Containable items="explosive,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnRemoved" target="This" targetitemcomponent="LightComponent" blinkfrequency="1.0" IsOn="false" setvalue="true"/>    
       </Containable>
     </ItemContainer>
-    <PowerContainer capacity="60" Charge="8" canbeselected="false">
+    <PowerContainer capacity="132" Charge="8" canbeselected="false">
     </PowerContainer>
-    <LightComponent LightColor="248,81,81,80" range="20" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="13,0" castshadows="false" allowingameediting="false">
+    <LightComponent LightColor="248,81,81,80" range="80" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="13,0" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/weapons_new.png" depth="0.55" sourcerect="239,243,14,18" origin="-0.24,0.5" alpha="1.0"/>
       <!-- Detonator active, do the countdown -->
       <StatusEffect type="OnActive" target="This" targetitemcomponent="PowerContainer" Charge="-1.0" interval="1" disabledeltatime="true" CheckConditionalAlways="true">
@@ -368,16 +368,16 @@
     </ConnectionPanel>
   </Item>
   
-  <Item name="" identifier="nitroglycerin" category="Material,Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" description="" spritecolor="1.0,1.0,1.0,1.0" containercolor="1.0,1.0,1.0,1.0" cargocontaineridentifier="explosivecrate" Tags="smallitem,chem,explosive" impacttolerance="6" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="nitroglycerin" category="Material,Weapon" maxstacksize="64" maxstacksizecharacterinventory="16" description="" spritecolor="1.0,1.0,1.0,1.0" containercolor="1.0,1.0,1.0,1.0" cargocontaineridentifier="explosivecrate" Tags="smallitem,chem,explosive" impacttolerance="6" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.02"/>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false"/>
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" sold="false"/>
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="12" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="640,768,64,64" origin="0.5,0.5" />
     <Sprite texture="weapons_new.png" sourcerect="110,414,31,62" depth="0.55" origin="0.5,0.5" />
@@ -406,7 +406,7 @@
 
   <Item name="" identifier="volatilenitroglycerin" variantof="nitroglycerin" Tags="smallitem" impacttolerance="3">
     <PreferredContainer />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0"/>
     <Price sold="false" />
     <Throwable>
       <!-- inherited -->
diff --git a/Content/Items/Weapons/flakcannon.xml b/Content/Items/Weapons/flakcannon.xml
index 782d93de..e05e52f0 100644
--- a/Content/Items/Weapons/flakcannon.xml
+++ b/Content/Items/Weapons/flakcannon.xml
@@ -28,7 +28,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0,0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashflakcannon" particleamount="1" velocitymin="50" velocitymax="100" distance="-20" />
@@ -73,9 +73,9 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="75,-258" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="6" itempos="75,-258" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.18,0.23" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="flakcannonammo" />
+      <Containable items="flakcannonammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="flakcannonammo" type="Contained" />
         <Use />
@@ -88,27 +88,27 @@
       <output name="contained_conditions" displayname="connection.ammunitionout" />
     </ConnectionPanel>
 
-    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.685,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 0"/>
     </LightComponent>
-    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.135,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 20"/>
     </LightComponent>
-    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.585,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 40"/>
     </LightComponent>
-    <LightComponent lightcolor="252,230,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="252,230,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.035,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 60"/>
     </LightComponent>
-    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-0.515,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 80"/>
     </LightComponent>
-    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-1.065,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gte 100"/>
     </LightComponent>
@@ -176,17 +176,17 @@
   </Item>
   
   <Item name="" identifier="flakcannonammobox" scale="0.5" tags="flakcannonequipment,flakcannonammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
-    <PreferredContainer primary="flakcannonammoloader" amount="1" mincondition="1"/>
+    <PreferredContainer primary="flakcannonammoloader" amount="2" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckflakcannonloader" amount="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckflakcannonloader" amount="2" />
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="160" displaynonempty="true" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="6" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="15" minleveldifficulty="10"/>
-      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="3" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="15" minleveldifficulty="10"/>
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="18" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="45" minleveldifficulty="10"/>
+      <Price storeidentifier="merchantmine" multiplier="3.6" minavailable="9" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="45" minleveldifficulty="10"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium"/>
@@ -218,7 +218,7 @@
       <StatusEffect type="OnUse" target="This" condition="-2.5" disabledeltatime="true">
         <RequiredItem items="flakbolt" type="Contained" />
       </StatusEffect>
-      <Containable items="flakbolt" />
+      <Containable items="flakbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
@@ -288,15 +288,15 @@
   <Item name="" identifier="flakcannondirectionalammobox" scale="0.5" tags="flakcannonequipment,flakcannonammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="flakcannonammoloader" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckflakcannonloader" amount="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.05"/>
+    <PreferredContainer secondary="wreckflakcannonloader" amount="2" />
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.1"/>
     <Price baseprice="250" displaynonempty="true" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" minleveldifficulty="10"/>
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="8" minleveldifficulty="10"/>
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" minleveldifficulty="10"/>
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="24" minleveldifficulty="10"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium"/>
@@ -330,7 +330,7 @@
       <StatusEffect type="OnUse" target="This" condition="-2.5" disabledeltatime="true">
         <RequiredItem items="flakboltdirectional" type="Contained" />
       </StatusEffect>
-      <Containable items="flakboltdirectional" />
+      <Containable items="flakboltdirectional,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   
@@ -400,14 +400,14 @@
     <PreferredContainer primary="flakcannonammoloader" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
     <PreferredContainer secondary="wreckflakcannonloader" mincondition="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" mincondition="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" mincondition="1" spawnprobability="0.02"/>
     <Price baseprice="395" sold="false" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.2"/>
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.6"/>
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20">
       <RequiredSkill identifier="weapons" level="40"/>
@@ -442,7 +442,7 @@
       <StatusEffect type="OnUse" target="This" condition="-2.5" disabledeltatime="true">
         <RequiredItem items="flakboltphysicorium" type="Contained" />
       </StatusEffect>
-      <Containable items="flakboltphysicorium" />
+      <Containable items="flakboltphysicorium,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
@@ -527,14 +527,14 @@
     <PreferredContainer primary="flakcannonammoloader" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
     <PreferredContainer secondary="wreckflakcannonloader" />
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.02"/>
     <Price baseprice="450" displaynonempty="true" minleveldifficulty="30">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false"/>
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" minleveldifficulty="15"/>
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="8" minleveldifficulty="15"/>
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" sold="false"/>
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" minleveldifficulty="15"/>
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="24" minleveldifficulty="15"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="c4block" mincondition="0.95" />
@@ -565,7 +565,7 @@
       <StatusEffect type="OnUse" target="This" condition="-2.5" disabledeltatime="true">
         <RequiredItem items="flakboltexplosive" type="Contained" />
       </StatusEffect>
-      <Containable items="flakboltexplosive" />
+      <Containable items="flakboltexplosive,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
@@ -653,14 +653,14 @@
     <PreferredContainer primary="flakcannonammoloader" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
     <PreferredContainer secondary="wreckflakcannonloader" mincondition="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" mincondition="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" mincondition="1" spawnprobability="0.02"/>
     <Price baseprice="600" sold="false" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.2"/>
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.6"/>
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="dementonite" mincondition="0.95" />
@@ -692,7 +692,7 @@
       <StatusEffect type="OnUse" target="This" condition="-5" disabledeltatime="true">
         <RequiredItem items="flakboltgravity" type="Contained" />
       </StatusEffect>
-      <Containable items="flakboltgravity" />
+      <Containable items="flakboltgravity,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Weapons/pulselaser.xml b/Content/Items/Weapons/pulselaser.xml
index 06a80af0..c07104bc 100644
--- a/Content/Items/Weapons/pulselaser.xml
+++ b/Content/Items/Weapons/pulselaser.xml
@@ -29,7 +29,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <!--<ParticleEmitter particle="FlareBubbles" scalemin="0.5" scalemax="0.5" particleamount="20" distancemin="0" distancemax="500" velocitymin="0" velocitymax="5"/>-->
@@ -64,7 +64,7 @@
     <BrokenSprite texture="Content/Items/Weapons/Loaders.png"  sourcerect="163,563,153,351" origin="0.5,0.5" offset="5,6" depth="0.77" fadein="true" maxcondition="99"/>
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="208,968,32,46" origin="0.5,0.5" />
     <DecorativeSprite name="Pulse Laser Loader Frame Back" texture="Content/Items/Weapons/Loaders.png" depth="0.8" sourcerect="31,569,117,200" origin="0.5,0.5" offset="0,-68" />
-    <LightComponent range="150.0" lightcolor="255,100,100,255" pulsefrequency="12" pulseamount="0.8" powerconsumption="0" IsOn="false" castshadows="true" allowingameediting="false" characterusable="false">
+    <LightComponent range="600" lightcolor="255,100,100,255" pulsefrequency="12" pulseamount="0.8" powerconsumption="0" IsOn="false" castshadows="true" allowingameediting="false" characterusable="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="0,791,165,358" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <StatusEffect type="OnActive" target="This" stackable="false" delay="0.25" IsOn="false"/>
     </LightComponent>
@@ -82,9 +82,9 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="83,-260" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.75">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="6" itempos="83,-260" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.75">
       <GuiFrame relativesize="0.18,0.23" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="pulselaserammo" />
+      <Containable items="pulselaserammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!-- when the laser is fired, it triggers this statuseffect, causing contained ammunition boxes to spawn new ammo -->
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="pulselaserammo" type="Contained" />
@@ -101,27 +101,27 @@
       <output name="condition_out" displayname="connection.conditionout" />
       <output name="contained_conditions" displayname="connection.ammunitionout" />
     </ConnectionPanel>
-    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.685,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 0"/>
     </LightComponent>
-    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.135,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 20"/>
     </LightComponent>
-    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.585,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 40"/>
     </LightComponent>
-    <LightComponent lightcolor="252,230,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="252,230,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.035,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 60"/>
     </LightComponent>
-    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-0.515,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 80"/>
     </LightComponent>
-    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-1.065,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gte 100"/>
     </LightComponent>    
@@ -189,15 +189,15 @@
   </Item>
 
   <Item name="" identifier="pulselaserammobox" scale="0.5" tags="pulselaserequipment,pulselaserammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
-    <PreferredContainer primary="pulselaserammosource" amount="1" mincondition="1"/>
+    <PreferredContainer primary="pulselaserammosource" amount="2" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
-    <Price baseprice="250" minavailable="1" displaynonempty="true" >
-      <Price storeidentifier="merchantoutpost" multiplier="1.6" />
-      <Price storeidentifier="merchantcity" multiplier="1.4" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+    <Price baseprice="250" minavailable="3" displaynonempty="true" >
+      <Price storeidentifier="merchantoutpost" multiplier="4.8" />
+      <Price storeidentifier="merchantcity" multiplier="4.2" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="lithium" mincondition="0.95"/>
@@ -228,19 +228,19 @@
       <StatusEffect type="OnUse" target="This" condition="-2.25" disabledeltatime="true">
         <RequiredItem items="pulselaserbolt" type="Contained" />
       </StatusEffect>
-      <Containable items="pulselaserbolt" />
+      <Containable items="pulselaserbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
   <Item name="" identifier="pulselaserammoboxtrilaser" fallbacknameidentifier="pulselaserammobox" scale="0.5" tags="pulselaserequipment,pulselaserammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="pulselaserammosource,ammoboxcontainer" mincondition="1"/>
     <Price baseprice="435" sold="false" displaynonempty="true"  minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.3" minavailable="1"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" sold="true" multiplier="3.9" minavailable="3"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="fulgurium" mincondition="0.95"/>
@@ -270,7 +270,7 @@
       <StatusEffect type="OnUse" target="This" condition="-3.5" disabledeltatime="true">
         <RequiredItem items="pulselaserbolttrilaser" type="Contained" />
       </StatusEffect>
-      <Containable items="pulselaserbolttrilaser" />
+      <Containable items="pulselaserbolttrilaser,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 
diff --git a/Content/Items/Weapons/railgun.xml b/Content/Items/Weapons/railgun.xml
index 18be173b..c0c84efd 100644
--- a/Content/Items/Weapons/railgun.xml
+++ b/Content/Items/Weapons/railgun.xml
@@ -26,7 +26,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashrailgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -71,9 +71,9 @@
     <BrokenSprite texture="Content/Items/Weapons/Loaders.png" sourcerect="163,563,153,351" origin="0.5,0.5" offset="35,4" depth="0.77" fadein="true" maxcondition="99" />
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="208,968,32,46" origin="0.5,0.5" />
     <DecorativeSprite name="Railgun Loader Frame Front" texture="Loaders.png" depth="0.8" sourcerect="31,569,117,200" origin="0.5,0.5" offset="0,-30" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="6" slotsperrow="6" itempos="58,-200" iteminterval="20,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepths="0.79,0.791,0.792,0.793,0.794,0.795">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="13" slotsperrow="4" itempos="58,-200" iteminterval="20,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepths="0.79,0.791,0.792,0.793,0.794,0.795">
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="railgunammo" />
+      <Containable items="railgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="20" mindeteriorationdelay="5" maxdeteriorationdelay="15" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.25" />
@@ -95,44 +95,44 @@
       <output name="condition_out" displayname="connection.conditionout" />
       <output name="contained_items" displayname="connection.ammunitionout" />
     </ConnectionPanel>
-    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.685,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 0" />
     </LightComponent>
-    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.135,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 1" />
     </LightComponent>
-    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.585,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 2" />
     </LightComponent>
-    <LightComponent lightcolor="252,230,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="252,230,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.035,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 3" />
     </LightComponent>
-    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-0.515,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 4" />
     </LightComponent>
-    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-1.065,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="railgunshell" tags="railgunequipment,railgunammo" showcontentsintooltip="true" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
-    <PreferredContainer primary="railgunammoloader" amount="5" mincondition="1" />
-    <PreferredContainer primary="railgunammocontainer" amount="6" mincondition="1" />
+    <PreferredContainer primary="railgunammoloader" amount="10" mincondition="1" />
+    <PreferredContainer primary="railgunammocontainer" amount="12" mincondition="1" />
     <!--Ensure that Thalamus always has some railgun shells to use-->
-    <PreferredContainer secondary="wreckrailgunloader" minamount="1" maxamount="4" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" amount="1" spawnprobability="0.5" />
+    <PreferredContainer secondary="wreckrailgunloader" minamount="2" maxamount="8" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" amount="2" spawnprobability="1" />
     <Price baseprice="70">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="30" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -185,22 +185,22 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="2" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem,explosive" />
+      <Containable items="smallitem,explosive,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="nuclearshell" tags="railgunequipment,railgunammo" showcontentsintooltip="true" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="railgunammoloader,railgunammocontainer" mincondition="1" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" amount="2" spawnprobability="0.1" />
     <Price baseprice="470" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.35" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1" minleveldifficulty="35" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="1" minleveldifficulty="35" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.05" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="3" minleveldifficulty="35" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" minavailable="3" minleveldifficulty="35" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -265,10 +265,10 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="2" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem" />
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="nuclearshellcheap" variantof="nuclearshell" hideineditors="true">
@@ -297,14 +297,14 @@
   </Item>
   <Item name="" identifier="alienshell" tags="railgunequipment,railgunammo" showcontentsintooltip="true" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="railgunammoloader,railgunammocontainer" mincondition="1" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" amount="2" spawnprobability="0.2" />
     <Price baseprice="300" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="physicorium" />
@@ -355,10 +355,10 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="2" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem,explosive" />
+      <Containable items="smallitem,explosive,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="railguncanistershellpellet" category="Weapon" scale="0.5" sonarsize="2" hideinmenus="true">
@@ -390,14 +390,14 @@
   </Item>
   <Item name="" identifier="railguncanistershell" tags="railgunequipment,railgunammo,containershell" category="Weapon" linkable="true" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="railgunammoloader,railgunammocontainer" mincondition="1" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" minamount="1" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" minamount="2" maxamount="4" spawnprobability="0.4" />
     <Price baseprice="95">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="5" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="15" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -429,24 +429,24 @@
         <Conditional InWater="false" />
       </StatusEffect>
     </Holdable>
-    <ItemContainer hideitems="true" capacity="11" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet"
+    <ItemContainer hideitems="true" capacity="24" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet"
                    spawnwithid="railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet">
       <StatusEffect type="OnUse" target="This" condition="-100" disabledeltatime="true">
         <RequiredItem items="railguncanistershellpellet" type="Contained" />
       </StatusEffect>
-      <Containable items="railguncanistershellpellet" />
+      <Containable items="railguncanistershellpellet,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="gravityshell" tags="railgunequipment,railgunammo" showcontentsintooltip="true" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="railgunammoloader,railgunammocontainer" mincondition="1" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" amount="2" spawnprobability="0.2" />
     <Price baseprice="300" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="dementonite" />
@@ -534,13 +534,13 @@
 
   <Item name="" identifier="railgunharpoon" tags="railgunequipment,railgunammo" health="20" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="railgunammoloader,railgunammocontainer" mincondition="1" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" amount="2" spawnprobability="0.1" />
     <Price baseprice="175">
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="4"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6"/>
-      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="4"/>
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6"/>
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="12"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18"/>
+      <Price storeidentifier="merchantmine" multiplier="3.6" minavailable="12"/>
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="18"/>
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20">
       <RequiredSkill identifier="weapons" level="25" />
diff --git a/Content/Items/Weapons/turrethardpoint.xml b/Content/Items/Weapons/turrethardpoint.xml
index 785cfcc9..b58d04ab 100644
--- a/Content/Items/Weapons/turrethardpoint.xml
+++ b/Content/Items/Weapons/turrethardpoint.xml
@@ -12,7 +12,7 @@
     </SwappableItem>
     <StaticBody width="80" radius="80" />
     <Turret rotationlimits="180,360" projectilecount="0" canbeselected="false" characterusable="false" linkable="true" barrelpos="128,-50">
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/alphaOne.png" />
       </LightComponent>
     </Turret>
@@ -41,7 +41,7 @@
     </SwappableItem>
     <StaticBody width="80" radius="80" />
     <Turret rotationlimits="180,360" projectilecount="0" canbeselected="false" characterusable="false" linkable="true" barrelpos="220,-128">
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/alphaOne.png" />
       </LightComponent>
     </Turret>
diff --git a/Content/Items/Weapons/weapons.xml b/Content/Items/Weapons/weapons.xml
index ae63a61b..beb83815 100644
--- a/Content/Items/Weapons/weapons.xml
+++ b/Content/Items/Weapons/weapons.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="spear" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="6" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="harpoongun" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="armcab" minamount="3" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="spear" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="harpoongun" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer primary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="32" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="64" spawnprobability="1" notcampaign="true"/>
     <Price baseprice="7">
-      <Price storeidentifier="merchantoutpost" minavailable="12" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" minavailable="12" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" minavailable="6" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" minavailable="24" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" minavailable="6" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" minavailable="24" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" minavailable="12" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" minavailable="12" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" minavailable="6" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" minavailable="24" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" minavailable="6" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" minavailable="24" multiplier="2.7" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="6">
@@ -46,18 +46,18 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="alienspear" category="Weapon,Alien" maxstacksize="32" maxstacksizecharacterinventory="6" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="alienspear" category="Weapon,Alien" maxstacksize="64" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="harpoongun" />
-    <PreferredContainer secondary="ruinstoragesmall,ruinstorage" minamount="1" maxamount="3" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="6" spawnprobability="0.2" />
-    <PreferredContainer primary="ruintreasure" amount="6" spawnprobability="0.25" />
+    <PreferredContainer secondary="ruinstoragesmall,ruinstorage" minamount="2" maxamount="6" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="12" spawnprobability="0.4" />
+    <PreferredContainer primary="ruintreasure" amount="12" spawnprobability="0.5" />
     <PreferredContainer primary="secarmcab,armcab" />
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="6">
@@ -91,18 +91,18 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="explosivespear" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="6" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo,demolitionsexpert" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="explosivespear" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo,demolitionsexpert" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="harpoongun" />
-    <PreferredContainer primary="armcab" amount="6" spawnprobability="0.1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="6" spawnprobability="0.1" />
+    <PreferredContainer primary="armcab" amount="12" spawnprobability="0.2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="12" spawnprobability="0.2" />
     <PreferredContainer primary="secarmcab" />
     <Price baseprice="80">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="18" />
     </Price>
     <Deconstruct time="5"></Deconstruct>
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="2">
@@ -132,17 +132,17 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="harpoongun" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckweaponholder" spawnprobability="0.05" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckweaponholder" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.2" />
     <PreferredContainer primary="secarmcab" secondary="armcab,weaponholder" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="2" spawnprobability="1" notcampaign="true"/>
-    <Price baseprice="170" minavailable="1">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="4" spawnprobability="1" notcampaign="true"/>
+    <Price baseprice="170" minavailable="3">
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -170,12 +170,12 @@
       <RequiredItems items="harpoonammo" type="Contained" msg="ItemMsgSpearRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer itempos="27,10" iteminterval="0,-4" hideitems="false" capacity="1" maxstacksize="6" containedstateindicatorslot="0" containedstateindicatorstyle="spear" containedspritedepths="0.551,0.552,0.553,0.554,0.555,0.556">
-      <Containable items="harpoonammo" />
+    <ItemContainer itempos="27,10" iteminterval="0,-4" hideitems="false" capacity="1" maxstacksize="12" containedstateindicatorslot="0" containedstateindicatorstyle="spear" containedspritedepths="0.551,0.552,0.553,0.554,0.555,0.556">
+      <Containable items="harpoonammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="0,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />   
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="18,12" setactive="true" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="18,12" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="0" soundrange="500" fadeouttime="2" />
@@ -185,20 +185,20 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <SkillRequirementHint identifier="weapons" level="30" />
   </Item>
-  <Item name="" identifier="revolverround" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,revolverammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="revolver" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="armcab" amount="6" spawnprobability="1" notpvp="true" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="6" spawnprobability="0.2" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.25" />
+  <Item name="" identifier="revolverround" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="24" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,revolverammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="revolver" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="armcab" amount="12" spawnprobability="1" notpvp="true" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="12" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.5" />
     <PreferredContainer secondary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="32" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="64" spawnprobability="1" notcampaign="true"/>
     <Price baseprice="12">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="12" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="12" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="12" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="60" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="12" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="60" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="36" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="36" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="36" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="180" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="36" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="180" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="12">
       <RequiredSkill identifier="weapons" level="30" />
@@ -232,7 +232,7 @@
     <!--
       An example on using the PreferredContainer:
       
-      <PreferredContainer primary="somespecialcontainer" secondary="locker" minamount="1" maxamount="1" spawnprobability="1"/>
+      <PreferredContainer primary="somespecialcontainer" secondary="locker" minamount="2" maxamount="2" spawnprobability="1"/>
       
           PreferredContainers are used for automatic item placement and to tell the bots where items belong to.
           
@@ -250,14 +250,14 @@
           The evaluation is weight based: it's possible that the bots use a container marked as "secondary" or even a container that is not defined here, if it's close enough.
           If you want to tell the bots that "only put certain items in this container", use the "Containable Restrictions" that can be defined in the sub editor.
     -->
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.25" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.5" />
     <PreferredContainer primary="secarmcab" secondary="armcab,weaponholder" />
     <!--
       An example on using the Price elements:
       
-      <Price baseprice="0" sold="true" soldelsewhere="false" buyingpricemultiplier="1.0" minamount="0" maxamount="0" canbespecial="true" minleveldifficulty="0" displaynonempty="false">
-        <Price storeidentifier="" multiplier="1.0" />
+      <Price baseprice="0" sold="true" soldelsewhere="false" buyingpricemultiplier="3" minamount="0" maxamount="0" canbespecial="true" minleveldifficulty="0" displaynonempty="false">
+        <Price storeidentifier="" multiplier="3" />
       </Price>
       
           The above example includes all the attributes that can be used in the price definitions. The listed attribute values are the values the attributes will default to if they are
@@ -281,12 +281,12 @@
                     multiplier = (multiplier * baseprice) will determine the price of the item at the store. Defaults to 1.0.
     -->
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" minavailable="1" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" minavailable="3" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -315,9 +315,9 @@
       <RequiredItems items="revolverammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="6" hideitems="true" containedstateindicatorstyle="bullet">
+    <ItemContainer capacity="1" maxstacksize="12" hideitems="true" containedstateindicatorstyle="bullet">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
-      <Containable items="revolverammo" />
+      <Containable items="revolverammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="5000" fadeouttime="5" />
     <Quality>
@@ -353,20 +353,20 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="smgmagazine" maxstacksize="8" maxstacksizecharacterinventory="2" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,smgammo,handheldammo" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="smg,smgunique,machinepistol" amount="1" spawnprobability="1" />
-    <PreferredContainer primary="armcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="2" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+  <Item name="" identifier="smgmagazine" maxstacksize="16" maxstacksizecharacterinventory="4" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,smgammo,handheldammo" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="smg,smgunique,machinepistol" amount="2" spawnprobability="1" />
+    <PreferredContainer primary="armcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="8" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="16" spawnprobability="1" notcampaign="true"/>
     <Price baseprice="100" displaynonempty="true" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="12" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="25" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="40" />
@@ -389,7 +389,7 @@
     <Sprite texture="Content/Items/Weapons/weapons_new.png" depth="0.54" sourcerect="146,157,21,44" origin="0.5,0.5" />
     <Body width="14" height="40" density="25" />
     <ItemContainer hideitems="true" capacity="1" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true" SpawnWithId="smground" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
-      <Containable items="smground" />
+      <Containable items="smground,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!--Spawn an SMG round on use. Condition -4.8 -> 21 shots per magazine.-->
       <StatusEffect type="OnUse" target="This" condition="-4.8" disabledeltatime="true">
         <SpawnItem identifiers="smground" spawnposition="ThisInventory" />
@@ -400,17 +400,17 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="smg" category="Weapon" cargocontaineridentifier="metalcrate" tags="smallautoweapon,smallitem,weapon,gun,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.25" />
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.5" />
     <PreferredContainer secondary="armcab,weaponholder" />
     <Price baseprice="390" minleveldifficulty="30">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="6" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="35" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="55" />
@@ -446,12 +446,12 @@
       <RequiredItems items="smgammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
-      <Containable items="smgammo" hide="false" itempos="4,-10" rotation="-30" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+      <Containable items="smgammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="4,-10" rotation="-30" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="22,-1" setactive="true" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="22,-1" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
@@ -461,19 +461,19 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <SkillRequirementHint identifier="weapons" level="50" />
   </Item>
-  <Item name="" identifier="stungrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="3" spawnprobability="0.75" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="3" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="stungrenade" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="6" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer secondary="armcab" />
     <Upgrade gameversion="0.9.2.0" scale="0.5" />
     <Price baseprice="125">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="18" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -540,18 +540,18 @@
       <QualityStat stattype="ExplosionRadius" value="0.2" />
     </Quality>
   </Item>
-  <Item name="" identifier="empgrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="3" spawnprobability="0.75" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+  <Item name="" identifier="empgrenade" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="175">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantengineering" multiplier="1.2" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantengineering" multiplier="3.6" minavailable="6" />
     </Price>
     <Upgrade gameversion="0.9.3.0" scale="0.5" />
     <Deconstruct time="10">
@@ -615,18 +615,18 @@
       <QualityStat stattype="ExplosionDamage" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="fraggrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="3" spawnprobability="0.75" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+  <Item name="" identifier="fraggrenade" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" scale="0.5" impactsoundtag="impact_metal_heavy">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer secondary="armcab" />
     <Upgrade gameversion="0.9.3.0" scale="0.5" />
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.35" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.05" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -694,7 +694,7 @@
     <!-- Sticks to characters for additional damage over time.-->
     <Projectile characterusable="false" launchimpulse="5" sticktocharacters="true" sticktostructures="false" sticktoitems="true" sticktodeflective="true">
       <StatusEffect type="OnImpact" target="This" delay="0.1" IsOn="true"/>
-      <LightComponent LightColor="220,100,45,150" Flicker="0.8" range="110" IsOn="false">
+      <LightComponent LightColor="220,100,45,150" Flicker="0.8" range="440" IsOn="false">
         <!-- Drain oxygen -->
         <StatusEffect type="OnActive" target="Hull" oxygen="-400.0"/>
         <StatusEffect type="OnActive" targettype="This" Condition="-16.5">
@@ -718,18 +718,18 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="incendiumgrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="3" spawnprobability="0.75" notcampaign="true" notpvp="true" />
-    <PreferredContainer primary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0.05" />
+  <Item name="" identifier="incendiumgrenade" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_heavy">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer primary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <PreferredContainer secondary="armcab" />
     <Upgrade gameversion="0.9.3.0" scale="0.5" />
     <Price baseprice="175" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="20" amount="2">
@@ -787,17 +787,17 @@
     </Quality>
   </Item>
   <Item name="" identifier="stunbaton" category="Weapon" Tags="smallitem,weapon,stunner,gunsmith,mountableweapon" Scale="0.5" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" RequireAimToUse="True">
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.2" />
     <PreferredContainer primary="secarmcab" secondary="armcab" />
     <Upgrade gameversion="0.9.2.0" scale="0.5" />
     <Price baseprice="200">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.35" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.05" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="18" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -855,9 +855,9 @@
         <Conditional entitytype="eq Character" />
       </StatusEffect>
     </MeleeWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <Containable items="mobilebattery" />
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="500" soundrange="500" fadeouttime="1" />
     <Quality>
@@ -865,17 +865,17 @@
     </Quality>
   </Item>
   <Item name="" identifier="divingknife" category="Weapon" Tags="smallitem,weapon,gunsmith,mountableweapon,sharptool" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.25" />
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="beaconsupplycab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="beaconsupplycab" amount="2" spawnprobability="0.1" />
     <PreferredContainer primary="secarmcab" secondary="armcab" />
     <Price baseprice="29">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="45" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="45" />
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Deconstruct time="10">
@@ -911,16 +911,16 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="grenadelauncher" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gun,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="0.2" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.1" />
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="0.4" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.2" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="1000" sold="false" minleveldifficulty="30">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -948,8 +948,8 @@
       <RequiredSkill identifier="weapons" level="60" />
     </RangedWeapon>
     <!--Holds six grenades at a time-->
-    <ItemContainer capacity="6" maxstacksize="1" hideitems="false" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
-      <Containable items="grenade" hide="true" />
+    <ItemContainer capacity="13" maxstacksize="2" hideitems="false" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+      <Containable items="grenade,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="true" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="448,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="448,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="448,448,64,64" origin="0.5,0.5" />
@@ -957,8 +957,8 @@
       <SlotIcon slotindex="4" texture="Content/UI/StatusMonitorUI.png" sourcerect="448,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="5" texture="Content/UI/StatusMonitorUI.png" sourcerect="448,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="6" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="22,-1" setactive="true" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="22,-1" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="500" soundrange="500" fadeouttime="3" />
@@ -969,17 +969,17 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <SkillRequirementHint identifier="weapons" level="60" />
   </Item>
-  <Item name="" identifier="40mmgrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="grenadelauncher" amount="6" spawnprobability="1" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+  <Item name="" identifier="40mmgrenade" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="grenadelauncher" amount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer primary="secarmcab" secondary="armcab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" minavailable="12" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" />
@@ -1013,16 +1013,16 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="40mmstungrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="40mmstungrenade" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer primary="secarmcab" secondary="armcab" />
     <Price baseprice="120" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" minavailable="12" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" />
@@ -1056,18 +1056,18 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="shotgun" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gun,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="wreckweaponholder" amount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckweaponholder" amount="2" spawnprobability="0.06" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="500" minleveldifficulty="30">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1105,12 +1105,12 @@
       <RequiredItems items="shotgunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="6" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
-      <Containable items="shotgunammo" hide="true" />
+    <ItemContainer capacity="1" maxstacksize="12" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+      <Containable items="shotgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="true" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="26,-3" setactive="true" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="26,-3" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
@@ -1120,22 +1120,22 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <SkillRequirementHint identifier="weapons" level="50" />
   </Item>
-  <Item name="" identifier="shotgunshell" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="shotgun" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="autoshotgun" amount="8" spawnprobability="1" />
-    <PreferredContainer primary="shotgununique" amount="2" spawnprobability="1" />
-    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="6" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="shotgunshell" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="24" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="shotgun" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="autoshotgun" amount="16" spawnprobability="1" />
+    <PreferredContainer primary="shotgununique" amount="4" spawnprobability="1" />
+    <PreferredContainer primary="armcab" minamount="122" maxamount="24" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="32" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="64" spawnprobability="1" notcampaign="true"/>
     <Price baseprice="30" minleveldifficulty="30">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" sold="true" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" sold="true" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="36" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="36" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="6">
       <RequiredSkill identifier="weapons" level="30" />
@@ -1167,19 +1167,19 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="shotgunshellblunt" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="shotgunshellblunt" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="24" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="shotgun,autoshotgun,shotgununique" />
-    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="6" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+    <PreferredContainer primary="armcab" minamount="122" maxamount="24" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
     <Price baseprice="15" minleveldifficulty="30">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" sold="true" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" sold="true" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="36" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="36" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" amount="12">
       <RequiredSkill identifier="weapons" level="30" />
@@ -1204,16 +1204,16 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="stungun" category="Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,weapon,gun,stunner,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.2" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="180">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.35" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.05" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="12" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1239,9 +1239,9 @@
       <RequiredItems items="stungunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="20" />
     </RangedWeapon>
-    <ItemContainer capacity="1" hideitems="true" maxstacksize="1" containedstateindicatorstyle="bullet">
+    <ItemContainer capacity="1" hideitems="true" maxstacksize="2" containedstateindicatorstyle="bullet">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
-      <Containable items="stungunammo" />
+      <Containable items="stungunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="0" soundrange="0" />
     <Quality>
@@ -1250,18 +1250,18 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <SkillRequirementHint identifier="weapons" level="20" />
   </Item>
-  <Item name="" identifier="stungundart" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="armcab" minamount="1" maxamount="10" spawnprobability="0.25" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
-    <PreferredContainer primary="stungun" amount="2" spawnprobability="1" />
+  <Item name="" identifier="stungundart" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="armcab" minamount="2" maxamount="20" spawnprobability="0.5" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
+    <PreferredContainer primary="stungun" amount="4" spawnprobability="1" />
     <PreferredContainer secondary="secarmcab" />
     <Price baseprice="30">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="18" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="20" amount="2">
@@ -1354,7 +1354,7 @@
   
   <Item name="" identifier="shotgununique" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gun,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
     <PreferredContainer primary="secarmcab" secondary="armcab" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.05" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.1" />
     <Price baseprice="931" sold="false" canbespecial="false" />
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1390,12 +1390,12 @@
       <RequiredItems items="shotgunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
-      <Containable items="shotgunammo" hide="true" />
+    <ItemContainer capacity="1" maxstacksize="4" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+      <Containable items="shotgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="true" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="22,-1" setactive="true" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="22,-1" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
@@ -1404,9 +1404,9 @@
     </Quality>
     <SkillRequirementHint identifier="weapons" level="50" />
   </Item>
-  <Item name="" identifier="spearunique" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="6" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,handheldammo,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
+  <Item name="" identifier="spearunique" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,handheldammo,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
     <PreferredContainer primary="harpoongun,armcab" secondary="secarmcab" />
-    <PreferredContainer secondary="wrecksecarmcab,wreckarmcab,abandonedsecarmcab,piratesecarmcab,abandonedarmcab,piratearmcab" amount="6" spawnprobability="0.05" />
+    <PreferredContainer secondary="wrecksecarmcab,wreckarmcab,abandonedsecarmcab,piratesecarmcab,abandonedarmcab,piratearmcab" amount="12" spawnprobability="0.1" />
     <Price baseprice="550" sold="false" canbespecial="false" />
     <Deconstruct time="5">
       <Item identifier="steel" />
@@ -1440,7 +1440,7 @@
   </Item>
   <Item name="" identifier="divingknifeunique" category="Weapon" Tags="smallitem,weapon,mountableweapon,sharptool" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true" RequireAimToUse="True">
     <PreferredContainer primary="secarmcab" secondary="armcab" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.05" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.1" />
     <Price baseprice="770" sold="false" canbespecial="false" />
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -1474,7 +1474,7 @@
   </Item>
   <Item name="" identifier="smgunique" category="Weapon" cargocontaineridentifier="metalcrate" tags="smallautoweapon,smallitem,weapon,gun,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
     <PreferredContainer primary="secarmcab" secondary="armcab" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.05" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.1" />
     <Price baseprice="1064" sold="false" canbespecial="false" />
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1507,12 +1507,12 @@
       <StatusEffect type="OnUse" target="This" reload="0.1" setvalue="true" delay="0.7" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
-      <Containable items="smgammo" hide="false" itempos="4,-5" rotation="-25" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+      <Containable items="smgammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="4,-5" rotation="-25" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="17,5" setactive="true" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="17,5" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
@@ -1522,18 +1522,18 @@
     <SkillRequirementHint identifier="weapons" level="50" />
   </Item>
   <Item name="" identifier="rifle" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gun,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="wreckweaponholder" amount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckweaponholder" amount="2" spawnprobability="0.06" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="500" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1592,16 +1592,16 @@
       <RequiredItems items="rifleammo,grenade" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="60" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorstyle="bullet" containedstateindicatorslot="1" containedspritedepth="0.56">
-      <Containable items="grenade" hide="false" itempos="50,0" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" containedstateindicatorstyle="bullet" containedstateindicatorslot="1" containedspritedepth="0.56">
+      <Containable items="grenade,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="50,0" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="448,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="6">
-        <Containable items="rifleammo" hide="true" />
+      <SubContainer capacity="1" maxstacksize="12">
+        <Containable items="rifleammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="true" />
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="30,-3" setactive="true" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="30,-3" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
@@ -1610,19 +1610,19 @@
     </Quality>
     <SkillRequirementHint identifier="weapons" level="60" />
   </Item>
-  <Item name="" identifier="riflebullet" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,rifleammo,handheldammo,riflemanbonus" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="rifle" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="6" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="riflebullet" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="24" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,rifleammo,handheldammo,riflemanbonus" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="rifle" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="armcab" minamount="122" maxamount="24" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
     <Price baseprice="30" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" sold="true" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" sold="true" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="36" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="36" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="6">
       <RequiredSkill identifier="weapons" level="30" />
@@ -1659,12 +1659,12 @@
   <Item name="" identifier="hmg" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gun,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="secarmcab" secondary="armcab,weaponholder" />
     <Price baseprice="900" sold="true" minleveldifficulty="65">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="true" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" sold="true" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="true" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" sold="true" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="75" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="65" />
@@ -1727,12 +1727,12 @@
     <Propulsion force="-30" usablein="both" ApplyToHands="false">
       <RequiredItems items="hmgammo" type="Contained" />
     </Propulsion>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
-      <Containable items="hmgammo" hide="false" itempos="0,-10" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+      <Containable items="hmgammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="0,-10" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="30,1" setactive="true" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="30,1" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
@@ -1741,16 +1741,16 @@
     </Quality>
     <SkillRequirementHint identifier="weapons" level="90" />
   </Item>
-  <Item name="" identifier="hmgmagazine" maxstacksize="4" maxstacksizecharacterinventory="1" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,hmgammo,handheldammo" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="hmg" minamount="1" maxamount="1" spawnprobability="1" />
+  <Item name="" identifier="hmgmagazine" maxstacksize="8" maxstacksizecharacterinventory="2" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,hmgammo,handheldammo" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="hmg" minamount="2" maxamount="2" spawnprobability="1" />
     <PreferredContainer primary="armcab" secondary="secarmcab" />
     <Price baseprice="330" sold="true" minleveldifficulty="65" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="0" maxavailable="4" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="0" maxavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="0" maxavailable="4" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" minavailable="0" maxavailable="4" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="35" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="40" />
@@ -1774,7 +1774,7 @@
     <Sprite texture="Content/Items/Weapons/weapons_new.png" sourcerect="208,88,29,37" depth="0.55" origin="0.5,0.5" />
     <Body width="29" height="37" density="25" />
     <ItemContainer hideitems="true" capacity="1" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true" SpawnWithId="hmground" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
-      <Containable items="hmground" />
+      <Containable items="hmground,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-1" disabledeltatime="true">
         <SpawnItem identifiers="hmground" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -1809,16 +1809,16 @@
     </Projectile>
   </Item>
   <Item name="" identifier="harpooncoilrifle" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckweaponholder" spawnprobability="0.005" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.01" />
+    <PreferredContainer secondary="wreckweaponholder" spawnprobability="0.01" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.02" />
     <PreferredContainer primary="secarmcab" secondary="armcab,weaponholder" />
     <Price baseprice="270" minleveldifficulty="30">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -1852,16 +1852,16 @@
       <RequiredItems items="harpoonammo" type="Contained" msg="ItemMsgSpearRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="6" slotsperrow="2" hideitems="false" iteminterval="0,-4" itempos="27,10" containedstateindicatorstyle="spear" containedstateindicatorslot="0" containedspritedepth="0.56">
-      <Containable items="harpoonammo" hide="false" />
+    <ItemContainer capacity="1" maxstacksize="12" slotsperrow="2" hideitems="false" iteminterval="0,-4" itempos="27,10" containedstateindicatorstyle="spear" containedstateindicatorslot="0" containedspritedepth="0.56">
+      <Containable items="harpoonammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="0,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="mobilebattery" hide="true" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="true" />
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="flashlight" hide="false" itempos="18,13" setactive="true" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="18,13" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="0" soundrange="500" fadeouttime="2" />
@@ -1871,17 +1871,17 @@
     <SkillRequirementHint identifier="weapons" level="30" />
   </Item>
   <Item name="" identifier="machinepistol" category="Weapon" cargocontaineridentifier="metalcrate" tags="smallautoweapon,smallitem,weapon,gun,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.25" />
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.5" />
     <PreferredContainer secondary="armcab,weaponholder" />
     <Price baseprice="200" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1911,9 +1911,9 @@
       <RequiredItems items="smgammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
-      <Containable items="smgammo" hide="false" itempos="3,-5" rotation="-5" />
+      <Containable items="smgammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="3,-5" rotation="-5" />
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
     <Quality>
diff --git a/Content/Items/idcard.xml b/Content/Items/idcard.xml
index e4c85c54..173b943c 100644
--- a/Content/Items/idcard.xml
+++ b/Content/Items/idcard.xml
@@ -3,8 +3,8 @@
   <Item name="" identifier="idcard" category="Equipment" Tags="smallitem,identitycard" cargocontaineridentifier="metalcrate">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="10">
-      <Price storeidentifier="merchantoutpost" minavailable="4" />
-      <Price storeidentifier="merchantcity" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" minavailable="12" />
+      <Price storeidentifier="merchantcity" minavailable="18" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="192,64,64,64" origin="0.5,0.5" />
     <Sprite texture="idcard.png" depth="0.5" sourcerect="0,0,16,16" />
diff --git a/Content/Map/Outposts/OutpostItems.xml b/Content/Map/Outposts/OutpostItems.xml
index fbb367f3..608e1947 100644
--- a/Content/Map/Outposts/OutpostItems.xml
+++ b/Content/Map/Outposts/OutpostItems.xml
@@ -9,7 +9,7 @@
   <Item name="" identifier="op_clownjukebox" width="149" height="258" scale="0.5" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/ClownDistrict.png" sourcerect="82,763,149,258" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     <Powered IsActive="true" PowerConsumption="50">
-      <LightComponent range="20" lightcolor="209,46,158,255" blinkfrequency="1" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+      <LightComponent range="80" lightcolor="209,46,158,255" blinkfrequency="1" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
         <sprite texture="Content/Map/Outposts/Art/ClownDistrict.png" sourcerect="205,95,169,278" depth="0.98" origin="0.5,0.5" />
       </LightComponent>      
       <sound file="Content/Sounds/ClubMusic_accordion.ogg" type="OnActive" range="1000.0" loop="true" volume="0.01" volumeproperty="PowerConsumption" selectionmode="Manual" mutebackgroundmusic="true" />
@@ -85,7 +85,7 @@
   </Item>
   <Item name="" identifier="op_clownmarquee" width="272" height="149" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/ClownDistrict.png" sourcerect="677,2,272,149" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="120" lightcolor="209,127,46,255" flicker="0.1" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="480" lightcolor="209,127,46,255" flicker="0.1" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/ClownDistrict.png" sourcerect="677,155,272,149" depth="0.98" premultiplyalpha="true" origin="0.5,0.5" />
     </LightComponent>
   </Item>
@@ -200,7 +200,7 @@
  	<sprite texture="Content/Map/Outposts/Art/HuskDistrict.png" sourcerect="277,437,115,232" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
   </Item>
   <Item name="" identifier="op_humantank" width="159" height="331" scale="0.5" noninteractable="true" category="Decorative">
-	<LightComponent range="130" lightcolor="255,0,100,120" pulsefrequency="0.5" pulseamount="0.2" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false"/>
+	<LightComponent range="520" lightcolor="255,0,100,120" pulsefrequency="0.5" pulseamount="0.2" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false"/>
     <sprite texture="Content/Map/Outposts/Art/HuskDistrict.png" sourcerect="394,673,159,331" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
     <DecorativeSprite texture="Content/Map/Outposts/Art/HuskDistrict.png" sourcerect="193,724,171,254" depth="0.96" origin="0.5,0.5" offset="0,5" offsetanim="Sine" offsetanimspeed="2" />
 	<DecorativeSprite texture="Content/Map/Outposts/Art/HuskDistrict.png" sourcerect="557,638,131,316" depth="0.97" />
@@ -248,11 +248,11 @@
   </Item>
   <Item name="" identifier="op_storesign1.png" nameidentifier="opdeco_adposter" width="326" height="165" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/SignAssets.png" sourcerect="2,2,326,165" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="70" lightcolor="213,213,185,120" flicker="0.3" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false"/>
+    <LightComponent range="280" lightcolor="213,213,185,120" flicker="0.3" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false"/>
   </Item>
   <Item name="" identifier="op_shipyardsign2.png" nameidentifier="opdeco_adposter" width="310" height="139" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/SignAssets.png" sourcerect="2,171,310,139" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="70" lightcolor="213,213,185,120" flicker="0.3" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false"/>
+    <LightComponent range="280" lightcolor="213,213,185,120" flicker="0.3" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false"/>
   </Item>
   <Item name="" identifier="op_shipyardsign1.png" nameidentifier="opdeco_adposter" width="185" height="191" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/SignAssets.png" sourcerect="316,173,185,191" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
@@ -272,11 +272,11 @@
   </Item>
   <Item name="" identifier="op_hiringsign.png" nameidentifier="sign" width="155" height="193" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/SignAssets.png" sourcerect="2,444,155,193" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="70" lightcolor="213,213,185,120" flicker="0.3" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false"/>
+    <LightComponent range="280" lightcolor="213,213,185,120" flicker="0.3" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false"/>
   </Item>
   <!-->Item name="" identifier="op_lamppost.png" width="149" height="347" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/SignAssets.png" sourcerect="2,641,149,347" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="70" lightcolor="213,213,185,120" flicker="0.3" powerconsumption="0" IsOn="true" offset="-100,0" castshadows="false" allowingameediting="false"/>
+    <LightComponent range="280" lightcolor="213,213,185,120" flicker="0.3" powerconsumption="0" IsOn="true" offset="-100,0" castshadows="false" allowingameediting="false"/>
   </Item>
   </!-->
   <Item name="" identifier="op_circusposter.png" width="127" height="174" scale="0.5" noninteractable="true" category="Decorative">
@@ -287,7 +287,7 @@
   </Item>
   <Item name="" identifier="streetlight" nameidentifier="streetlight" width="56" height="55" scale="0.5" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/EngineerColonyModule.png" sourcerect="757,1,56,55" depth="0.96" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="250.0" lightcolor="255,255,255,111" IsOn="true" castshadows="true" allowingameediting="false" powerconsumption="5">
+    <LightComponent range="1000" lightcolor="255,255,255,111" IsOn="true" castshadows="true" allowingameediting="false" powerconsumption="5">
       <sprite texture="Content/Map/Outposts/Art/EngineerColonyModule.png" sourcerect="815,1,56,55" depth="0.97" premultiplyalpha="false" origin="0.5,0.52" />
     </LightComponent>
     <DecorativeSprite texture="Content/Map/Outposts/Art/EngineerColonyModule.png" depth="0.961" sourcerect="775,56,22,344" offset="0,-172"/>
@@ -501,52 +501,52 @@
   <!--Flickering hologram displays-->
   <Item name="" identifier="op_hologramdisplay1" width="157" height="95" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="2,657,157,95" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="111,199,255,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0">
+    <LightComponent range="40" lightcolor="111,199,255,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0">
       <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="2,657,157,95" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="op_hologramdisplay2" nameidentifier="op_hologramdisplay1" width="128" height="78" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="160,656,128,78" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="111,199,255,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0">
+    <LightComponent range="40" lightcolor="111,199,255,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0">
       <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="160,656,128,78" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="op_hologramdisplay3" nameidentifier="op_hologramdisplay1" width="128" height="80" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="0,752,128,80" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="111,199,255,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0">
+    <LightComponent range="40" lightcolor="111,199,255,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0">
       <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="0,752,128,80" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="op_hologramdisplay4" nameidentifier="op_hologramdisplay1" width="129" height="81" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="159,735,129,81" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="111,199,255,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0">
+    <LightComponent range="40" lightcolor="111,199,255,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0">
       <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="159,735,129,81" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="opdeco_screen01" nameidentifier="opdeco_screen" width="96" height="64" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="752,352,96,64" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="111,199,255,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
+    <LightComponent range="0" lightcolor="111,199,255,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="752,352,96,64" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="opdeco_screen02" nameidentifier="opdeco_screen" width="96" height="64" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="752,416,96,64" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="60,110,66,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
+    <LightComponent range="0" lightcolor="60,110,66,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="752,416,96,64" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="opdeco_screen03" nameidentifier="opdeco_screen" width="96" height="64" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="752,480,96,64" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="200,180,60,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
+    <LightComponent range="0" lightcolor="200,180,60,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="752,480,96,64" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="opdeco_screen04" nameidentifier="opdeco_screen" width="96" height="64" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="304,672,96,64" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="220,95,60,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
+    <LightComponent range="0" lightcolor="220,95,60,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Map/Outposts/Art/ManagerOfficeAssets.png" sourcerect="304,672,96,64" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -554,21 +554,21 @@
   <!--Shop containers-->
   <Item name="" identifier="opdeco_container" width="160" height="336" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/Shop.png" sourcerect="0,0,160,336" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="111,199,175,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
+    <LightComponent range="0" lightcolor="111,199,175,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Map/Outposts/Art/Shop.png" sourcerect="400,672,160,336" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="opdeco_shopsuit1" width="160" height="336" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/Shop.png" sourcerect="160,0,160,336" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="111,199,175,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
+    <LightComponent range="0" lightcolor="111,199,175,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Map/Outposts/Art/Shop.png" sourcerect="560,672,160,336" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="opdeco_shopsuit2" nameidentifier="opdeco_shopsuit1" width="160" height="336" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/Shop.png" sourcerect="320,0,160,336" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="111,199,175,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
+    <LightComponent range="0" lightcolor="111,199,175,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.0">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Map/Outposts/Art/Shop.png" sourcerect="720,672,160,336" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -576,19 +576,19 @@
   <!--Research tanks and monitoring tables-->
   <Item name="" identifier="op_researchcontainmenttank1" width="414" height="297" texturescale="1.0,1.0" scale="0.5" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/MedicalItemResearch.png" sourcerect="0,6,414,297" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/MedicalItemResearchLights.png" sourcerect="0,6,414,297" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="op_researchtable" width="732" height="248" texturescale="1.0,1.0" scale="0.5" category="Decorative" requirecampaigninteract="true">
     <sprite texture="Content/Map/Outposts/Art/MedicalItemResearch.png" sourcerect="3,311,732,248" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/MedicalItemResearchLights.png" sourcerect="3,311,732,248" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="op_researchcontainmenttank2" nameidentifier="op_researchcontainmenttank1" width="201" height="281" texturescale="1.0,1.0" scale="0.5" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/MedicalItemResearch.png" sourcerect="3,567,201,281" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/MedicalItemResearchLights.png" sourcerect="3,567,201,281" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -596,7 +596,7 @@
     <sprite texture="Content/Map/Outposts/Art/MedicalItemResearch.png" sourcerect="209,562,221,364" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     <DecorativeSprite texture="Content/Map/Outposts/Art/MedicalItemResearch.png" sourcerect="432,564,222,357" depth="0.98" origin="0.5,0.5"/>
     <DecorativeSprite texture="Content/Map/Outposts/Art/MedicalItemResearch.png" sourcerect="742,662,63,91" depth="0.975" origin="0.5,0.5" offset="80,80" offsetanim="Noise" rotationanim="Noise" rotation="80" rotationspeed="0.5" offsetanimspeed="0.05" />
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/MedicalItemResearchLights.png" sourcerect="209,562,221,364" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -608,7 +608,7 @@
     </Fabricator>
     <ItemContainer capacity="0" canbeselected="false" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true"/>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true"/>
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="241,497,238,396" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -620,13 +620,13 @@
     </Fabricator>
     <ItemContainer capacity="0" canbeselected="false" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true"/>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true"/>
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="721,497,238,396" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="op_workbenchlamp" width="127" height="119" texturescale="1.0,1.0" scale="0.5" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/Shop.png" sourcerect="96,481,127,119" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,117,0,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,117,0,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/Shop.png" sourcerect="96,597,127,134" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -766,7 +766,7 @@
 
   <Item name="" identifier="opdeco_heater" width="144" height="336" texturescale="1.0,1.0" scale="0.5" category="Decorative" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/Storage.png" sourcerect="1291,1689,144,333" depth="0.95" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="246,92,59,0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false" flicker="0.0" pulseamont="0.2" pulsefrequency="0.2">
+    <LightComponent range="0" lightcolor="246,92,59,0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false" flicker="0.0" pulseamont="0.2" pulsefrequency="0.2">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <Upgrade gameversion="0.18.13.0" lightcolor="246,92,59,0" />
       <sprite texture="Content/Map/Outposts/Art/Storage.png" sourcerect="1441,1689,144,333" depth="0.1" origin="0.5,0.5" alpha="1.0" />
@@ -787,7 +787,7 @@
   <!--Tunnel wall with flickering lights-->
   <Item name="" identifier="opbg_tunnel3" allowattachitems="true" width="831" height="416" scale="0.5" category="Decorative" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/TunnelWalls.png" sourcerect="0,416,831,416" depth="0.98" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,56,56,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="0.1" blinkfrequency="1" >      
+    <LightComponent range="0" lightcolor="255,56,56,111" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="0.1" blinkfrequency="1" >      
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Map/Outposts/Art/TunnelWalls.png" sourcerect="0,1248,832,372" depth="0.1" origin="0.5,0.55" alpha="1.0" />
     </LightComponent>
@@ -795,69 +795,69 @@
   <!--Tunnel Light Tower-->
   <Item name="" identifier="op_lighttower" width="176" height="352" texturescale="1.0,1.0" scale="0.5" category="Decorative" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/TunnelWalls.png" sourcerect="849,1697,176,352" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="160.0" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="640" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/TunnelWalls.png" sourcerect="671,1697,176,352" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <!--Wall Decorations-->
   <Item name="" identifier="op_lightbox1" width="163" height="209" texturescale="1.0,1.0" scale="0.5" category="Decorative" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/GenericAssets2.png" sourcerect="1337,590,163,209" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="60.0" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false"/>
+    <LightComponent range="240" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false"/>
   </Item>
   <Item name="" identifier="op_lightbox2" nameidentifier="op_lightbox1" width="159" height="206" texturescale="1.0,1.0" scale="0.5" category="Decorative" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/GenericAssets2.png" sourcerect="1526,586,159,206" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="60.0" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false"/>
+    <LightComponent range="240" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false"/>
   </Item>
   <Item name="" identifier="op_lightbox3" nameidentifier="op_lightbox1" width="289" height="194" texturescale="1.0,1.0" scale="0.5" category="Decorative" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/GenericAssets2.png" sourcerect="1760,394,289,194" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="60.0" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false"/>
+    <LightComponent range="240" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false"/>
   </Item>
   <Item name="" identifier="op_lightbox4" nameidentifier="op_lightbox1" width="145" height="194" texturescale="1.0,1.0" scale="0.5" category="Decorative" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/GenericAssets2.png" sourcerect="1759,1607,145,194" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="60.0" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false"/>
+    <LightComponent range="240" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false"/>
   </Item>
   <Item name="" identifier="op_lightbox5" nameidentifier="op_lightbox1" width="145" height="194" texturescale="1.0,1.0" scale="0.5" category="Decorative" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/GenericAssets2.png" sourcerect="1903,1607,144,194" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="60.0" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false"/>
+    <LightComponent range="240" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false"/>
   </Item>
   <!-- Medical -->
   <Item name="" identifier="opdeco_mountedmonitor1" nameidentifier="medicalmonitor" width="96" height="128" texturescale="1.0,1.0" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="0,0,96,128" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,255" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,255" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="96,0,96,128" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="opdeco_medcompartment1" nameidentifier="medicalcompartment" tags="container,suppliescontainer" linkable="true" width="80" height="80" texturescale="1.0,1.0" scale="0.5" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="192,0,80,80" depth="0.84" premultiplyalpha="false" origin="0.5,0.5" />
-    <ItemContainer capacity="3" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="7" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="opdeco_medcompartment2" nameidentifier="medicalcompartment" tags="container,suppliescontainer" linkable="true" width="48" height="80" texturescale="1.0,1.0" scale="0.5" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="272,0,48,80" depth="0.84" premultiplyalpha="false" origin="0.5,0.5" />
-    <ItemContainer capacity="2" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="4" slotsperrow="2" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.15,0.16" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="opdeco_medcompartment3" nameidentifier="medicalcompartment" tags="container,suppliescontainer" linkable="true" width="80" height="128" texturescale="1.0,1.0" scale="0.5" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="400,0,80,128" depth="0.84" premultiplyalpha="false" origin="0.5,0.5" />
-    <ItemContainer capacity="6" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="13" slotsperrow="4" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.18,0.25" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="opdeco_surgicallights" width="272" height="128" texturescale="1.0,1.0" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="752,0,272,128" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <Upgrade gameversion="0.18.12.0" lightcolor="255,255,255,0" />
       <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="480,0,272,128" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="opdeco_xrayscreen" width="208" height="144" texturescale="1.0,1.0" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="304,160,208,144" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false" flicker="0.1" pulsefrequency="0.5" pulseamount="0.2">      
+    <LightComponent range="0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false" flicker="0.1" pulsefrequency="0.5" pulseamount="0.2">      
       <Upgrade gameversion="0.17.15.0" range="0" />
       <Upgrade gameversion="0.18.12.0" lightcolor="255,255,255,0" />
       <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="96,160,208,144" depth="0.1" origin="0.5,0.5" alpha="1.0" />
@@ -865,7 +865,7 @@
   </Item>
   <Item name="" identifier="opdeco_xrayscreen2" nameidentifier="opdeco_xrayscreen" width="369" height="133" texturescale="1.0,1.0" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/MedicalColonyAssets.png" sourcerect="0,0,369,133" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false" flicker="0.1" pulsefrequency="0.5" pulseamount="0.2">      
+    <LightComponent range="0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false" flicker="0.1" pulsefrequency="0.5" pulseamount="0.2">      
       <Upgrade gameversion="0.17.15.0" range="0" />
       <Upgrade gameversion="0.18.12.0" lightcolor="255,255,255,0" />
       <sprite texture="Content/Map/Outposts/Art/MedicalColonyAssets.png" sourcerect="0,133,369,133" depth="0.1" origin="0.5,0.5" alpha="1.0" />
@@ -873,7 +873,7 @@
   </Item>
   <Item name="" identifier="opdeco_xrayscreen3" nameidentifier="opdeco_xrayscreen" width="192" height="208" texturescale="1.0,1.0" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/MedicalColonyAssets.png" sourcerect="199,266,192,208" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false" flicker="0.1" pulsefrequency="0.5" pulseamount="0.2">
+    <LightComponent range="0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false" flicker="0.1" pulsefrequency="0.5" pulseamount="0.2">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <Upgrade gameversion="0.18.12.0" lightcolor="255,255,255,0" />
       <sprite texture="Content/Map/Outposts/Art/MedicalColonyAssets.png" sourcerect="0,267,192,208" depth="0.1" origin="0.5,0.5" alpha="1.0" />
@@ -948,11 +948,11 @@
       </StatusEffect>
       <StatusEffect type="OnBroken" target="Contained" Condition="0.0" setvalue="true" />
     </Reactor>
-    <LightComponent range="300.0" lightcolor="255,186,152,119" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="1200" lightcolor="255,186,152,119" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
       <sprite texture="Content/Map/Outposts/Art/GenericAssets2.png" depth="0.025" sourcerect="649,336,575,849" alphablend="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="400" lightcolor="255,0,0,250" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1">
+    <LightComponent range="1600" lightcolor="255,0,0,250" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1">
       <IsActive targetitemcomponent="Reactor" temperaturecritical="eq true" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
@@ -985,25 +985,25 @@
       <output name="condition_out" displayname="connection.conditionout" />
       <output name="fuel_percentage_left" displayname="connection.fuelpercentageout" />
     </ConnectionPanel>
-    <ItemContainer capacity="4" maxstacksize="1" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
+    <ItemContainer capacity="9" maxstacksize="2" canbeselected="true" hudpos="0.5,0.15" slotsperrow="3" uilabel="FuelRods">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="3" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <RequiredItem items="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
-      <Containable items="fuelrod">
+      <Containable items="fuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="80.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="fulguriumfuelrod">
+      <Containable items="fulguriumfuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="150.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="thoriumfuelrod">
+      <Containable items="thoriumfuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="100.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="fulguriumfuelrodvolatile">
+      <Containable items="fulguriumfuelrodvolatile,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="150.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="huskfigurine">
+      <Containable items="huskfigurine,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="0" disabledeltatime="true" />
       </Containable>
     </ItemContainer>
@@ -1046,9 +1046,9 @@
       </StatusEffect>
     </OxygenGenerator>
     <trigger />
-    <ItemContainer capacity="5" maxstacksize="1" canbeselected="true" hideitems="false" itempos="163,-290" iteminterval="42,0" msg="ItemMsgOxygenRefill">
+    <ItemContainer capacity="11" maxstacksize="2" canbeselected="true" hideitems="false" itempos="163,-290" iteminterval="42,0" msg="ItemMsgOxygenRefill">
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="oxygentank" />
+      <Containable items="oxygentank,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -1073,11 +1073,11 @@
   <Item name="" identifier="outpostterminal" category="Machine" Tags="smallitem" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Sprite texture="Content/Map/Outposts/Art/Storage.png" depth="0.8" sourcerect="1544,506,142,149" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Map/Outposts/Art/Storage.png" depth="0.025" sourcerect="1709,506,142,149" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="0.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false" blinkfrequency="1">
+    <LightComponent range="0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false" blinkfrequency="1">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Map/Outposts/Art/Storage.png" depth="0.025" sourcerect="1869,506,142,149" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -1128,23 +1128,23 @@
   <Item name="" identifier="opdeco_cabinetsdorm" allowattachitems="false" width="110" height="398" texturescale="1.0,1.0" scale="0.5" category="Decorative">
     <Upgrade gameversion="0.16.2.0" refreshrect="true" PositionY="-88" />
     <sprite texture="Content/Map/Outposts/Art/Storage.png" sourcerect="1760,1360,117,309" depth="0.84" premultiplyalpha="false" origin="0.5,0.5" />
-    <ItemContainer capacity="6" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="13" slotsperrow="4" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.16,0.22" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
     </ItemContainer>
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
     <Upgrade gameversion="1.1.0.0" campaignsaveonly="true">
       <ItemContainer>
-        <Containable items="smallitem,mediumitem" />
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
         <ClearSubContainerRestrictions />
       </ItemContainer>
     </Upgrade>
   </Item>
   <Item name="" identifier="opdeco_trashcan" tags="outposttrashcan" width="122" height="201" texturescale="1.0,1.0" scale="0.5" category="Decorative" AllowStealingContainedItems="true">
     <sprite texture="Content/Map/Outposts/Art/Storage.png" sourcerect="1662,914,125,205" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <ItemContainer capacity="3" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="7" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.18,0.25" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="opdeco_hrflyers" requirecampaigninteract="true" allowattachitems="true" width="416" height="224" texturescale="1.0,1.0" scale="0.5" category="Decorative">
diff --git a/Content/Map/Pirates/PirateItems.xml b/Content/Map/Pirates/PirateItems.xml
index 11b470b8..9f12a09f 100644
--- a/Content/Map/Pirates/PirateItems.xml
+++ b/Content/Map/Pirates/PirateItems.xml
@@ -23,15 +23,15 @@
   </piratedecor>
   <Item name="" identifier="separatistcommoner1" nameidentifier="pirateclothes" aliases="pirateclothes" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing,separatists" scale="0.5" impactsoundtag="impact_soft">
     <Price baseprice="225" sold="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantoutpost" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" maxavailable="5" sold="true">
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" maxavailable="5" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.3" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.9" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -59,14 +59,14 @@
   </Item>
   <Item name="" identifier="piratecaptainhat" category="Equipment" tags="smallitem,clothing,separatists" impactsoundtag="impact_metal_heavy" scale="0.4" cargocontaineridentifier="metalcrate">
     <Price baseprice="175" sold="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantoutpost" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
-      <Price storeidentifier="merchantcity" minavailable="2" maxavailable="5" sold="true">
+      <Price storeidentifier="merchantcity" minavailable="6" maxavailable="5" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.9" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="10" />
@@ -81,10 +81,10 @@
   </Item>
   <Item name="" identifier="piratebandana" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,separatists" description="" scale="0.5" impactsoundtag="impact_soft">
     <Price baseprice="15" sold="false" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantoutpost" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" maxavailable="5" sold="true">
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="9" maxavailable="5" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
     </Price>
@@ -111,14 +111,14 @@
       <Price storeidentifier="merchantoutpost" minavailable="0" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" maxavailable="5" sold="true">
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" maxavailable="5" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
-      <Price storeidentifier="merchantmilitary" multiplier="1.3" minavailable="4" maxavailable="6" sold="true">
+      <Price storeidentifier="merchantmilitary" multiplier="3.9" minavailable="12" maxavailable="6" sold="true">
         <Reputation faction="separatists" min="50"/>
       </Price>
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <Deconstruct time="40">
       <Item identifier="ballisticfiber" />
@@ -138,17 +138,17 @@
   </Item>
   <Item name="" fallbacknameidentifier="ballistichelmet1" identifier="piratehelmet" aliases="ballistichelmet" category="Equipment" tags="smallitem,separatists" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_heavy" scale="0.4">
     <Price baseprice="225" sold="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantoutpost" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
-      <Price storeidentifier="merchantmilitary" multiplier="1.3" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantmilitary" multiplier="3.9" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -166,15 +166,15 @@
   </Item>
   <Item name="" nameidentifier="pirateclothes" identifier="separatistcommoner2" aliases="pirateclothesnovice" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing,separatists" scale="0.5" impactsoundtag="impact_soft">
     <Price baseprice="150" sold="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantoutpost" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.3" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.9" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -202,15 +202,15 @@
   </Item>
   <Item name="" identifier="separatistcommoner3" aliases="pirateclotheshard" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing,separatists" scale="0.5" impactsoundtag="impact_soft">
     <Price baseprice="300" sold="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantoutpost" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="30"/>
       </Price>
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.3" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.9" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -239,18 +239,18 @@
   </Item>
 
 
-  <Item name="" identifier="40mmnuke" category="Weapon" maxstacksize="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade,separatists" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="grenadelauncher" amount="1" spawnprobability="0"/>
+  <Item name="" identifier="40mmnuke" category="Weapon" maxstacksize="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade,separatists" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="grenadelauncher" amount="2" spawnprobability="0"/>
     <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" spawnprobability="0"/>
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
     <Price baseprice="400" sold="false">
       <Price storeidentifier="merchantoutpost" minavailable="0" maxavailable="1" sold="true">
         <Reputation faction="separatists" min="70"/>
       </Price>
-      <Price storeidentifier="merchantcity" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantcity" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="70"/>
       </Price>
-      <Price storeidentifier="merchantmilitary" minavailable="2" maxavailable="5" sold="true">
+      <Price storeidentifier="merchantmilitary" minavailable="6" maxavailable="5" sold="true">
         <Reputation faction="separatists" min="70"/>
       </Price>
     </Price>
@@ -305,17 +305,17 @@
     </Projectile>
   </Item>
 
-  <Item name="" identifier="molotovcoctail" category="Equipment" maxstacksize="12" cargocontaineridentifier="metalcrate" impacttolerance="5" Scale="0.5" tags="smallitem,light,provocative,separatists" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="molotovcoctail" category="Equipment" maxstacksize="24" cargocontaineridentifier="metalcrate" impacttolerance="5" Scale="0.5" tags="smallitem,light,provocative,separatists" impactsoundtag="impact_metal_light" isshootable="true">
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
     <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" spawnprobability="0"/>
-    <Price baseprice="90" minavailable="6" sold="false">
-      <Price storeidentifier="merchantoutpost" minavailable="2" maxavailable="4" sold="true">
+    <Price baseprice="90" minavailable="18" sold="false">
+      <Price storeidentifier="merchantoutpost" minavailable="6" maxavailable="4" sold="true">
         <Reputation faction="separatists" min="50"/>
       </Price>
-      <Price storeidentifier="merchantcity" minavailable="3" maxavailable="6" sold="true">
+      <Price storeidentifier="merchantcity" minavailable="9" maxavailable="6" sold="true">
         <Reputation faction="separatists" min="50"/>
       </Price>
-      <Price storeidentifier="merchantmilitary" minavailable="5" maxavailable="10" sold="true">
+      <Price storeidentifier="merchantmilitary" minavailable="15" maxavailable="10" sold="true">
         <Reputation faction="separatists" min="50"/>
       </Price>
     </Price>
@@ -323,7 +323,7 @@
     <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="308,165,40,64" depth="0.55" origin="0.5,0.5" />
     <Body width="40" height="60" density="12" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" throwforce="4.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,100,50,255" Flicker="0.5" range="600" IsOn="false">
+    <LightComponent LightColor="255,100,50,255" Flicker="0.5" range="2400" IsOn="false">
       <StatusEffect type="OnUse" targettype="This" IsOn="true">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
         <sound file="Content/Items/Tools/FlareIgnite.ogg" range="800.0" />
@@ -359,19 +359,19 @@
     </LightComponent>
   </Item>
 
-  <Item name="" identifier="dirtybomb" category="Weapon" Tags="smallitem,explosive,separatists" allowasextracargo="true" maxstacksize="8" Scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="dirtybomb" category="Weapon" Tags="smallitem,explosive,separatists" allowasextracargo="true" maxstacksize="16" Scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
     <Price baseprice="240" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" minavailable="0" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" minavailable="0" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="50"/>
       </Price>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" maxavailable="4" sold="true">
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" maxavailable="4" sold="true">
         <Reputation faction="separatists" min="50"/>
       </Price>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" maxavailable="8" sold="true">
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" maxavailable="8" sold="true">
         <Reputation faction="separatists" min="50"/>
       </Price>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true">
diff --git a/Content/Map/Thalamus/thalamusitems.xml b/Content/Map/Thalamus/thalamusitems.xml
index 2dab7c83..e1159aaf 100644
--- a/Content/Map/Thalamus/thalamusitems.xml
+++ b/Content/Map/Thalamus/thalamusitems.xml
@@ -77,7 +77,7 @@
     <Body width="100" height="230" bodytype="Static"/>
     <ItemContainer hideitems="true" drawinventory="true" capacity="1" slotsperrow="6" itempos="74,-281" iteminterval="0,0" itemrotation="0" canbeselected="false" containedspritedepth="0.79">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="fleshguntendon" />
+      <Containable items="fleshguntendon,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!-- 4 shots -->
       <StatusEffect type="OnUse" target="This" disabledeltatime="true">
         <SpawnItem identifiers="fleshguntendon1" spawnposition="ThisInventory" />
@@ -251,9 +251,9 @@
     <Sprite texture="thalamus.png" depth="0.6" sourcerect="96,96,320,192" origin="0.5,0.5" />
     <BrokenSprite texture="thalamus.png" depth="0.6" sourcerect="416,96,320,192" origin="0.5,0.5" />
     <Body width="300" height="150" bodytype="Static" />
-    <ItemContainer capacity="4" slotsperrow="2" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" accessonlywhenbroken="true">
+    <ItemContainer capacity="9" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" accessonlywhenbroken="true">
       <GuiFrame relativesize="0.18,0.25" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       <StatusEffect type="OnDeath" target="This">
         <Sound file="Content/Map/Thalamus/Sounds/CARRIER_organs1.ogg" range="2000" selectionmode="Random"/>
         <ParticleEmitter particle="organeruption" particleamount="50" scalemin="0.5" scalemax="1" velocitymin="100" velocitymax="500" anglemin="0" anglemax="360" />
diff --git a/Content/Missions.xml b/Content/Missions.xml
index 71a6c7b2..923ffc29 100644
--- a/Content/Missions.xml
+++ b/Content/Missions.xml
@@ -7,7 +7,7 @@
     type="SalvageRuin"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     achievementidentifier="artifactmission"
     sonaricon="artifact"
     spawntype="ruin"
@@ -33,7 +33,7 @@
     type="SalvageCave"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     achievementidentifier="artifactmission"
     sonaricon="artifact"
     spawntype="cave"
@@ -58,7 +58,7 @@
     type="SalvageCave"
     difficulty="4"
     commonness="100"
-    reward="6000"
+    reward="24000"
     achievementidentifier="artifactmission"
     sonaricon="artifact"
     spawntype="AbyssCave"
@@ -83,7 +83,7 @@
     description=""
     difficulty="3"
     commonness="0"
-    reward="3500"
+    reward="14000"
     achievementidentifier="artifactmission"
     sonaricon="artifact"
     spawntype="ruin"
@@ -120,7 +120,7 @@
     type="SalvageWreck"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     achievementidentifier="salvagewreckmission"
     spawntype="wreck"
     showmessagewhenpickedup="true"
@@ -155,7 +155,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="3000"
+    reward="12000"
     achievementidentifier="salvagewreckmission"
     spawntype="wreck"
     showmessagewhenpickedup="true"
@@ -192,7 +192,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     achievementidentifier="salvagewreckmission"
     spawntype="wreck"
     showmessagewhenpickedup="true"
@@ -233,7 +233,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="2000"
+    reward="8000"
     spawntype="wreck"
     ContainerTag="cargocontainer"
     PartiallyRetrievedMessage="missionmessage.lostcargo.partiallyretrieved"    
@@ -321,7 +321,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="3000"
+    reward="12000"
     spawntype="wreck"
     ContainerTag="cargocontainer"
     PartiallyRetrievedMessage="missionmessage.lostcargo.partiallyretrieved"    
@@ -411,7 +411,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     spawntype="wreck"
     ContainerTag="cargocontainer"
     PartiallyRetrievedMessage="missionmessage.lostcargo.partiallyretrieved"    
@@ -500,7 +500,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="2000"
+    reward="8000"
     spawntype="wreck"
     ContainerTag="cargocontainer"
     PartiallyRetrievedMessage="missionmessage.lostcargo.partiallyretrieved"
@@ -533,7 +533,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="3000"
+    reward="12000"
     spawntype="wreck"
     showmessagewhenpickedup="true"
     requirewreck="true">
@@ -564,7 +564,7 @@
       type="EliminateTargets"
       difficulty="4"
       commonness="100"
-      reward="4000"
+      reward="16000"
       sonarlabel="target"
       targetitems="thalamusbrain1"
       targetsub="Wreck"
@@ -586,7 +586,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     maxsonarmarkerdistance="10000">
     <monster character="Hammerhead_m" min="2" max="3"/>
     <Reputation identifier="location" amount="1" />
@@ -601,7 +601,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000"
     monsterfile="Hammerheadgold_m">
     <monster character="Hammerhead_m" min="2" max="3"/>
@@ -617,7 +617,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="1500"
+    reward="6000"
     maxsonarmarkerdistance="10000"
     monsterfile="Crawler_large">
     <monster character="crawler" min="3" max="4"/>
@@ -632,7 +632,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     maxsonarmarkerdistance="10000"
     monsterfile="Moloch_m">
     <Reputation identifier="location" amount="2" />
@@ -647,7 +647,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="5000"
+    reward="20000"
     maxsonarmarkerdistance="10000"
     monsterfile="Molochblack_m">
     <Reputation identifier="location" amount="2" />
@@ -661,7 +661,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000"
     sonarlabel="character.crawler"
     monsterfile="crawlerbroodmother_m">
@@ -677,7 +677,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="4500"
+    reward="18000"
     maxsonarmarkerdistance="10000"
     sonarlabel="character.crawler"
     monsterfile="crawlerbroodmother_m">
@@ -693,7 +693,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="5000"
+    reward="20000"
     maxsonarmarkerdistance="10000">
     <monster character="hammerheadmatriarch" count="1"/>
     <monster character="hammerhead" min="3" max="5"/>
@@ -709,7 +709,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000">
     <monster character="hammerheadmatriarch" count="1"/>
     <monster character="hammerhead" min="2" max="2"/>
@@ -725,7 +725,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000"
     sonarlabel="character.spineling"
     monsterfile="spineling_giant">
@@ -742,7 +742,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="4500"
+    reward="18000"
     maxsonarmarkerdistance="10000"
     sonarlabel="character.spineling"
     monsterfile="spineling_giant">
@@ -758,7 +758,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="5000"
+    reward="20000"
     maxsonarmarkerdistance="10000">
     <monster character="tigerthresher" min="8" max="10"/>
     <monster character="bonethresher" min="2" max="3"/>
@@ -774,7 +774,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     maxsonarmarkerdistance="10000">
     <monster character="tigerthresher" min="5" max="6"/>
     <monster character="bonethresher" min="1" max="2"/>
@@ -789,7 +789,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     maxsonarmarkerdistance="10000">
     <monster character="crawler" min="5" max="6"/>
     <Reputation identifier="location" amount="1" />
@@ -806,7 +806,7 @@
     type="Monster"
     difficulty="3"
     commonness="33"
-    reward="3500"
+    reward="14000"
     successmessage="missionsuccess.killcrawlerswarm1"
     maxsonarmarkerdistance="10000">
     <monster character="crawler" min="14" max="15"/>
@@ -824,7 +824,7 @@
     type="Monster"
     difficulty="3"
     commonness="33"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000">
     <monster character="crawler" min="10" max="12"/>
     <monster character="crawlerbroodmother" min="1" max="1"/>
@@ -841,7 +841,7 @@
     type="Monster"
     difficulty="3"
     commonness="33"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000">
     <monster character="crawlerhusk" min="10" max="12"/>
     <Reputation identifier="location" amount="2" />
@@ -858,7 +858,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     maxsonarmarkerdistance="10000">
     <monster character="Spineling" min="5" max="6"/>
     <Reputation identifier="location" amount="1" />
@@ -874,7 +874,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     maxsonarmarkerdistance="10000">
     <monster character="Spineling" min="14" max="15"/>
     <Reputation identifier="location" amount="1" />
@@ -890,7 +890,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="5500"
+    reward="22000"
     maxsonarmarkerdistance="10000">
     <monster character="Spineling" min="8" max="10"/>
     <monster character="Spineling_Morbusine" min="4" max="6"/>
@@ -904,7 +904,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     sonarlabel="character.mudraptor"
     maxsonarmarkerdistance="10000">
     <monster character="mudraptor_unarmored" min="2" max="3"/>
@@ -919,7 +919,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     sonarlabel="character.mudraptor"
     maxsonarmarkerdistance="10000">
     <monster character="mudraptor_unarmored" min="2" max="3"/>
@@ -936,7 +936,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     sonarlabel="character.mudraptor"
     maxsonarmarkerdistance="10000">
     <monster character="mudraptor_unarmored" min="2" max="3"/>
@@ -954,7 +954,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="5000"
+    reward="20000"
     sonarlabel="character.mudraptor"
     maxsonarmarkerdistance="10000">
     <monster character="mudraptor_unarmored" min="1" max="2"/>
@@ -973,7 +973,7 @@
     sideobjective="true"
     difficulty="4"
     commonness="0"
-    reward="8500"
+    reward="34000"
     sonarlabel="target"
     spawntype="Abyss"
     maxsonarmarkerdistance="20000"
@@ -992,7 +992,7 @@
     sideobjective="true"
     difficulty="4"
     commonness="0"
-    reward="8500"
+    reward="34000"
     sonarlabel="target"
     spawntype="Abyss"
     maxsonarmarkerdistance="20000"
@@ -1011,7 +1011,7 @@
     sideobjective="true"
     difficulty="4"
     commonness="0"
-    reward="8500"
+    reward="34000"
     sonarlabel="target"
     spawntype="Abyss"
     maxsonarmarkerdistance="20000"
@@ -1030,7 +1030,7 @@
     commonness="100"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="explosivecrate" reward="200" maxcount="15">
+      <Item identifier="explosivecrate" reward="800" maxcount="15">
         <Item identifier="compoundn" amount="10"/>
         <Item identifier="detonator" amount="10">
           <Item identifier="compoundn"/>
@@ -1050,7 +1050,7 @@
     commonness="100"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="explosivecrate" reward="400" maxcount="10">
+      <Item identifier="explosivecrate" reward="1600" maxcount="10">
         <Item identifier="volatilecompoundn" amount="10"/>
         <Item identifier="detonator" amount="10">
           <Item identifier="volatilecompoundn"/>
@@ -1070,7 +1070,7 @@
     commonness="100"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="securemetalcrate" reward="600" maxcount="4">
+      <Item identifier="securemetalcrate" reward="2400" maxcount="4">
         <Item identifier="smg" amount="1"/>
         <Item identifier="smgmagazine" amount="9"/>
         <Item identifier="fraggrenade" amount="2"/>
@@ -1087,11 +1087,11 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Items>
-      <Item identifier="chemicalcrate" reward="140" maxcount="20">
+      <Item identifier="chemicalcrate" reward="560" maxcount="20">
         <Item identifier="antidama2" amount="5"/>
         <Item identifier="sulphuricacid" amount="5"/>
         <Item identifier="morbusine" amount="5"/>
@@ -1112,18 +1112,18 @@
     type="Cargo"
     difficulty="2"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Items>
-      <Item identifier="chemicalcratedamaged" reward="160" maxcount="2">
+      <Item identifier="chemicalcratedamaged" reward="640" maxcount="2">
         <Item identifier="antidama2" amount="5"/>
         <Item identifier="potassium" amount="5"/>
         <Item identifier="lithium" amount="5"/>
         <Item identifier="flashpowder" amount="3"/>
         <Item identifier="chloralhydrate" amount="2"/>
       </Item>
-      <Item identifier="chemicalcrate" reward="160" maxcount="18">
+      <Item identifier="chemicalcrate" reward="640" maxcount="18">
         <Item identifier="antidama2" amount="5"/>
         <Item identifier="potassium" amount="5"/>
         <Item identifier="lithium" amount="5"/>
@@ -1142,10 +1142,10 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="chemicalcrate" reward="250" maxcount="12">
+      <Item identifier="chemicalcrate" reward="1000" maxcount="12">
         <Item identifier="huskeggsbasic" amount="10"/>
       </Item>
     </Items>
@@ -1160,10 +1160,10 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="700"
+    reward="2800"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="explosivecrate" reward="350" maxcount="10">
+      <Item identifier="explosivecrate" reward="1400" maxcount="10">
         <Item identifier="nitroglycerin" amount="20"/>
       </Item>
     </Items>
@@ -1178,10 +1178,10 @@
     type="Cargo"
     difficulty="3"
     commonness="100"
-    reward="700"
+    reward="2800"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="magneticsuspensioncrate" reward="800" maxcount="4">
+      <Item identifier="magneticsuspensioncrate" reward="3200" maxcount="4">
         <Item identifier="batterycell" amount="1"/>
         <Item identifier="volatilenitroglycerin" amount="10"/>
       </Item>
@@ -1197,11 +1197,11 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Items>
-      <Item identifier="metalcrate" reward="500" maxcount="10">
+      <Item identifier="metalcrate" reward="2000" maxcount="10">
         <Item identifier="clownmask" amount="5"/>
         <Item identifier="clowncostume" amount="5"/>
         <Item identifier="bikehorn" amount="10"/>
@@ -1218,12 +1218,12 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Reputation identifier="location" amount="1" amountforopposingfaction="-1" />
     <Items>
-      <Item identifier="metalcrate" reward="200" maxcount="25">
+      <Item identifier="metalcrate" reward="800" maxcount="25">
         <Item identifier="iron" amount="10"/>
         <Item identifier="lead" amount="10"/>
         <Item identifier="copper" amount="10"/>
@@ -1240,12 +1240,12 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Reputation identifier="location" amount="1" amountforopposingfaction="-1" />
     <Items>
-      <Item identifier="metalcrate" reward="100" maxcount="25">
+      <Item identifier="metalcrate" reward="400" maxcount="25">
         <Item identifier="magnesium" amount="5"/>
         <Item identifier="copper" amount="5"/>
         <Item identifier="steel" amount="5"/>
@@ -1265,12 +1265,12 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Reputation identifier="location" amount="1" amountforopposingfaction="-1" />
     <Items>
-      <Item identifier="mediccrate" reward="120" maxcount="20">
+      <Item identifier="mediccrate" reward="480" maxcount="20">
         <Item identifier="antidama1" amount="5"/>
         <Item identifier="antidama2" amount="5"/>
         <Item identifier="antibloodloss1" amount="5"/>
@@ -1288,12 +1288,12 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="1000"
+    reward="4000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Reputation identifier="location" amount="1" amountforopposingfaction="-1" />
     <Items>
-      <Item identifier="mediccrate" reward="1000" maxcount="1">
+      <Item identifier="mediccrate" reward="4000" maxcount="1">
         <Item identifier="morbusineantidote" amount="5"/>
       </Item>
     </Items>
@@ -1310,7 +1310,7 @@
     type="Beacon"
     difficulty="1"
     Commonness="0"
-    reward="1000"
+    reward="4000"
     sideobjective="false">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="0,256,256,256" color="243,146,55"/>
     <message text="missionmessage0.beaconmission" />
@@ -1323,7 +1323,7 @@
     tags="beacon"
     type="Beacon"
     difficulty="2"
-    reward="1500"
+    reward="6000"
     minleveldifficulty="0"
     maxleveldifficulty="35"
     sideobjective="true">
@@ -1348,7 +1348,7 @@
     achievementidentifier="beaconmission"
     type="Beacon"
     difficulty="2"
-    reward="2000"
+    reward="8000"
     sideobjective="true"
     minleveldifficulty="35"
     maxleveldifficulty="50">
@@ -1378,7 +1378,7 @@
     achievementidentifier="beaconmission"
     type="Beacon"
     difficulty="3"
-    reward="2500"
+    reward="10000"
     sideobjective="true"
     minleveldifficulty="50"
     maxleveldifficulty="100">
@@ -1410,7 +1410,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroyhumans"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="2"
     commonness="100"
     allowretry="true"
@@ -1441,7 +1441,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroyhumans"
     type="OutpostDestroy"
-    reward="4000"
+    reward="16000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1473,7 +1473,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroyhumans"
     type="OutpostDestroy"
-    reward="6000"
+    reward="24000"
     difficulty="4"
     commonness="100"
     allowretry="true"
@@ -1506,7 +1506,7 @@
     tags="abandonedoutpost"
     type="AbandonedOutpost"
     achievementidentifier="abandonedoutpostrescue"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1538,7 +1538,7 @@
     tags="abandonedoutpost"
     type="AbandonedOutpost"
     achievementidentifier="abandonedoutpostrescue"
-    reward="4500"
+    reward="18000"
     difficulty="4"
     commonness="100"
     allowretry="true"
@@ -1570,7 +1570,7 @@
     tags="abandonedoutpost"
     type="AbandonedOutpost"
     achievementidentifier="abandonedoutpostrescue"
-    reward="6000"
+    reward="24000"
     difficulty="4"
     commonness="100"
     allowretry="true"
@@ -1603,7 +1603,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1639,7 +1639,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="4500"
+    reward="18000"
     difficulty="4"
     commonness="100"
     allowretry="true"
@@ -1677,7 +1677,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1711,7 +1711,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostassassinate"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1741,7 +1741,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostassassinate"
     type="OutpostDestroy"
-    reward="4500"
+    reward="18000"
     difficulty="4"
     commonness="100"
     allowretry="true"
@@ -1773,7 +1773,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1801,7 +1801,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="50"
     allowretry="true"
@@ -1826,7 +1826,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="5000"
+    reward="20000"
     difficulty="4"
     commonness="50"
     allowretry="true"
@@ -1852,7 +1852,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="3000"
+    reward="12000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -1891,7 +1891,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="4000"
+    reward="16000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -1929,7 +1929,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="5000"
+    reward="20000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -1961,7 +1961,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="6000"
+    reward="24000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -1993,7 +1993,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="4500"
+    reward="18000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -2032,7 +2032,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="6500"
+    reward="26000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -2074,7 +2074,7 @@
     commonness="100"
     resourceHandoverAmount="0.25"
     positionType="mainpath"
-    reward="1200">
+    reward="4800">
     <Items>
       <Item identifier="quartz" />
       <Item identifier="quartz" />
@@ -2110,7 +2110,7 @@
     commonness="100"
     resourceHandoverAmount="0.25"
     positionType="mainpath"
-    reward="1200">
+    reward="4800">
     <Items>
       <Item identifier="pyromorphite" />
       <Item identifier="pyromorphite" />
@@ -2146,7 +2146,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.25"
-    reward="1600">
+    reward="6400">
     <Items>
       <Item identifier="diamond" />
       <Item identifier="diamond" />
@@ -2181,7 +2181,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.25"
-    reward="1600">
+    reward="6400">
     <Items>
       <Item identifier="galena" />
       <Item identifier="galena" />
@@ -2217,7 +2217,7 @@
     commonness="100"
     resourceHandoverAmount="0.25"
     positionType="mainpath"
-    reward="1400">
+    reward="5600">
     <Items>
       <Item identifier="uraniumore" />
       <Item identifier="uraniumore" />
@@ -2248,7 +2248,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.25"
-    reward="2000">
+    reward="8000">
     <Items>
       <Item identifier="uraniumore" />
       <Item identifier="uraniumore" />
@@ -2283,7 +2283,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.33"
-    reward="2100">
+    reward="8400">
     <Items>
       <Item identifier="triphylite" />
       <Item identifier="triphylite" />
@@ -2316,7 +2316,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.33"
-    reward="2100">
+    reward="8400">
     <Items>
       <Item identifier="langbeinite" />
       <Item identifier="langbeinite" />
@@ -2349,7 +2349,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.25"
-    reward="2400">
+    reward="9600">
     <Items>
       <Item identifier="ilmenite" />
       <Item identifier="ilmenite" />
@@ -2384,7 +2384,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.33"
-    reward="2700">
+    reward="10800">
     <Items>
       <Item identifier="thorianite" />
       <Item identifier="thorianite" />
@@ -2417,7 +2417,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.33"
-    reward="2700">
+    reward="10800">
     <Items>
       <Item identifier="titanite" />
       <Item identifier="titanite" />
@@ -2451,7 +2451,7 @@
     commonness="100"
     positionType="abysscave"
     resourceHandoverAmount="0.33"
-    reward="3600">
+    reward="14400">
     <Items>
       <Item identifier="physicorium" />
       <Item identifier="physicorium" />
@@ -2485,7 +2485,7 @@
     commonness="100"
     positionType="abysscave"
     resourceHandoverAmount="0.33"
-    reward="3600">
+    reward="14400">
     <Items>
       <Item identifier="fulgurium" />
       <Item identifier="fulgurium" />
@@ -2515,7 +2515,7 @@
     type="Escort"
     difficulty="1"
     commonness="100"
-    reward="1000"
+    reward="4000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.35">
@@ -2536,7 +2536,7 @@
     type="Escort"
     difficulty="1"
     commonness="100"
-    reward="1000"
+    reward="4000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.35">
@@ -2555,7 +2555,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="1500"
+    reward="6000"
     achievementidentifier="escortmission"
     baseescortedcharacters="2"
     scalingescortedcharacters="0.35">
@@ -2584,7 +2584,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="1500"
+    reward="6000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.35">
@@ -2616,7 +2616,7 @@
     type="Escort"
     difficulty="1"
     commonness="100"
-    reward="1500"
+    reward="6000"
     achievementidentifier="escortmission">
     <Characters>
       <Character from="escortnpcs1" identifier="vip" escortidentifier="vip" color="238,130,238"/>
@@ -2637,7 +2637,7 @@
     type="Escort"
     difficulty="1"
     commonness="100"
-    reward="1500"
+    reward="6000"
     achievementidentifier="escortmission">
     <Characters>
       <Character from="combatmissionseparatistnpcs" identifier="separatistcaptain" escortidentifier="vip" color="238,130,238"/>
@@ -2656,7 +2656,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="2500"
+    reward="10000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.3">
@@ -2677,7 +2677,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="2500"
+    reward="10000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.3">
@@ -2696,7 +2696,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="2500"
+    reward="10000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.35"
@@ -2733,7 +2733,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="2500"
+    reward="10000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.35"
@@ -2771,7 +2771,7 @@
     faction="separatists"
     difficulty="4"
     commonness="100"
-    reward="4000"
+    reward="16000"
     achievementidentifier="combatmissioncoalitionvsseparatists"
     addedmissiondifficultyperplayer="8">
     <Reputation identifier="coalition" amount="10" amountforopposingfaction="-10" />
@@ -2779,9 +2779,9 @@
     it's also possible to configure the submarines used in a pirate mission manually as follows.
     If these are left out, a random enemy submarine is chosen (provided there's a submarine that has a tag that matches one of the tags of this mission)
     <SubmarineTypes>
-      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="separatists" preferreddifficulty="10" alternatereward="3200"/>
-      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="separatists" preferreddifficulty="40" alternatereward="4400"/>
-      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="separatists" preferreddifficulty="70" alternatereward="5600"/>
+      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="separatists" preferreddifficulty="10" alternatereward="12800"/>
+      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="separatists" preferreddifficulty="40" alternatereward="17600"/>
+      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="separatists" preferreddifficulty="70" alternatereward="22400"/>
     </SubmarineTypes>    
     -->
     <Characters>
@@ -2823,7 +2823,7 @@
     faction="coalition"
     difficulty="4"
     commonness="100"
-    reward="4000"
+    reward="16000"
     achievementidentifier="combatmissionseparatistsvscoalition"
     addedmissiondifficultyperplayer="8">
     <Reputation identifier="separatists" amount="10" amountforopposingfaction="-10" />
@@ -2831,9 +2831,9 @@
     it's also possible to configure the submarines used in a pirate mission manually as follows.
     If these are left out, a random enemy submarine is chosen (provided there's a submarine that has a tag that matches one of the tags of this mission)
     <SubmarineTypes>
-      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="coalition" preferreddifficulty="10" alternatereward="3200"/>
-      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="coalition" preferreddifficulty="40" alternatereward="4400"/>
-      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="coalition" preferreddifficulty="70" alternatereward="5600"/>
+      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="coalition" preferreddifficulty="10" alternatereward="12800"/>
+      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="coalition" preferreddifficulty="40" alternatereward="17600"/>
+      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="coalition" preferreddifficulty="70" alternatereward="22400"/>
     </SubmarineTypes>    
     -->
     <Characters>
@@ -2886,9 +2886,9 @@
     it's also possible to configure the submarines used in a pirate mission manually as follows.
     If these are left out, a random enemy submarine is chosen (provided there's a submarine that has a tag that matches one of the tags of this mission)
     <SubmarineTypes>
-      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="coalition" preferreddifficulty="10" alternatereward="3200"/>
-      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="coalition" preferreddifficulty="40" alternatereward="4400"/>
-      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="coalition" preferreddifficulty="70" alternatereward="5600"/>
+      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="coalition" preferreddifficulty="10" alternatereward="12800"/>
+      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="coalition" preferreddifficulty="40" alternatereward="17600"/>
+      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="coalition" preferreddifficulty="70" alternatereward="22400"/>
     </SubmarineTypes>    
     -->
     <Characters>
@@ -2985,7 +2985,7 @@
     requiredlocationfaction="separatists"
     achievementidentifier="jailbreak_coalition"
     type="jailbreak"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -3012,7 +3012,7 @@
     requiredlocationfaction="coalition"
     achievementidentifier="jailbreak_separatists"
     type="jailbreak"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -3039,7 +3039,7 @@
     achievementidentifier="jailbreak_sootman"
     type="jailbreak"
     alloworderingrescuees="false"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="0"
     allowretry="true"
@@ -3125,7 +3125,7 @@
     type="Escort"
     description=""
     commonness="0"
-    reward="2000"
+    reward="8000"
     achievementidentifier="escortmission">
     <Characters>
       <Character from="customnpcs1" identifier="raptorowner" />
@@ -3146,7 +3146,7 @@
     tags="escort"
     type="Escort"
     commonness="0"
-    reward="1000"
+    reward="4000"
     achievementidentifier="escortmission">
     <Characters>
       <Item from="customnpcs1" identifier="radiationescapee" />
@@ -3166,7 +3166,7 @@
     tags="escort"
     type="Escort"
     commonness="0"
-    reward="1000"
+    reward="4000"
     achievementidentifier="escortmission">
     <Characters>
       <Item from="customnpcs1" identifier="eyeresearcher" />
@@ -3183,7 +3183,7 @@
     type="GoTo"
     difficulty="3"
     commonness="0"
-    reward="1000"
+    reward="4000"
     BlockLocationTypeChanges="true">
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="512,0,256,256" color="49,93,233"/>
     <TriggerEvent state="1" delay="5" eventidentifier="assassinationofjacovsubra4" campaignonly="true"/>
@@ -3194,7 +3194,7 @@
     identifier="huskcultspecialassassinate"
     type="OutpostDestroy"
     achievementidentifier="huskcultspecialassassinate"
-    reward="2000"
+    reward="8000"
     difficulty="4"
     commonness="0"
     allowretry="true"
@@ -3362,7 +3362,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2500"
+    reward="10000"
     maxsonarmarkerdistance="10000"
     monsterfile="Hammerhead_mNamed" count ="1">
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="512,768,256,256" color="214,50,48"/>
@@ -3377,7 +3377,7 @@
     description=""
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     sonarlabel="scantarget"
     targets="3"
     mintargetdistance="4000"
@@ -3413,7 +3413,7 @@
     type="ClearAlienRuins"
     difficulty="4"
     commonness="100"
-    reward="6000"
+    reward="24000"
     sonarlabel="target"
     targetitems="guardianpod"
     targetenemies="fractalguardian,fractalguardian2"
@@ -3437,7 +3437,7 @@
     type="ClearAlienRuins"
     difficulty="4"
     commonness="100"
-    reward="7000"
+    reward="28000"
     sonarlabel="target"
     targetitems="guardianpod"
     targetenemies="fractalguardian,fractalguardian2"
diff --git a/Content/Talents/Assistant/AfflictionsAssistant.xml b/Content/Talents/Assistant/AfflictionsAssistant.xml
index 643aa85a..4fa51812 100644
--- a/Content/Talents/Assistant/AfflictionsAssistant.xml
+++ b/Content/Talents/Assistant/AfflictionsAssistant.xml
@@ -12,8 +12,8 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1"
             resistancefor="damage"
-            minresistance="0.15"
-            maxresistance="0.15"
+            minresistance="0.3"
+            maxresistance="0.3"
             tag="provocative">
       <StatValue stattype="SoundRangeMultiplier" value="1.0" />
       <StatValue stattype="SightRangeMultiplier" value="1.0" />
@@ -33,9 +33,9 @@
     duration="1"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="SkillGainSpeed" value="0.2" />
-      <StatValue stattype="RepairSpeed" value="0.2" />
-      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.2" />
+      <StatValue stattype="SkillGainSpeed" value="0.8" />
+      <StatValue stattype="RepairSpeed" value="0.8" />
+      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.8" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="3,0" sheetelementsize="128,128" origin="0,0"/>
   </Affliction>
@@ -51,7 +51,7 @@
     duration="1"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="IncreaseFabricationQuality" value="1" />
+      <StatValue stattype="IncreaseFabricationQuality" value="2" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="2,0" sheetelementsize="128,128" origin="0,0"/>
   </Affliction>
@@ -190,11 +190,11 @@
     hideiconafterdelay="true"
     maxstrength="1"
     treatmentthreshold="1000"
-    duration="5"
+    duration="8"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1"
-      minspeedmultiplier="1.3" 
-      maxspeedmultiplier="1.3"/>
+      minspeedmultiplier="1.45" 
+      maxspeedmultiplier="1.45"/>
     <icon texture="Content/UI/MainIconsAtlas.png" sourcerect="128,896,128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
   
@@ -209,12 +209,12 @@
     duration="5"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="ElectricalSkillBonus" value="10" />
-      <StatValue stattype="HelmSkillBonus" value="10" />
-      <StatValue stattype="MechanicalSkillBonus" value="10" />
-      <StatValue stattype="MedicalSkillBonus" value="10" />
-      <StatValue stattype="WeaponsSkillBonus" value="10" />
-      <StatValue stattype="RepairSpeed" value="0.25" />
+      <StatValue stattype="ElectricalSkillBonus" value="20" />
+      <StatValue stattype="HelmSkillBonus" value="20" />
+      <StatValue stattype="MechanicalSkillBonus" value="20" />
+      <StatValue stattype="MedicalSkillBonus" value="20" />
+      <StatValue stattype="WeaponsSkillBonus" value="20" />
+      <StatValue stattype="RepairSpeed" value="0.5" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,4" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -252,9 +252,9 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1" 
             resistancefor="damage"
-            minresistance="0.05"
-            maxresistance="0.05">
-      <StatValue stattype="MovementSpeed" value="0.1" />
+            minresistance="0.1"
+            maxresistance="0.1">
+      <StatValue stattype="MovementSpeed" value="0.2" />
       <StatusEffect target="Character">
         <TriggerAnimation Type="Walk" filename="JollyWalk" priority="3" ExpectedSpecies="Human" />
       </StatusEffect>
@@ -268,13 +268,13 @@
     isbuff="true"
     limbspecific="false"
     maxstrength="120"
-    duration="120"
+    duration="180"
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="120" strengthchange="-1" 
             resistancefor="damage" 
-            minresistance="0.3" 
-            maxresistance="0.3">
+            minresistance="0.45" 
+            maxresistance="0.45">
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="0,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -324,15 +324,15 @@
     isbuff="true"
     limbspecific="false"
     maxstrength="10"
-    duration="10"
+    duration="15"
     hideiconafterdelay="true"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="10">
-      <StatValue stattype="ElectricalSkillBonus" value="15" />
-      <StatValue stattype="HelmSkillBonus" value="15" />
-      <StatValue stattype="MechanicalSkillBonus" value="15" />
-      <StatValue stattype="MedicalSkillBonus" value="15" />
-      <StatValue stattype="WeaponsSkillBonus" value="15" />
+      <StatValue stattype="ElectricalSkillBonus" value="30" />
+      <StatValue stattype="HelmSkillBonus" value="30" />
+      <StatValue stattype="MechanicalSkillBonus" value="30" />
+      <StatValue stattype="MedicalSkillBonus" value="30" />
+      <StatValue stattype="WeaponsSkillBonus" value="30" />
       <StatusEffect target="Character">
         <TriggerAnimation Type="Walk" filename="JollyWalk" priority="3" ExpectedSpecies="Human" />
       </StatusEffect>
diff --git a/Content/Talents/Assistant/TalentsAssistant.xml b/Content/Talents/Assistant/TalentsAssistant.xml
index aef115b2..190689c6 100644
--- a/Content/Talents/Assistant/TalentsAssistant.xml
+++ b/Content/Talents/Assistant/TalentsAssistant.xml
@@ -3,7 +3,7 @@
   <Talent identifier="disloyalscum">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.disloyalscum">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="80" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -21,7 +21,7 @@
   <Talent identifier="loyalassistant">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="4,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.loyalassistant">
-      <Replace tag="[amount]" value="1" color="gui.green"/>
+      <Replace tag="[amount]" value="2" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -39,8 +39,8 @@
   <Talent identifier="journeyman">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.journeyman">
-      <Replace tag="[skillamount]" value="10" color="gui.green"/>
-      <Replace tag="[skillspeedboost]" value="50" color="gui.green"/>
+      <Replace tag="[skillamount]" value="20" color="gui.green"/>
+      <Replace tag="[skillspeedboost]" value="200" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -58,8 +58,8 @@
         <AbilityConditionHasTalent identifier="apprenticeship_captain" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="10"/>
-        <CharacterAbilityGiveStat stattype="HelmSkillGainSpeed" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="HelmSkillGainSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -67,8 +67,8 @@
         <AbilityConditionHasTalent identifier="apprenticeship_doctor" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="10"/>
-        <CharacterAbilityGiveStat stattype="MedicalSkillGainSpeed" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillGainSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -76,8 +76,8 @@
         <AbilityConditionHasTalent identifier="apprenticeship_security" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="10"/>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillGainSpeed" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillGainSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -85,8 +85,8 @@
         <AbilityConditionHasTalent identifier="apprenticeship_engineer" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="10"/>
-        <CharacterAbilityGiveStat stattype="ElectricalSkillGainSpeed" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="ElectricalSkillGainSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -94,8 +94,8 @@
         <AbilityConditionHasTalent identifier="apprenticeship_mechanic" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="10"/>
-        <CharacterAbilityGiveStat stattype="MechanicalSkillGainSpeed" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="MechanicalSkillGainSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -196,14 +196,14 @@
       <Replace tag="[itemname]" value="entityname.handhelditemfinder,entityname.makeshiftshelf" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.letitdrainreminder">
-      <Replace tag="[itemcount]" value="3" color="gui.green"/>
+      <Replace tag="[itemcount]" value="6" color="gui.green"/>
     </Description>
     <Migrations>
-      <AddStat version="1.0.10.0" statidentifier="makeshiftshelf" stattype="MaxAttachableCount" value="3" />
+      <AddStat version="1.0.10.0" statidentifier="makeshiftshelf" stattype="MaxAttachableCount" value="6" />
     </Migrations>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="makeshiftshelf" stattype="MaxAttachableCount" value="3" />
+        <CharacterAbilityGivePermanentStat statidentifier="makeshiftshelf" stattype="MaxAttachableCount" value="6" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="makeshiftshelf"/>
@@ -214,7 +214,7 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="2,0" sheetelementsize="128,128"/>
     <Description tag="talentdescription.thefriendswemade"/>
     <Description tag="talentdescription.thefriendswemadereminder">
-      <Replace tag="[amount]" value="2" color="gui.green"/>
+      <Replace tag="[amount]" value="4" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.petraptoregg" color="gui.orange"/>
@@ -225,8 +225,8 @@
   <Talent identifier="revengesquad">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="5,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.revengesquad">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
-      <Replace tag="[duration]" value="120" color="gui.green"/>
+      <Replace tag="[amount]" value="45" color="gui.green"/>
+      <Replace tag="[duration]" value="240" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnDieToCharacter">
       <Abilities>
@@ -252,7 +252,7 @@
   <Talent identifier="peerlearning">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.peerlearning">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
     </Description>
     <!-- give XP to the character itself -->
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -260,7 +260,7 @@
         <AbilityConditionLowestLevel />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.5"/>
+        <CharacterAbilityModifyValue multiplyvalue="3"/>
       </Abilities>
     </AbilityGroupEffect>
     <!-- allies too -->
@@ -269,7 +269,7 @@
         <AbilityConditionLowestLevel />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.5"/>
+        <CharacterAbilityModifyValue multiplyvalue="3"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -295,8 +295,8 @@
   <Talent identifier="mailman">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.mailman">
-      <Replace tag="[xpbonus]" value="25" color="gui.green"/>
-      <Replace tag="[moneybonus]" value="250" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="100" color="gui.green"/>
+      <Replace tag="[moneybonus]" value="500" color="gui.green"/>
       <Replace tag="[missiontype]" value="missiontype.cargo" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -304,7 +304,7 @@
         <AbilityConditionMission missiontype="Cargo"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.25"/>
+        <CharacterAbilityModifyValue multiplyvalue="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionMoney">
@@ -312,7 +312,7 @@
         <AbilityConditionMission missiontype="Cargo"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveMoney amount="250"/>
+        <CharacterAbilityGiveMoney amount="500"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -320,16 +320,16 @@
   <Talent identifier="thewaitinglist">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.thewaitinglist">
-      <Replace tag="[amount]" value="75" color="gui.green"/>
+      <Replace tag="[amount]" value="90" color="gui.green"/>
     </Description>
     <AbilityGroupInterval>
       <Conditions>
         <AbilityConditionAboveVitality invert="true" vitalitypercentage="0"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyResistance resistanceid="oxygenlow" multiplier="0.25" />
-        <CharacterAbilityModifyResistance resistanceid="bleeding" multiplier="0.25" />
-        <CharacterAbilityModifyResistance resistanceid="bloodloss" multiplier="0.25" />
+        <CharacterAbilityModifyResistance resistanceid="oxygenlow" multiplier="0.1" />
+        <CharacterAbilityModifyResistance resistanceid="bleeding" multiplier="0.1" />
+        <CharacterAbilityModifyResistance resistanceid="bloodloss" multiplier="0.1" />
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -352,13 +352,13 @@
   <Talent identifier="skedaddle">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="5,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.skedaddle">
-      <Replace tag="[value]" value="10" color="gui.green"/>
-      <Replace tag="[attackedvalue]" value="30" color="gui.green"/>
-      <Replace tag="[seconds]" value="5" color="gui.green"/>
+      <Replace tag="[value]" value="15" color="gui.green"/>
+      <Replace tag="[attackedvalue]" value="45" color="gui.green"/>
+      <Replace tag="[seconds]" value="8" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MovementSpeed" value="0.1"/>
+        <CharacterAbilityGiveStat stattype="MovementSpeed" value="0.15"/>
       </Abilities>
     </AbilityGroupEffect>    
     <AbilityGroupEffect abilityeffecttype="OnAttacked">
@@ -377,14 +377,14 @@
   <Talent identifier="insurancepolicy">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.insurancepolicy">
-      <Replace tag="[amount]" value="200" color="gui.green"/>
+      <Replace tag="[amount]" value="400" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnDieToCharacter">
       <Conditions>
         <AbilityConditionCharacter invert="true" targettypes="Ally" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityInsurancePolicy moneypermission="200" requiresalive="false" />
+        <CharacterAbilityInsurancePolicy moneypermission="400" requiresalive="false" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -392,9 +392,9 @@
   <Talent identifier="nonthreatening">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.feigndeath">
-      <Replace tag="[seconds]" value="2" color="gui.green"/>
+      <Replace tag="[seconds]" value="1" color="gui.green"/>
     </Description>
-    <AbilityGroupInterval effectdelay="2" >
+    <AbilityGroupInterval effectdelay="1" >
       <Conditions>
         <AbilityConditionRagdolled/>
       </Conditions>
@@ -408,7 +408,7 @@
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="1,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.tastytarget"/>
     <Description tag="talentdescription.damagereduction">
-      <Replace tag="[amount]" value="15" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -428,18 +428,18 @@
     <Description tag="talentdescription.starterquest" />
 
     <Description tag="talentdescription.starterquest.killcrawler">
-      <Replace tag="[xpbonus]" value="400" color="gui.green"/>
-      <Replace tag="[skillbonus]" value="10" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="1600" color="gui.green"/>
+      <Replace tag="[skillbonus]" value="20" color="gui.green"/>
       <Replace tag="[skill]" value="stattypenames.weaponsskillbonus" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.starterquest.repairjunctionbox">
-      <Replace tag="[xpbonus]" value="300" color="gui.green"/>
-      <Replace tag="[skillbonus]" value="10" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="1200" color="gui.green"/>
+      <Replace tag="[skillbonus]" value="20" color="gui.green"/>
       <Replace tag="[skill]" value="stattypenames.electricalskillbonus" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.starterquest.weldleak">
-      <Replace tag="[xpbonus]" value="200" color="gui.green"/>
-      <Replace tag="[skillbonus]" value="10" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="800" color="gui.green"/>
+      <Replace tag="[skillbonus]" value="20" color="gui.green"/>
       <Replace tag="[skill]" value="stattypenames.mechanicalskillbonus" color="gui.orange"/>
     </Description>
 
@@ -461,8 +461,8 @@
         <AbilityConditionHasPermanentStat statidentifier="starterquest_killcrawler" min="1"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveExperience amount="400"/>
-        <CharacterAbilityGivePermanentStat stattype="WeaponsSkillBonus" statidentifier="starterquest" value="10" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGiveExperience amount="1600"/>
+        <CharacterAbilityGivePermanentStat stattype="WeaponsSkillBonus" statidentifier="starterquest" value="20" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="starterquest_killcrawler" />
       </Abilities>
     </AbilityGroupEffect>
@@ -474,8 +474,8 @@
         <AbilityConditionHasPermanentStat statidentifier="starterquest_repairjunctionbox" min="1"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveExperience amount="300"/>
-        <CharacterAbilityGivePermanentStat stattype="ElectricalSkillBonus" statidentifier="starterquest" value="10" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGiveExperience amount="1200"/>
+        <CharacterAbilityGivePermanentStat stattype="ElectricalSkillBonus" statidentifier="starterquest" value="20" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="starterquest_repairjunctionbox" />
       </Abilities>
     </AbilityGroupEffect>
@@ -486,8 +486,8 @@
         <AbilityConditionHasPermanentStat statidentifier="starterquest_weldleak" min="1"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveExperience amount="200"/>
-        <CharacterAbilityGivePermanentStat stattype="MechanicalSkillBonus" statidentifier="starterquest" value="10" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGiveExperience amount="800"/>
+        <CharacterAbilityGivePermanentStat stattype="MechanicalSkillBonus" statidentifier="starterquest" value="20" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="starterquest_weldleak" />
       </Abilities>
     </AbilityGroupEffect>
@@ -496,15 +496,15 @@
   <Talent identifier="indenturedservitude">
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="4,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.assistanthiringprice">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.otherassistantxpbonus">
-      <Replace tag="[bonus]" value="10" color="gui.green"/>
-      <Replace tag="[max]" value="50" color="gui.green"/>
+      <Replace tag="[bonus]" value="40" color="gui.green"/>
+      <Replace tag="[max]" value="400" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat stattype="HireCostMultiplier" statidentifier="assistant" value="-0.2" />
+        <CharacterAbilityGivePermanentStat stattype="HireCostMultiplier" statidentifier="assistant" value="-0.4" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnRoundEnd">
@@ -520,7 +520,7 @@
         <AbilityConditionHasPermanentStat statidentifier="indenturedservitude" targetAbilityTarget="true" min="5" invert="true"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.1"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.4"/>
         <CharacterAbilityGivePermanentStat statidentifier="indenturedservitude" targetAbilityTarget="true" value="1" maxvalue="5" />
       </Abilities>
     </AbilityGroupEffect>
@@ -529,7 +529,7 @@
   <Talent identifier="jengamaster">
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="2,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.jengamaster">
-      <Replace tag="[amount]" value="4" color="gui.green"/>
+      <Replace tag="[amount]" value="8" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.doesnotstack" />
     <AbilityGroupEffect abilityeffecttype="OnItemSelected">
@@ -538,7 +538,7 @@
         <AbilityConditionItemIsStatic />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStat stattype="ExtraStackSize" value="4" stackable="false" save="true"/>
+        <CharacterAbilityGiveItemStat stattype="ExtraStackSize" value="8" stackable="false" save="true"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -546,11 +546,11 @@
   <Talent identifier="mule">
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="3,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.mule">
-      <Replace tag="[amount]" value="2" color="gui.green"/>
+      <Replace tag="[amount]" value="4" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat stattype="InventoryExtraStackSize" statidentifier="Material" value="2" />
+        <CharacterAbilityGivePermanentStat stattype="InventoryExtraStackSize" statidentifier="Material" value="4" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -559,18 +559,18 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.reductiontostattypeself">
       <Replace tag="[stattype]" value="stattypenames.repairspeed" color="gui.orange"/>
-      <Replace tag="[amount]" value="40" color="gui.red"/>
+      <Replace tag="[amount]" value="20" color="gui.red"/>
     </Description>
     <Description tag="talentdescription.reductiontoallskills">
-      <Replace tag="[amount]" value="15" color="gui.red"/>
+      <Replace tag="[amount]" value="8" color="gui.red"/>
     </Description>
     <Description tag="talentdescription.crewlayabout">
-      <Replace tag="[repairspeed]" value="25" color="gui.green"/>
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[repairspeed]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="1">
       <Abilities>
-        <CharacterAbilityApplyStatusEffectsToAllies maxdistance="600" allowself="false">
+        <CharacterAbilityApplyStatusEffectsToAllies maxdistance="1200" allowself="false">
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" disabledeltatime="true" multiplyafflictionsbymaxvitality="true">
               <Affliction identifier="pickinguptheslack" strength="1.0"/>
@@ -581,12 +581,12 @@
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="-15"/>
-        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="-15"/>
-        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="-15"/>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="-15"/>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="-15"/>
-        <CharacterAbilityGiveStat stattype="RepairSpeed" value="-0.4"/>
+        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="8"/>
+        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="8"/>
+        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="8"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="8"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="8"/>
+        <CharacterAbilityGiveStat stattype="RepairSpeed" value="-0.2"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -612,15 +612,15 @@
   <Talent identifier="playingcatchup">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="4,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.playingcatchup">
-      <Replace tag="[levelvalue]" value="2" color="gui.green"/>
-      <Replace tag="[experiencevalue]" value="100" color="gui.green"/>
+      <Replace tag="[levelvalue]" value="4" color="gui.green"/>
+      <Replace tag="[experiencevalue]" value="400" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
       <Conditions>
-        <AbilityConditionLevelsBehindHighest levelsbehind="2" />
+        <AbilityConditionLevelsBehindHighest levelsbehind="4" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="2"/>
+        <CharacterAbilityModifyValue multiplyvalue="5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -632,11 +632,11 @@
     </Description>
     <Description tag="talentdescription.clownpowerbenefits"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.movementspeed" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="5" color="gui.green"/>
+      <Replace tag="[amount]" value="10" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.physicalresistance" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
@@ -666,7 +666,7 @@
     </Description>
     <Description tag="talentdescription.clownpowerbenefits"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.swimmingspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval>
@@ -674,7 +674,7 @@
         <AbilityConditionHasAffliction afflictionidentifier="clownpower" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyStat stattype="SwimmingSpeed" value="0.5"/>
+        <CharacterAbilityModifyStat stattype="SwimmingSpeed" value="1"/>
       </Abilities>
     </AbilityGroupInterval>
     <AddedRecipe itemidentifier="clowndivingmask"/>
@@ -684,14 +684,14 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.psychoclown">
       <Replace tag="[afflictionname]" value="afflictionname.clownpower" color="gui.orange"/>
-      <Replace tag="[maxattackspeed]" value="150" color="gui.green"/>
+      <Replace tag="[maxattackspeed]" value="300" color="gui.green"/>
     </Description>
     <AbilityGroupInterval>
       <Conditions>
         <AbilityConditionHasAffliction afflictionidentifier="clownpower" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityPsychoClown stattype="MeleeAttackSpeed" maxvalue="1.5" afflictionidentifier="psychosis"/>
+        <CharacterAbilityPsychoClown stattype="MeleeAttackSpeed" maxvalue="3" afflictionidentifier="psychosis"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -700,8 +700,8 @@
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="3,3" sheetelementsize="128,128"/>
     <!-- TODO mention it works on all instruments -->
     <Description tag="talentdescription.inspiringtunes">
-      <Replace tag="[skillamount]" value="15" color="gui.green"/>
-      <Replace tag="[duration]" value="10" color="gui.green"/>
+      <Replace tag="[skillamount]" value="30" color="gui.green"/>
+      <Replace tag="[duration]" value="15" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnUseRangedWeapon">
       <Conditions>
@@ -722,21 +722,21 @@
   <Talent identifier="chonkyhonks">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.chonkyhonks">
-      <Replace tag="[chance]" value="50" color="gui.green"/>
-      <Replace tag="[duration]" value="1" color="gui.green"/>
+      <Replace tag="[chance]" value="75" color="gui.green"/>
+      <Replace tag="[duration]" value="2" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnUseRangedWeapon">
       <Conditions>
         <AbilityConditionItem tags="hornitem"/>
         <AbilityConditionHasAffliction afflictionidentifier="clownpower" />
-        <AbilityConditionServerRandom randomchance="0.5" />
+        <AbilityConditionServerRandom randomchance="0.75" />
       </Conditions>
       <Abilities>
         <!-- TODO loud sound? -->
-        <CharacterAbilityApplyStatusEffectToNonHumans maxdistance="600">
+        <CharacterAbilityApplyStatusEffectToNonHumans maxdistance="1200">
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" multiplyafflictionsbymaxvitality="true">
-              <Affliction identifier="stun" strength="1.0"/>
+              <Affliction identifier="stun" strength="2"/>
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffectToNonHumans>
@@ -748,7 +748,7 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.truepotentialtemporary">
       <Replace tag="[affliction]" value="afflictionname.combatstimulant" color="gui.orange"/>
-      <Replace tag="[duration]" value="15" color="gui.green"/>
+      <Replace tag="[duration]" value="30" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.clownexosuit" color="gui.orange"/>
@@ -760,7 +760,7 @@
         <AbilityConditionAttackData itemidentifier="toyhammer" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveAffliction affliction="combatstimulant" strength="15" setvalue="true" />
+        <CharacterAbilityGiveAffliction affliction="combatstimulant" strength="30" setvalue="true" />
         <CharacterAbilityReduceAffliction affliction="oxygenlow" amount="200" />
       </Abilities>
     </AbilityGroupEffect>
diff --git a/Content/Talents/Captain/AfflictionsCaptain.xml b/Content/Talents/Captain/AfflictionsCaptain.xml
index ecb0db3b..4527e4e7 100644
--- a/Content/Talents/Captain/AfflictionsCaptain.xml
+++ b/Content/Talents/Captain/AfflictionsCaptain.xml
@@ -23,7 +23,7 @@
     isbuff="true"
     limbspecific="false"
     maxstrength="1"
-    duration="5"
+    duration="7.5"
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
@@ -73,9 +73,9 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1"
             resistancefor="damage,stun"
-            minresistance="0.2"
-            maxresistance="0.2">
-      <StatValue stattype="MeleeAttackMultiplier" value="0.2" />
+            minresistance="0.4"
+            maxresistance="0.4">
+      <StatValue stattype="MeleeAttackMultiplier" value="0.4" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="2,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -92,9 +92,9 @@
     treatmentthreshold="1000"
     iconcolors="227,247,249">
     <Effect minstrength="0" maxstrength="10" strengthchange="-1">
-      <StatValue stattype="RepairSpeed" value="0.2" />
-      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.2" />
-      <StatValue stattype="MovementSpeed" value="0.05" />
+      <StatValue stattype="RepairSpeed" value="0.4" />
+      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.4" />
+      <StatValue stattype="MovementSpeed" value="0.1" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="4,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -112,7 +112,7 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
       <!-- 100% XP boost -->
-      <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="0.25"/>
+      <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="1"/>
     </Effect>
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,7" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -130,7 +130,7 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
       <!-- +2 level -->
-      <StatValue stattype="ExtraLevelGain" value="2"/>
+      <StatValue stattype="ExtraLevelGain" value="4"/>
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="6,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -147,9 +147,9 @@
     showbarinhealthmenu="false"
     iconcolors="227,247,249">
     <Effect minstrength="0" maxstrength="10" strengthchange="-1">
-      <StatValue stattype="RepairSpeed" value="0.4" />
-      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.4" />
-      <StatValue stattype="MovementSpeed" value="0.1" />
+      <StatValue stattype="RepairSpeed" value="0.8" />
+      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.8" />
+      <StatValue stattype="MovementSpeed" value="0.2" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="5,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -166,10 +166,10 @@
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="HelmSkillBonus" value="20" />
-      <StatValue stattype="WeaponsSkillBonus" value="20" />
-      <StatValue stattype="WeaponsSkillGainSpeed" value="1" />
-      <StatValue stattype="HelmSkillGainSpeed" value="1" />
+      <StatValue stattype="HelmSkillBonus" value="40" />
+      <StatValue stattype="WeaponsSkillBonus" value="40" />
+      <StatValue stattype="WeaponsSkillGainSpeed" value="4" />
+      <StatValue stattype="HelmSkillGainSpeed" value="4" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="3,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -182,12 +182,12 @@
     hideiconafterdelay="true"
     showiconthreshold="1"
     maxstrength="1"
-    duration="60"
+    duration="120"
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.5" /> <!-- +50% -->
-      <StatValue stattype="SwimmingSpeed" value="0.5" />
+      <StatValue stattype="RepairToolStructureRepairMultiplier" value="1" /> <!-- +50% -->
+      <StatValue stattype="SwimmingSpeed" value="1" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,7" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -288,7 +288,7 @@
   showinhealthscannerthreshold="1000"
   iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="SwimmingSpeed" value="0.1" />
+      <StatValue stattype="SwimmingSpeed" value="0.2" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,7" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -307,7 +307,7 @@
   showinhealthscannerthreshold="1000"
   iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="WalkingSpeed" value="0.05" />
+      <StatValue stattype="WalkingSpeed" value="0.1" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="2,3" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -323,8 +323,8 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1"
             resistancefor="damage"
-            minresistance="0.05"
-            maxresistance="0.05"/>
+            minresistance="0.1"
+            maxresistance="0.1"/>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="3,3" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
 </Afflictions>
diff --git a/Content/Talents/Captain/TalentsCaptain.xml b/Content/Talents/Captain/TalentsCaptain.xml
index 3f676bf3..30a13ef4 100644
--- a/Content/Talents/Captain/TalentsCaptain.xml
+++ b/Content/Talents/Captain/TalentsCaptain.xml
@@ -19,10 +19,10 @@
   <Talent identifier="steadytune">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.steadytune">
-      <Replace tag="[duration]" value="10" color="gui.green"/>
+      <Replace tag="[duration]" value="15" color="gui.green"/>
       <Replace tag="[buffamount]" value="100" color="gui.green"/>
       <Replace tag="[buffname]" value="afflictionname.psychosisresistance" color="gui.orange"/>
-      <Replace tag="[buffduration]" value="60" color="gui.green"/>
+      <Replace tag="[buffduration]" value="90" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnUseRangedWeapon">
       <Conditions>
@@ -44,10 +44,10 @@
         <AbilityConditionHasAffliction afflictionidentifier="steadytune_charging" minimumpercentage="0.9"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityApplyStatusEffectsToAllies range="600">
+        <CharacterAbilityApplyStatusEffectsToAllies range="12000">
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" interval="1" disabledeltatime="true">
-              <Affliction identifier="psychosisimmunity" amount="60" />
+              <Affliction identifier="psychosisimmunity" amount="90" />
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffectsToAllies>
@@ -58,8 +58,8 @@
   <Talent identifier="inspiringpresence">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="5,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.inspiringpresence">
-      <Replace tag="[amount]" value="3" color="gui.green"/>
-      <Replace tag="[movespeed]" value="5" color="gui.green"/>
+      <Replace tag="[amount]" value="6" color="gui.green"/>
+      <Replace tag="[movespeed]" value="10" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -88,7 +88,7 @@
   <Talent identifier="trickledown">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="3,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.trickledown">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainSkillPoint">
       <Abilities>
@@ -111,21 +111,21 @@
   <Talent identifier="helmsman">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.helmsman">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.increaseeffectiveness">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.doesnotstack" />
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="30"/>
+        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="60"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="pump" stattype="PumpSpeed" stackable="false" value="1.2" />
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineSpeed" stackable="false" value="1.2" />
+        <CharacterAbilityGiveItemStatToTags tags="pump" stattype="PumpSpeed" stackable="false" value="0.4" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineSpeed" stackable="false" value="0.4" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -140,15 +140,15 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.leadingbyexample" />
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.repairspeed" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.repairtoolstructurerepairmultiplier" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="5" color="gui.green"/>
+      <Replace tag="[amount]" value="10" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.movementspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
@@ -185,11 +185,11 @@
   <Talent identifier="campaigning">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="5,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.campaigning">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="campaigning" stattype="ShipyardBuyMultiplierAffiliated" value="0.1" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="campaigning" stattype="ShipyardBuyMultiplierAffiliated" value="0.2" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -197,18 +197,18 @@
   <Talent identifier="networking">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="3,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.networking">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <Migrations>
       <UpdateStatIdentifier version="1.0.10.0" old="networking" new="all~networking" />
     </Migrations>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="all~networking" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="coalition" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="clowns" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="huskcult" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="separatists" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="all~networking" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="coalition" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="clowns" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="huskcult" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="separatists" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -216,11 +216,11 @@
   <Talent identifier="figurehead">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="4,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.figurehead">
-      <Replace tag="[selfxpgain]" value="550" color="gui.green"/>
-      <Replace tag="[level]" value="5" color="gui.green"/>
+      <Replace tag="[selfxpgain]" value="2200" color="gui.green"/>
+      <Replace tag="[level]" value="7.5" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.factiondiscount">
-      <Replace tag="[discount]" value="10" color="gui.green"/>
+      <Replace tag="[discount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
       <Conditions>
@@ -228,7 +228,7 @@
       </Conditions>
       <Abilities>
         <!-- -550 XP to negate the default bonus given by the medal -->
-        <CharacterAbilityGiveExperience level="5" amount="-550"/>
+        <CharacterAbilityGiveExperience level="7.5" amount="-1100"/>
       </Abilities>
     </AbilityGroupEffect>
     <Migrations>
@@ -236,8 +236,8 @@
     </Migrations>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="all~figurehead" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="all~figurehead" stattype="ShipyardBuyMultiplierAffiliated" value="0.1" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="all~figurehead" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="all~figurehead" stattype="ShipyardBuyMultiplierAffiliated" value="0.2" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -245,17 +245,17 @@
   <Talent identifier="affiliation" abilityeffectsstackwithsametalent="false">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.affiliationreputation">
-      <Replace tag="[reputationincrease]" value="50" color="gui.green"/>
+      <Replace tag="[reputationincrease]" value="100" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.affiliationbenefit">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.doesnotstack" />
     <Description linebreak="true"/>
     <Description tag="talentdescription.affiliationfactionreminder"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ReputationGainMultiplier" value="0.5" />
+        <CharacterAbilityGiveStat stattype="ReputationGainMultiplier" value="1" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionMoney">
@@ -263,7 +263,7 @@
         <AbilityConditionMission isaffiliated="true"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyValue="1.1"/>
+        <CharacterAbilityModifyValue multiplyValue="0.2"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -271,12 +271,12 @@
   <Talent identifier="yourreputation">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="4,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.yourreputation">
-      <Replace tag="[amount]" value="200" color="gui.green"/>
+      <Replace tag="[amount]" value="400" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.extramission"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ExtraMissionCount" value="1"/>
+        <CharacterAbilityGiveStat stattype="ExtraMissionCount" value="3"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnLocationDiscovered">
@@ -284,7 +284,7 @@
         <AbilityConditionLocation hasoutpost="true" ispositivereputation="true"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveMoney amount="200"/>
+        <CharacterAbilityGiveMoney amount="400"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnLocationDiscovered">
@@ -301,10 +301,10 @@
   <Talent identifier="bigguns">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.bigguns">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.reducedualwieldpenalty">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.handcannon, entityname.handcannonround" color="gui.orange"/>
@@ -317,12 +317,12 @@
         <AbilityConditionAttackData tags="pistolammoitem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.3" />
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.6" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="DualWieldingPenaltyReduction" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="DualWieldingPenaltyReduction" value="0.6"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -331,20 +331,20 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.lonewolf"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.physicalresistance" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.stunresistance" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.meleedamagebonus" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
-        <AbilityConditionAllyNearby distance="2000" truthywhen="NoCharacterMatches"/>
+        <AbilityConditionAllyNearby distance="1000" truthywhen="NoCharacterMatches"/>
       </Conditions>
       <Abilities>
         <CharacterAbilityApplyStatusEffects>
@@ -361,8 +361,8 @@
   <Talent identifier="deputy">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="0,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.deputy">
-      <Replace tag="[skillbonus1]" value="20" color="gui.green"/>
-      <Replace tag="[skillbonus2]" value="20" color="gui.green"/>
+      <Replace tag="[skillbonus1]" value="40" color="gui.green"/>
+      <Replace tag="[skillbonus2]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -389,8 +389,8 @@
   <Talent identifier="logisticsexpert">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.logisticsexpert">
-      <Replace tag="[xpbonus]" value="20" color="gui.green"/>
-      <Replace tag="[moneybonus]" value="20" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="80" color="gui.green"/>
+      <Replace tag="[moneybonus]" value="80" color="gui.green"/>
       <Replace tag="[missiontype1]" value="missiontype.cargo" color="gui.orange"/>
       <Replace tag="[missiontype2]" value="missiontype.personneltransport" color="gui.orange"/>
     </Description>
@@ -399,7 +399,7 @@
         <AbilityConditionMission missiontype="Cargo,Escort"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.2"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.8"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -407,7 +407,7 @@
         <AbilityConditionMission missiontype="Cargo,Escort"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.2"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.8"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -415,13 +415,13 @@
   <Talent identifier="prodigy">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="2,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.skillgainspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval>
       <Abilities>
         <!-- 1 = +100% -->
-        <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="0.5"/> 
+        <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="2"/> 
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -430,7 +430,7 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="3,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.appliestoallcrew"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.skillgainspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
@@ -449,21 +449,21 @@
   <Talent identifier="veteran">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.veteran">
-      <Replace tag="[helmbonus]" value="20" color="gui.green"/>
-      <Replace tag="[otherbonus]" value="5" color="gui.green"/>
+      <Replace tag="[helmbonus]" value="40" color="gui.green"/>
+      <Replace tag="[otherbonus]" value="20" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.repairspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="20"/>
-        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="5"/>
-        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="5"/>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="5"/>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="5"/>
-        <CharacterAbilityGiveStat stattype="RepairSpeed" value="0.1"/>
+        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="40"/>
+        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="RepairSpeed" value="0.2"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -471,10 +471,10 @@
   <Talent identifier="quickdraw">
     <Description tag="talentdescription.quickdraw">
       <Replace tag="[seconds]" value="8" color="gui.green"/>
-      <Replace tag="[damage]" value="25" color="gui.green"/>
+      <Replace tag="[damage]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.reducedualwieldpenalty">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="75" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,0" sheetelementsize="128,128"/>
     <AbilityGroupInterval interval="1">
@@ -494,7 +494,7 @@
         <AbilityConditionAttackData tags="pistolammoitem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.25"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnUseRangedWeapon">
@@ -514,14 +514,14 @@
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="DualWieldingPenaltyReduction" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="DualWieldingPenaltyReduction" value="0.75"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="sailorwithnoname">
     <Description tag="talentdescription.skillbonus">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[skillname]" value="skillname.medical" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
@@ -530,7 +530,7 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="6,1" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="40"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="cigar"/>
@@ -539,7 +539,7 @@
 
   <Talent identifier="drunkensailor">
     <Description tag="talentdescription.drunkensailor">
-      <Replace tag="[stunresistance]" value="75" color="gui.green"/>
+      <Replace tag="[stunresistance]" value="93.75" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.rum" color="gui.orange"/>
@@ -550,7 +550,7 @@
         <AbilityConditionHasAffliction afflictionidentifier="drunknodebuffs"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyResistance resistanceid="stun" multiplier="0.25"/>
+        <CharacterAbilityModifyResistance resistanceid="stun" multiplier="0.06"/>
         <CharacterAbilityModifyResistance resistanceid="nausea" multiplier="0"/>
       </Abilities>
     </AbilityGroupInterval>
@@ -564,8 +564,8 @@
 
   <Talent identifier="bountyhunter">
     <Description tag="talentdescription.logisticsexpert">
-      <Replace tag="[xpbonus]" value="15" color="gui.green"/>
-      <Replace tag="[moneybonus]" value="15" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="60" color="gui.green"/>
+      <Replace tag="[moneybonus]" value="60" color="gui.green"/>
       <Replace tag="[missiontype1]" value="missiontype.monster" color="gui.orange"/>
       <Replace tag="[missiontype2]" value="missiontype.nest" color="gui.orange"/>
     </Description>
@@ -575,7 +575,7 @@
         <AbilityConditionMission missiontype="Monster,Nest"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.15"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.6"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -583,17 +583,17 @@
         <AbilityConditionMission missiontype="Monster,Nest"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.15"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.6"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="travelingtradesman">
     <Description tag="talentdescription.appliestoallcrew">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.specialsaleitemincrease">
-      <Replace tag="[itemcount]" value="3" color="gui.green"/>
+      <Replace tag="[itemcount]" value="6" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
       <Replace tag="[amount]" value="20" color="gui.green"/>
@@ -603,8 +603,8 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,0" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ExtraSpecialSalesCount" value="3"/>
-        <CharacterAbilityGivePermanentStat statidentifier="all" stattype="StoreSellMultiplier" value="0.2" setvalue="true" />
+        <CharacterAbilityGiveStat stattype="ExtraSpecialSalesCount" value="6"/>
+        <CharacterAbilityGivePermanentStat statidentifier="all" stattype="StoreSellMultiplier" value="0.4" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -633,9 +633,9 @@
   <Talent identifier="downwiththeship">
     <Description tag="talentdescription.downwiththeship">
       <Replace tag="[flooded]" value="50" color="gui.green"/>
-      <Replace tag="[swimmingboost]" value="50" color="gui.green"/>
-      <Replace tag="[repairspeed]" value="50" color="gui.green"/>
-      <Replace tag="[duration]" value="60" color="gui.green"/>
+      <Replace tag="[swimmingboost]" value="100" color="gui.green"/>
+      <Replace tag="[repairspeed]" value="100" color="gui.green"/>
+      <Replace tag="[duration]" value="90" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="0,1" sheetelementsize="128,128"/>
     <AbilityGroupInterval interval="1">
@@ -656,7 +656,7 @@
   
   <Talent identifier="commendations">
     <Description tag="talentdescription.commendations">
-      <Replace tag="[selfxpgain]" value="275" color="gui.green"/>
+      <Replace tag="[selfxpgain]" value="1100" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,1" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="OnAnyMissionCompleted">
@@ -674,8 +674,8 @@
 
   <Talent identifier="camaraderie">
     <Description tag="talentdescription.camaraderienew">
-      <Replace tag="[extraexperience]" value="10" color="gui.green"/>
-      <Replace tag="[resistanceamount]" value="5" color="gui.green"/>
+      <Replace tag="[extraexperience]" value="40" color="gui.green"/>
+      <Replace tag="[resistanceamount]" value="10" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.assistantsdontcount"/>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="5,1" sheetelementsize="128,128"/>
@@ -684,7 +684,7 @@
         <AbilityConditionNoCrewDied/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.1"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.4"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="0.9">
diff --git a/Content/Talents/Doctor/AfflictionsDoctor.xml b/Content/Talents/Doctor/AfflictionsDoctor.xml
index e73625e4..d67b0fa2 100644
--- a/Content/Talents/Doctor/AfflictionsDoctor.xml
+++ b/Content/Talents/Doctor/AfflictionsDoctor.xml
@@ -92,7 +92,7 @@
     <Effect
       minstrength="0"
       maxstrength="600">
-      <StatValue stattype="MedicalSkillBonus" value="30" />
+      <StatValue stattype="MedicalSkillBonus" value="60" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="4,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -110,8 +110,8 @@
     <Effect
       minstrength="0"
       maxstrength="1">
-      <StatValue stattype="MovementSpeed" value="0.05" />
-      <StatValue stattype="MaximumHealthMultiplier" value="0.10" />
+      <StatValue stattype="MovementSpeed" value="0.1" />
+      <StatValue stattype="MaximumHealthMultiplier" value="0.2" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="7,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -148,7 +148,7 @@
     showinhealthscannerthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1" strengthchange="-1">
-      <StatValue stattype="MovementSpeed" value="0.4"/>
+      <StatValue stattype="MovementSpeed" value="0.6"/>
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="5,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -168,7 +168,7 @@
     showinhealthscannerthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1" strengthchange="-1">
-      <StatValue stattype="CPRBoost" value="0.2"/>
+      <StatValue stattype="CPRBoost" value="0.4"/>
     </Effect>
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -187,7 +187,7 @@
       minstrength="0"
       maxstrength="60"
       strengthchange="0">
-      <StatValue stattype="MaximumHealthMultiplier" value="0.2" />
+      <StatValue stattype="MaximumHealthMultiplier" value="0.4" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="3,6" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
diff --git a/Content/Talents/Doctor/TalentsDoctor.xml b/Content/Talents/Doctor/TalentsDoctor.xml
index a31805eb..d2445b56 100644
--- a/Content/Talents/Doctor/TalentsDoctor.xml
+++ b/Content/Talents/Doctor/TalentsDoctor.xml
@@ -3,10 +3,10 @@
   <Talent identifier="macrodosing">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="1,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.increaseappliedbuffduration">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.poisonsincreased">
-      <Replace tag="[amount]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.endocrinebooster" color="gui.orange"/>
@@ -14,8 +14,8 @@
     <Description tag="entitydescription.endocrinebooster" />
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="BuffItemApplyingMultiplier" value="0.25"/>
-        <CharacterAbilityGiveStat stattype="PoisonMultiplier" value="1.0"/>
+        <CharacterAbilityGiveStat stattype="BuffItemApplyingMultiplier" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="PoisonMultiplier" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="endocrinebooster"/>
@@ -24,15 +24,15 @@
   <Talent identifier="labcontacts">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="7,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.chemicalsboughtcheaper">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.constructmedicinefaster">
-      <Replace tag="[amount]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="medical" stattype="FabricationSpeed" value="1" setvalue="true"/>
-        <CharacterAbilityGivePermanentStat statidentifier="chem" stattype="StoreBuyMultiplier" value="0.3" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="medical" stattype="FabricationSpeed" value="2" setvalue="true"/>
+        <CharacterAbilityGivePermanentStat statidentifier="chem" stattype="StoreBuyMultiplier" value="0.6" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -49,12 +49,12 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.blackmarketgenes"/>
     <Description tag="talentdescription.sellgeneticmaterialsmultiplier">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="unidentifiedgeneticmaterial" stattype="StoreSellMultiplier" value="0.5" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="geneticmaterial" stattype="StoreSellMultiplier" value="0.5" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="unidentifiedgeneticmaterial" stattype="StoreSellMultiplier" value="1" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="geneticmaterial" stattype="StoreSellMultiplier" value="1" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedStoreItem itemtag="blackmarketgenes" />
@@ -85,7 +85,7 @@
   <Talent identifier="medicalassistance">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.medicalassistance">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -104,7 +104,7 @@
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="3,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.assistantdragatfullspeed"/>
     <Description tag="talentdescription.emergencyresponse">
-      <Replace tag="[movementspeed]" value="40" color="gui.green"/>
+      <Replace tag="[movementspeed]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
@@ -137,11 +137,11 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.medicalexpertise">
       <Replace tag="[skill]" value="skillname.medical" color="gui.orange"/>
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="30"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="60"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnApplyTreatment">
@@ -153,8 +153,8 @@
           <StatusEffects>
             <!-- improve bandage effectiveness -->
             <StatusEffect tags="medical" type="OnAbility" target="Limb" duration="6.0">
-              <ReduceAffliction type="bleeding" amount="1.5" />
-              <ReduceAffliction type="burn" amount="1.5" />
+              <ReduceAffliction type="bleeding" amount="2.25" />
+              <ReduceAffliction type="burn" amount="2.25" />
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffects>
@@ -165,8 +165,8 @@
   <Talent identifier="genetampering">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="6,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.genetampering">
-      <Replace tag="[healthamount]" value="10" color="gui.green"/>
-      <Replace tag="[movementspeed]" value="5" color="gui.green"/>
+      <Replace tag="[healthamount]" value="20" color="gui.green"/>
+      <Replace tag="[movementspeed]" value="10" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -217,7 +217,7 @@
         <CharacterAbilityApplyStatusEffects>
           <StatusEffects>
             <StatusEffect type="OnAbility" target="UseTarget" spawnitemrandomly="true" >
-              <SpawnItem identifiers="alienblood" spawnposition="ThisInventory" />
+              <SpawnItem identifiers="alienblood" spawnposition="ThisInventory" MinAmount="4" />
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffects>
@@ -231,7 +231,7 @@
     <Description tag="talentdescription.blooddonor" />
     <AbilityGroupEffect abilityeffecttype="OnAnyMissionCompleted">
       <Abilities>
-        <CharacterAbilityPutItem itemidentifier="antibloodloss2" amount="1"/>
+        <CharacterAbilityPutItem itemidentifier="antibloodloss2" amount="2"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -239,7 +239,7 @@
   <Talent identifier="stayinalive">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.slightlypowerfulcpr">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -257,11 +257,11 @@
   <Talent identifier="selfcare">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,0" sheetelementsize="128,128"/>
     <Description tag="talentdescription.medicaleffectiveness">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalItemEffectivenessMultiplier" value="0.2" />
+        <CharacterAbilityGiveStat stattype="MedicalItemEffectivenessMultiplier" value="0.6" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -269,17 +269,17 @@
   <Talent identifier="laresistance">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="7,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.opiateaddiction" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.chemaddiction" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveResistance resistanceid="opiateaddiction" multiplier="0.5"/>
-        <CharacterAbilityGiveResistance resistanceid="chemaddiction" multiplier="0.5"/>
+        <CharacterAbilityGiveResistance resistanceid="opiateaddiction" multiplier="1"/>
+        <CharacterAbilityGiveResistance resistanceid="chemaddiction" multiplier="1"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -287,12 +287,12 @@
   <Talent identifier="exampleofhealth">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.maximumhealthmultiplier" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MaximumHealthMultiplier" value="0.2"/>
+        <CharacterAbilityGiveStat stattype="MaximumHealthMultiplier" value="0.4"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -300,8 +300,8 @@
   <Talent identifier="nobodyimportantdies">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.nobodyimportantdies">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
-      <Replace tag="[penalty]" value="20" color="gui.red"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[penalty]" value="10" color="gui.red"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnReduceAffliction">
       <Conditions>
@@ -310,10 +310,10 @@
         </AbilityConditionCharacter>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="0.8"/>
+        <CharacterAbilityModifyValue multiplyvalue="0.9"/>
       </Abilities>
       <FallbackAbilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.1"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.3"/>
       </FallbackAbilities>
     </AbilityGroupEffect>
   </Talent>
@@ -321,21 +321,21 @@
   <Talent identifier="healthinsurance">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="4,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.healthinsurance">
-      <Replace tag="[amount]" value="30" color="gui.orange"/>
-      <Replace tag="[money]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.orange"/>
+      <Replace tag="[money]" value="400" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.medicalitemscostless">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="medical" stattype="StoreBuyMultiplier" value="0.1" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="medical" stattype="StoreBuyMultiplier" value="0.2" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="1">
       <Conditions>
         <AbilityConditionHasPermanentStat statidentifier="healthinsurance" min="1" invert="true"/>
-        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.3"/>
+        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.6"/>
       </Conditions>
       <Abilities>
         <CharacterAbilityGivePermanentStat statidentifier="healthinsurance" value="1" setvalue="true" />
@@ -373,14 +373,14 @@
   <Talent identifier="supersoldiers">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.increaseappliedbuffduration">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.combatstimulantsyringe" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="BuffItemApplyingMultiplier" value="0.25"/>
+        <CharacterAbilityGiveStat stattype="BuffItemApplyingMultiplier" value="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="combatstimulantsyringe"/>
@@ -389,14 +389,14 @@
   <Talent identifier="whatastench">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.acidsdealmoredamage">
-      <Replace tag="[amount]" value="15" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.chemgrenade,entityname.40mmchemgrenade" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAddDamageAffliction">
       <Abilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="acidburn" addedmultiplier="0.15" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="acidburn" addedmultiplier="0.3" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="chemgrenade"/>
@@ -406,7 +406,7 @@
   <Talent identifier="vitaminsupplements">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="4,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.vitaminsupplements">
-      <Replace tag="[healthboost]" value="20" color="gui.green"/>
+      <Replace tag="[healthboost]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnApplyTreatment">
       <Conditions>
@@ -431,11 +431,11 @@
   <Talent identifier="genesplicer">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.geneticmaterialrefineflatbonus">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="GeneticMaterialRefineBonus" value="10"/>
+        <CharacterAbilityGiveStat stattype="GeneticMaterialRefineBonus" value="20"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -443,11 +443,11 @@
   <Talent identifier="drsubmarine">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="0,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.gainmedicalitemeffectiveness">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalItemApplyingMultiplier" value="0.25"/>
+        <CharacterAbilityGiveStat stattype="MedicalItemApplyingMultiplier" value="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -479,7 +479,7 @@
   <Talent identifier="geneharvester">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="3,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.geneharvester">
-      <Replace tag="[probability]" value="20" color="gui.green"/>
+      <Replace tag="[probability]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnRoundEnd">
       <Abilities>
@@ -494,7 +494,7 @@
           <Conditional ispet="false" />
         </AbilityConditionCharacter>
         <AbilityConditionCharacterNotLooted identifier="geneharvester"/>
-        <AbilityConditionServerRandom randomchance="0.2" />
+        <AbilityConditionServerRandom randomchance="0.6" />
       </Conditions>
       <Abilities>
         <CharacterAbilityApplyStatusEffects>
@@ -520,7 +520,7 @@
   <Talent identifier="plaguedoctor">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.acidburn" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
@@ -530,7 +530,7 @@
     <AddedRecipe itemidentifier="sulphuricacidsyringe"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveResistance resistanceid="acidburn" multiplier="0.5"/>
+        <CharacterAbilityGiveResistance resistanceid="acidburn" multiplier="1"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
diff --git a/Content/Talents/Engineer/AfflictionsEngineer.xml b/Content/Talents/Engineer/AfflictionsEngineer.xml
index 9ba32568..f9cb9472 100644
--- a/Content/Talents/Engineer/AfflictionsEngineer.xml
+++ b/Content/Talents/Engineer/AfflictionsEngineer.xml
@@ -25,11 +25,11 @@
     hideiconafterdelay="true"
     limbspecific="false"
     maxstrength="60"
-    duration="60"
+    duration="90"
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="60" strengthchange="-1">
-      <StatValue stattype="RepairSpeed" value="0.25" />
+      <StatValue stattype="RepairSpeed" value="0.5" />
       <StatusEffect target="Character">
         <TriggerAnimation Type="Walk" filename="JollyWalk" priority="3" ExpectedSpecies="Human" />
       </StatusEffect>
@@ -81,8 +81,8 @@
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="RepairSpeed" value="0.5" />
-      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.5" />
+      <StatValue stattype="RepairSpeed" value="1" />
+      <StatValue stattype="RepairToolStructureRepairMultiplier" value="1" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="2,3" sheetelementsize="128,128"/>
   </Affliction>
diff --git a/Content/Talents/Engineer/TalentsEngineer.xml b/Content/Talents/Engineer/TalentsEngineer.xml
index 14736776..966212be 100644
--- a/Content/Talents/Engineer/TalentsEngineer.xml
+++ b/Content/Talents/Engineer/TalentsEngineer.xml
@@ -3,14 +3,14 @@
   <Talent identifier="betterthannew">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="5,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.betterthannew">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnRepairComplete">
       <Conditions>
         <AbilityConditionItem tags="junctionbox,supercapacitor,battery,reactor,sonarmonitor,statusmonitor,navterminal"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStat stattype="DetoriationSpeed" value="0.7"/>
+        <CharacterAbilityGiveItemStat stattype="DetoriationSpeed" value="0.4"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -18,16 +18,16 @@
   <Talent identifier="buzzing">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="3,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.buzzing">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorMaxOutput" value="1.1" />
+        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorMaxOutput" value="1.2" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorMaxOutput" value="1.1" />
+        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorMaxOutput" value="1.2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -35,16 +35,16 @@
   <Talent identifier="cruising">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,0" sheetelementsize="128,128"/>
     <Description tag="talentdescription.cruising">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorFuelConsumption" value="0.8" />
+        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorFuelConsumption" value="0.6" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorFuelConsumption" value="0.8" />
+        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorFuelConsumption" value="0.6" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -52,10 +52,10 @@
   <Talent identifier="unstoppablecuriosity">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.gainforcedoorsopenspeed">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.phdinnuclearphysics">
-      <Replace tag="[powerincrease]" value="100" color="gui.green"/>
+      <Replace tag="[powerincrease]" value="200" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
       <Conditions>
@@ -63,7 +63,7 @@
         <AbilityConditionAttackData tags="crowbaritem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="1"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnItemPicked">
@@ -71,7 +71,7 @@
         <AbilityConditionItem tags="door,aliendoor" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="0.5" />
+        <CharacterAbilityModifyValue multiplyvalue="1" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -79,19 +79,19 @@
   <Talent identifier="pyromaniac">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.pyromaniac">
-      <Replace tag="[burnincrease]" value="25" color="gui.green"/>
+      <Replace tag="[burnincrease]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.flamer" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAddDamageAffliction">
       <Abilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="burn" addedmultiplier="0.25" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="burn" addedmultiplier="0.5" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="BallastFloraDamageMultiplier" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="BallastFloraDamageMultiplier" value="1"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="flamer"/>
@@ -100,11 +100,11 @@
   <Talent identifier="weaponartisan">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.crafthighqualityweapons">
-      <Replace tag="[qualitybonus]" value="1" color="gui.green"/>
+      <Replace tag="[qualitybonus]" value="2" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="weapon" stattype="IncreaseFabricationQuality" value="1" />
+        <CharacterAbilityGivePermanentStat statidentifier="weapon" stattype="IncreaseFabricationQuality" value="2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -114,7 +114,7 @@
     <Description tag="talentdescription.electrochemist">
       <Replace tag="[seconds]" value="10" color="gui.green"/>
       <Replace tag="[powerreduction]" value="80" color="gui.green"/>
-      <Replace tag="[stunseconds]" value="4" color="gui.green"/>
+      <Replace tag="[stunseconds]" value="8" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.arcemitter" color="gui.orange"/>
@@ -140,7 +140,7 @@
         <CharacterAbilityApplyStatusEffectsToAttacker>
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" targetlimb="Torso" delay="0.1" disabledeltatime="true">
-              <Affliction identifier="stun" amount="4.0"/>
+              <Affliction identifier="stun" amount="8"/>
               <Affliction identifier="electricshock" strength="60"/>
               <ParticleEmitter particle="ElectricShock" distancemin="0" distancemax="50" particleamount="5" anglemin="0" anglemax="360" scalemin="0.1" scalemax="0.2" />
               <sound file="Content/Items/Weapons/WEAPONS_electricalDischarge1.ogg" range="500" />
@@ -174,9 +174,9 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,0" sheetelementsize="128,128"/>
     <Description tag="talentdescription.melodicrespite2">
       <Replace tag="[duration]" value="10" color="gui.green"/>
-      <Replace tag="[buffamount]" value="25" color="gui.green"/>
+      <Replace tag="[buffamount]" value="50" color="gui.green"/>
       <Replace tag="[buffname]" value="stattypenames.repairspeed" color="gui.orange"/>
-      <Replace tag="[buffduration]" value="60" color="gui.green"/>
+      <Replace tag="[buffduration]" value="90" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnUseRangedWeapon">
       <Conditions>
@@ -198,10 +198,10 @@
         <AbilityConditionHasAffliction afflictionidentifier="melodicrespite_charging" minimumpercentage="0.9"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityApplyStatusEffectsToAllies range="600">
+        <CharacterAbilityApplyStatusEffectsToAllies range="1200">
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" multiplyafflictionsbymaxvitality="false" interval="1" disabledeltatime="true">
-              <Affliction identifier="melodicrespite" amount="60"/>
+              <Affliction identifier="melodicrespite" amount="90"/>
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffectsToAllies>
@@ -226,7 +226,7 @@
         <AbilityConditionAttackData tags="screwdriveritem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="2"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="4"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -234,11 +234,11 @@
   <Talent identifier="funwithfission">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.crafthighqualityfuelrods">
-      <Replace tag="[qualitybonus]" value="1" color="gui.green"/>
+      <Replace tag="[qualitybonus]" value="2" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="reactorfuel" stattype="IncreaseFabricationQuality" value="1" />
+        <CharacterAbilityGivePermanentStat statidentifier="reactorfuel" stattype="IncreaseFabricationQuality" value="2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -246,17 +246,17 @@
   <Talent identifier="grounded">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.skillbonus">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[skillname]" value="skillname.electrical" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.burn" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="10"/>
-        <CharacterAbilityGiveResistance resistanceid="burn" multiplier="0.8"/>
+        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="20"/>
+        <CharacterAbilityGiveResistance resistanceid="burn" multiplier="0.6"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -264,12 +264,12 @@
   <Talent identifier="egghead">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="400" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.skillgainspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="1.0"/>
+        <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="4"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -282,17 +282,17 @@
     </Description>
     <Description tag="talentdescription.junctionjunkie.30">
       <Replace tag="[requirement]" value="30" color="gui.green"/>
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[skill]" value="stattypenames.electricalskillbonus" color="gui.orange"/>
-      <Replace tag="[xpamount]" value="500" color="gui.green"/>
+      <Replace tag="[xpamount]" value="2000" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.junctionjunkie.50">
       <Replace tag="[requirement]" value="50" color="gui.green"/>
-      <Replace tag="[level]" value="1" color="gui.green"/>
+      <Replace tag="[level]" value="2" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.junctionjunkie.100">
       <Replace tag="[requirement]" value="100" color="gui.green"/>
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
     </Description>
 
     <!-- Give the player stats that tracks if the rewards should be given -->
@@ -319,8 +319,8 @@
         <AbilityConditionHasPermanentStat statidentifier="junctionjunkie_counter" min="30"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveExperience amount="500"/>
-        <CharacterAbilityGivePermanentStat stattype="ElectricalSkillBonus" statidentifier="junctionjunkie" value="10" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGiveExperience amount="2000"/>
+        <CharacterAbilityGivePermanentStat stattype="ElectricalSkillBonus" statidentifier="junctionjunkie" value="20" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="junctionjunkie_30" />
       </Abilities>
     </AbilityGroupEffect>
@@ -331,7 +331,7 @@
         <AbilityConditionHasPermanentStat statidentifier="junctionjunkie_counter" min="50"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityUpgradeSubmarine upgradeprefab="increaseovervoltageresistance" upgradecategory="junctionboxes" level="1" />
+        <CharacterAbilityUpgradeSubmarine upgradeprefab="increaseovervoltageresistance" upgradecategory="junctionboxes" level="2" />
         <CharacterAbilityResetPermanentStat statidentifier="junctionjunkie_50" />
       </Abilities>
     </AbilityGroupEffect>
@@ -342,7 +342,7 @@
         <AbilityConditionHasPermanentStat statidentifier="junctionjunkie_counter" min="100"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGivePermanentStat stattype="ElectricalRepairSpeed" statidentifier="junctionjunkie" value="0.5" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGivePermanentStat stattype="ElectricalRepairSpeed" statidentifier="junctionjunkie" value="1" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="junctionjunkie_100" />
       </Abilities>
     </AbilityGroupEffect>
@@ -351,12 +351,12 @@
   <Talent identifier="stationengineer">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.stationengineer">
-      <Replace tag="[bonus]" value="30" color="gui.green"/>
+      <Replace tag="[bonus]" value="120" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.stationengineerbuff">
-      <Replace tag="[amount1]" value="50" color="gui.green"/>
+      <Replace tag="[amount1]" value="100" color="gui.green"/>
       <Replace tag="[skill1]" value="stattypenames.repairspeed" color="gui.orange"/>
-      <Replace tag="[amount2]" value="50" color="gui.green"/>
+      <Replace tag="[amount2]" value="100" color="gui.green"/>
       <Replace tag="[skill2]" value="stattypenames.repairtoolstructurerepairmultiplier" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -364,7 +364,7 @@
         <AbilityConditionMission missiontype="Beacon"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.3"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="0.9">
@@ -386,7 +386,7 @@
   <Talent identifier="militaryapplications">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.skillbonus">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[skillname]" value="skillname.weapons" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
@@ -394,7 +394,7 @@
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="40"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="depletedfuel"/>
@@ -439,12 +439,12 @@
       <Replace tag="[itemname]" value="entityname.handheldelectricalmonitor" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.repairspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityModifyStat stattype="RepairSpeed" value="0.5"/>
+        <CharacterAbilityModifyStat stattype="RepairSpeed" value="1"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="handheldelectricalmonitor"/>
@@ -453,7 +453,7 @@
   <Talent identifier="phdinnuclearphysics">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="3,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.phdinnuclearphysics">
-      <Replace tag="[powerincrease]" value="200" color="gui.green"/>
+      <Replace tag="[powerincrease]" value="400" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.doesnotstackwith">
       <Replace tag="[talentname]" value="talentname.unstoppablecuriosity" color="gui.orange"/>
@@ -466,7 +466,7 @@
         <AbilityConditionAttackData tags="crowbaritem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="2"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="4"/>
       </Abilities>
     </AbilityGroupEffect>
     <!--<AbilityGroupInterval interval="0.5" >
@@ -483,24 +483,24 @@
   <Talent identifier="unlimitedpower">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="3,0" sheetelementsize="128,128"/>
     <Description tag="talentdescription.crafthighqualitybatteries">
-      <Replace tag="[qualitybonus]" value="1" color="gui.green"/>
+      <Replace tag="[qualitybonus]" value="2" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlimitedpower">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="mobilebattery" stattype="IncreaseFabricationQuality" value="1" />
+        <CharacterAbilityGivePermanentStat statidentifier="mobilebattery" stattype="IncreaseFabricationQuality" value="2" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="supercapacitor,battery" stattype="BatteryCapacity" value="1.1" />
+        <CharacterAbilityGiveItemStatToTags tags="supercapacitor,battery" stattype="BatteryCapacity" value="1.2" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="supercapacitor,battery" stattype="BatteryCapacity" value="1.1" />
+        <CharacterAbilityGiveItemStatToTags tags="supercapacitor,battery" stattype="BatteryCapacity" value="1.2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
diff --git a/Content/Talents/Mechanic/AfflictionsMechanic.xml b/Content/Talents/Mechanic/AfflictionsMechanic.xml
index a2fe74cc..f6506c80 100644
--- a/Content/Talents/Mechanic/AfflictionsMechanic.xml
+++ b/Content/Talents/Mechanic/AfflictionsMechanic.xml
@@ -29,7 +29,7 @@
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="MeleeAttackMultiplier" value="0.2" />
+      <StatValue stattype="MeleeAttackMultiplier" value="0.3" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="7,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -46,9 +46,9 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1" 
             resistancefor="damage"
-            minresistance="0.1"
-            maxresistance="0.1">
-      <StatValue stattype="SwimmingSpeed" value="0.5" />
+            minresistance="0.15"
+            maxresistance="0.15">
+      <StatValue stattype="SwimmingSpeed" value="1" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="7,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -94,7 +94,7 @@
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="10" strengthchange="-1">
-      <StatValue stattype="MovementSpeed" value="0.20" />
+      <StatValue stattype="MovementSpeed" value="0.3" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="1,1" sheetelementsize="128,128"/>
   </Affliction>
diff --git a/Content/Talents/Mechanic/TalentsMechanic.xml b/Content/Talents/Mechanic/TalentsMechanic.xml
index 89977b7f..6e0a3216 100644
--- a/Content/Talents/Mechanic/TalentsMechanic.xml
+++ b/Content/Talents/Mechanic/TalentsMechanic.xml
@@ -22,15 +22,15 @@
   <Talent identifier="foolhardy">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="4,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.lowhealthstatboost">
-      <Replace tag="[health]" value="50" color="gui.green"/>
+      <Replace tag="[health]" value="68.5" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.physicalresistance" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
-        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.5"/>
+        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.69"/>
       </Conditions>
       <Abilities>
         <CharacterAbilityApplyStatusEffects>
@@ -47,15 +47,15 @@
   <Talent identifier="berserker">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="3,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.lowhealthstatboost">
-      <Replace tag="[health]" value="50" color="gui.green"/>
+      <Replace tag="[health]" value="68.5" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.meleedamagebonus" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
-        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.5"/>
+        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.69"/>
       </Conditions>
       <Abilities>
         <CharacterAbilityApplyStatusEffects>
@@ -72,10 +72,10 @@
   <Talent identifier="mudraptorwrestler">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.mudraptorwrestler">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="75" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="15" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.physicalresistance" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
@@ -86,12 +86,12 @@
         </AbilityConditionCharacter>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.5"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.75"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveResistance resistanceid="damage" multiplier="0.9"/>
+        <CharacterAbilityGiveResistance resistanceid="damage" multiplier="0.85"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -99,14 +99,14 @@
   <Talent identifier="heavylifting">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="1,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.heavylifting">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
         <AbilityConditionHoldingItem tags="alienartifact,crate"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.2"/>
+        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.3"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -114,10 +114,10 @@
   <Talent identifier="iamthatguy">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.iamthatguy">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.skillbonus">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
       <Replace tag="[skillname]" value="stattypenames.weaponsskillbonus" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
@@ -125,12 +125,12 @@
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="30"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnAddDamageAffliction">
       <Abilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="blunttrauma" addedmultiplier="0.2" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="blunttrauma" addedmultiplier="0.3" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="heavywrench"/>
@@ -140,7 +140,7 @@
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="3,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.robotics"/>
     <Description tag="talentdescription.roboticsreminder">
-      <Replace tag="[amount]" value="2" color="gui.green"/>
+      <Replace tag="[amount]" value="4" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.defensebotspawner,entityname.defensebotammobox" color="gui.orange"/>
@@ -168,11 +168,11 @@
   <Talent identifier="residualwaste">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.residualwaste">
-      <Replace tag="[chance]" value="20" color="gui.green"/>
+      <Replace tag="[chance]" value="69" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnItemDeconstructedMaterial">
       <Conditions>
-        <AbilityConditionServerRandom randomChance="0.2"/>
+        <AbilityConditionServerRandom randomChance="0.69"/>
         <!-- don't allow duplicating genetic materials, and prevent infinite FPGA circuits -->
         <AbilityConditionItem tags="geneticmaterial,unidentifiedgeneticmaterial,circuitboxcomponent,lightcomponent" invert="true"/>
       </Conditions>
@@ -185,11 +185,11 @@
   <Talent identifier="massproduction">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.massproduction">
-      <Replace tag="[chance]" value="40" color="gui.green"/>
+      <Replace tag="[chance]" value="58" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnItemFabricatedIngredients">
       <Conditions>
-        <AbilityConditionServerRandom randomChance="0.4" />
+        <AbilityConditionServerRandom randomChance="0.58" />
       </Conditions>
       <Abilities>
         <CharacterAbilityRemoveRandomIngredient>
@@ -202,18 +202,18 @@
   <Talent identifier="toolmaintenance">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="5,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.toolmaintenance">
-      <Replace tag="[amount]" value="1" color="gui.green"/>
+      <Replace tag="[amount]" value="2" color="gui.green"/>
     </Description>
     <!-- Give once when unlocking the talent -->
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="tool~toolmaintenance" stattype="IncreaseFabricationQuality" value="1" targetallies="true" setvalue="true"/>
+        <CharacterAbilityGivePermanentStat statidentifier="tool~toolmaintenance" stattype="IncreaseFabricationQuality" value="2" targetallies="true" setvalue="true"/>
       </Abilities>
     </AbilityGroupEffect>
     <!-- Give every 60 seconds for late comers -->
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="tool~toolmaintenance" stattype="IncreaseFabricationQuality" value="1" targetallies="true" setvalue="true"/>
+        <CharacterAbilityGivePermanentStat statidentifier="tool~toolmaintenance" stattype="IncreaseFabricationQuality" value="2" targetallies="true" setvalue="true"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -221,19 +221,19 @@
   <Talent identifier="miner">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="2,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.miner">
-      <Replace tag="[probability]" value="20" color="gui.green"/>
+      <Replace tag="[probability]" value="70" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.gainoredetachspeed">
-      <Replace tag="[amount]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="RepairToolDeattachTimeMultiplier" value="1"/>
+        <CharacterAbilityGiveStat stattype="RepairToolDeattachTimeMultiplier" value="3"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnItemDeconstructedMaterial">
       <Conditions>
-        <AbilityConditionServerRandom randomchance="0.2"/>
+        <AbilityConditionServerRandom randomchance="0.7"/>
         <AbilityConditionItem tags="ore"/>
       </Conditions>
       <Abilities>
@@ -265,13 +265,13 @@
   <Talent identifier="oiledmachinery">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="4,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.oiledmachinery">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.doesnotstack" />
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="fabricator" stattype="FabricationSpeed" value="1.5" />
-        <CharacterAbilityGiveItemStatToTags tags="deconstructor" stattype="DeconstructorSpeed" value="1.5" />
+        <CharacterAbilityGiveItemStatToTags tags="fabricator" stattype="FabricationSpeed" value="1" />
+        <CharacterAbilityGiveItemStatToTags tags="deconstructor" stattype="DeconstructorSpeed" value="1" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -285,7 +285,7 @@
   <Talent identifier="pumpndump">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="1,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.pumpndump">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.maxflow" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnRepairComplete">
@@ -293,7 +293,7 @@
         <AbilityConditionItem tags="pump"/>
       </conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStat stattype="PumpSpeed" value="1.1"/>
+        <CharacterAbilityGiveItemStat stattype="PumpSpeed" value="1.3"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -301,11 +301,11 @@
   <Talent identifier="ballastdenizen">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="7,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.ballastdenizen">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="HoldBreathMultiplier" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="HoldBreathMultiplier" value="1"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -313,8 +313,8 @@
   <Talent identifier="engineengineer">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.engineengineer">
-      <Replace tag="[amount]" value="2.5" color="gui.green"/>
-      <Replace tag="[max]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="5" color="gui.green"/>
+      <Replace tag="[max]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.maxspeed" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.doesnotstack" />
@@ -323,7 +323,7 @@
         <AbilityConditionHasLevel levelequals="1" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.025" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.05" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -331,7 +331,7 @@
         <AbilityConditionHasLevel levelequals="2" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.05" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.1" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -339,7 +339,7 @@
         <AbilityConditionHasLevel levelequals="3" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.075" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.15" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -347,7 +347,7 @@
         <AbilityConditionHasLevel levelequals="4" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.1" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.2" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -355,7 +355,7 @@
         <AbilityConditionHasLevel levelequals="5" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.125" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.25" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -363,7 +363,7 @@
         <AbilityConditionHasLevel levelequals="6" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.15" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.3" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -371,7 +371,7 @@
         <AbilityConditionHasLevel levelequals="7" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.175" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.35" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -379,7 +379,7 @@
         <AbilityConditionHasLevel minlevel="8" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.2" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.4" />
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -387,14 +387,14 @@
   <Talent identifier="multifunctional">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.multifunctional">
-      <Replace tag="[powerincrease]" value="50" color="gui.green"/>
+      <Replace tag="[powerincrease]" value="75" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
       <Conditions>
         <AbilityConditionAttackData tags="wrenchitem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.5"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.75"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
@@ -410,19 +410,19 @@
   <Talent identifier="salvagecrew">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.bonusxponmission">
-      <Replace tag="[xpbonus]" value="30" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="120" color="gui.green"/>
       <Replace tag="[missiontype]" value="missiontype.salvage" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.salvagecrew">
-      <Replace tag="[swimbonus]" value="50" color="gui.green"/>
-      <Replace tag="[resistanceamount]" value="10" color="gui.green"/>
+      <Replace tag="[swimbonus]" value="100" color="gui.green"/>
+      <Replace tag="[resistanceamount]" value="15" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
       <Conditions>
         <AbilityConditionMission missiontype="Salvage"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.3"/>
+        <CharacterAbilityModifyValue multiplyvalue="2.2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="0.9">
@@ -449,17 +449,17 @@
     </Description>
     <Description tag="talentdescription.machinemaniac.30">
       <Replace tag="[requirement]" value="12" color="gui.green"/>
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="15" color="gui.green"/>
       <Replace tag="[skill]" value="stattypenames.mechanicalskillbonus" color="gui.orange"/>
-      <Replace tag="[xpamount]" value="500" color="gui.green"/>
+      <Replace tag="[xpamount]" value="2000" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.machinemaniac.50">
       <Replace tag="[requirement]" value="20" color="gui.green"/>
-      <Replace tag="[level]" value="1" color="gui.green"/>
+      <Replace tag="[level]" value="2" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.machinemaniac.100">
       <Replace tag="[requirement]" value="40" color="gui.green"/>
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
     </Description>
 
     <!-- Give the player stats that tracks if the rewards should be given -->
@@ -486,8 +486,8 @@
         <AbilityConditionHasPermanentStat statidentifier="machinemaniac_counter" min="12"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveExperience amount="500"/>
-        <CharacterAbilityGivePermanentStat stattype="MechanicalSkillBonus" statidentifier="machinemaniac" value="10" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGiveExperience amount="2000"/>
+        <CharacterAbilityGivePermanentStat stattype="MechanicalSkillBonus" statidentifier="machinemaniac" value="15" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="machinemaniac_30" />
       </Abilities>
     </AbilityGroupEffect>
@@ -498,7 +498,7 @@
         <AbilityConditionHasPermanentStat statidentifier="machinemaniac_counter" min="20"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityUpgradeSubmarine upgradeprefab="increasemaxpumpflow" upgradecategory="pumps" level="1" />
+        <CharacterAbilityUpgradeSubmarine upgradeprefab="increasemaxpumpflow" upgradecategory="pumps" level="2" />
         <CharacterAbilityResetPermanentStat statidentifier="machinemaniac_50" />
       </Abilities>
     </AbilityGroupEffect>
@@ -509,7 +509,7 @@
         <AbilityConditionHasPermanentStat statidentifier="machinemaniac_counter" min="40"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGivePermanentStat stattype="MechanicalRepairSpeed" statidentifier="machinemaniac" value="0.5" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGivePermanentStat stattype="MechanicalRepairSpeed" statidentifier="machinemaniac" value="1" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="machinemaniac_100" />
       </Abilities>
     </AbilityGroupEffect>
@@ -518,11 +518,11 @@
   <Talent identifier="tinkerer">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="4,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.increasemaxrepairmechanical">
-      <Replace tag="[percentage]" value="40" color="gui.green"/>
+      <Replace tag="[percentage]" value="100" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MaxRepairConditionMultiplierMechanical" value="0.4"/>
+        <CharacterAbilityGiveStat stattype="MaxRepairConditionMultiplierMechanical" value="1"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -533,14 +533,14 @@
       <Replace tag="[itemname]" value="entityname.repairpack" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.freeupgrade">
-      <Replace tag="[level]" value="1" color="gui.green"/>
+      <Replace tag="[level]" value="2" color="gui.green"/>
       <Replace tag="[upgradename]" value="upgradename.decreaselowskillfixduration" color="gui.orange"/>
     </Description>
     <AddedRecipe itemidentifier="repairpack"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityUpgradeSubmarine upgradeprefab="decreaselowskillfixduration" upgradecategory="electricaldevices" level="1" />
-        <CharacterAbilityUpgradeSubmarine upgradeprefab="decreaselowskillfixduration" upgradecategory="mechanicaldevices" level="1" />
+        <CharacterAbilityUpgradeSubmarine upgradeprefab="decreaselowskillfixduration" upgradecategory="electricaldevices" level="2" />
+        <CharacterAbilityUpgradeSubmarine upgradeprefab="decreaselowskillfixduration" upgradecategory="mechanicaldevices" level="2" />
       </Abilities>
     </AbilityGroupEffect>
 
@@ -552,12 +552,12 @@
       <Replace tag="[itemname]" value="entityname.fixfoamgrenade,entityname.handheldstatusmonitor" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.repairtoolstructurerepairmultiplier" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="RepairToolStructureRepairMultiplier" value="0.25"/>
+        <CharacterAbilityGiveStat stattype="RepairToolStructureRepairMultiplier" value="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="fixfoamgrenade"/>
@@ -568,14 +568,14 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.letitdrain"/>
     <Description tag="talentdescription.letitdrainreminder">
-      <Replace tag="[itemcount]" value="2" color="gui.green"/>
+      <Replace tag="[itemcount]" value="8" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.portablepump" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="portablepump" stattype="MaxAttachableCount" value="2" />
+        <CharacterAbilityGivePermanentStat statidentifier="portablepump" stattype="MaxAttachableCount" value="8" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="portablepump"/>
@@ -584,13 +584,13 @@
   <Talent identifier="quickfixer">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="5,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.quickfixer">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
-      <Replace tag="[duration]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[duration]" value="20" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.repairmechanicaldevicestwiceasfast"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MechanicalRepairSpeed" value="1"/>
+        <CharacterAbilityGiveStat stattype="MechanicalRepairSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnRepairComplete">
@@ -601,7 +601,7 @@
         <CharacterAbilityApplyStatusEffects>
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" disabledeltatime="true">
-              <Affliction identifier="quickfixer" amount="10.0"/>
+              <Affliction identifier="quickfixer" amount="20"/>
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffects>
@@ -613,14 +613,14 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.doublescrapoutput" />
     <Description tag="talentdescription.findadditionalscrap">
-      <Replace tag="[probability]" value="20" color="gui.green"/>
+      <Replace tag="[probability]" value="69" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnItemDeconstructedMaterial">
       <Conditions>
         <AbilityConditionItem tags="scrap"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="2"/>
+        <CharacterAbilityModifyValue multiplyvalue="3"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnOpenItemContainer">
@@ -629,7 +629,7 @@
         <AbilityConditionItem tags="container"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilitySpawnItemsToContainer randomchance="0.2" oncepercontainer="true">
+        <CharacterAbilitySpawnItemsToContainer randomchance="0.69" oncepercontainer="true">
           <StatusEffects>
             <StatusEffect type="OnAbility" target="UseTarget" >
               <SpawnItem identifiers="scrap" spawnposition="ThisInventory" spawnifcantbecontained="false" />
diff --git a/Content/Talents/Security/AfflictionsSecurity.xml b/Content/Talents/Security/AfflictionsSecurity.xml
index cb54dbe5..cf709a1a 100644
--- a/Content/Talents/Security/AfflictionsSecurity.xml
+++ b/Content/Talents/Security/AfflictionsSecurity.xml
@@ -55,14 +55,14 @@
     isbuff="true"
     hideiconafterdelay="true"
     limbspecific="false"
-    maxstrength="4"
+    maxstrength="8"
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
-    <Effect minstrength="0" maxstrength="4"
+    <Effect minstrength="0" maxstrength="8"
       strengthchange="-1"
       resistancefor="damage,stun"
-      minresistance="0.25"
-      maxresistance="0.25"/>
+      minresistance="0.5"
+      maxresistance="0.5"/>
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="1,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
   
@@ -74,10 +74,10 @@
     limbspecific="false"
     maxstrength="15"
     treatmentthreshold="1000"
-    duration="15"
+    duration="30"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="15">
-      <StatValue stattype="AttackMultiplier" value="0.25" />
+      <StatValue stattype="AttackMultiplier" value="0.5" />
       <AbilityFlag flagtype="AlwaysStayConscious" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
@@ -93,7 +93,7 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="2"
       strengthchange="-1">
-      <StatValue stattype="AttackMultiplier" value="0.20" />
+      <StatValue stattype="AttackMultiplier" value="0.4" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
diff --git a/Content/Talents/Security/TalentsSecurity.xml b/Content/Talents/Security/TalentsSecurity.xml
index b536cec6..f9c05ea6 100644
--- a/Content/Talents/Security/TalentsSecurity.xml
+++ b/Content/Talents/Security/TalentsSecurity.xml
@@ -3,17 +3,17 @@
   <Talent identifier="gunrunner">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.gunrunner">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.walkfasterwhileaiming">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
         <AbilityConditionIsAiming weapontype="ranged"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.2"/>
+        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.4"/>
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="0.9">
@@ -21,7 +21,7 @@
         <AbilityConditionHoldingItem tags="ammobox,railgunammo"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.25"/>
+        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.5"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -29,17 +29,17 @@
   <Talent identifier="extrapowder">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="3,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.extrapowder">
-      <Replace tag="[rangeamount]" value="20" color="gui.green"/>
-      <Replace tag="[damageamount]" value="10" color="gui.green"/>
+      <Replace tag="[rangeamount]" value="60" color="gui.green"/>
+      <Replace tag="[damageamount]" value="20" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.crafthighqualityexplosives">
-      <Replace tag="[qualitybonus]" value="1" color="gui.green"/>
+      <Replace tag="[qualitybonus]" value="2" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ExplosionRadiusMultiplier" value="0.2"/>
-        <CharacterAbilityGiveStat stattype="ExplosionDamageMultiplier" value="0.1"/>
-        <CharacterAbilityGivePermanentStat statidentifier="demolitionsexpert" stattype="IncreaseFabricationQuality" value="1" />
+        <CharacterAbilityGiveStat stattype="ExplosionRadiusMultiplier" value="0.6"/>
+        <CharacterAbilityGiveStat stattype="ExplosionDamageMultiplier" value="0.2"/>
+        <CharacterAbilityGivePermanentStat statidentifier="demolitionsexpert" stattype="IncreaseFabricationQuality" value="2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -47,7 +47,7 @@
   <Talent identifier="rifleman">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="7,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.moredamagerifles">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.assaultrifle,entityname.assaultriflemagazine,entityname.rifle,entityname.riflebullet" color="gui.orange"/>
@@ -57,7 +57,7 @@
         <AbilityConditionAttackData tags="riflemanbonus"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.10"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="assaultrifle"/>
@@ -79,11 +79,11 @@
   <Talent identifier="inordinateexsanguination">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="2,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.extrableedingdamage">
-      <Replace tag="[amount]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAddDamageAffliction">
       <Abilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="bleeding" addedmultiplier="1.0" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="bleeding" addedmultiplier="2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -113,7 +113,7 @@
         </AbilityConditionCharacter>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="1" />
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -121,14 +121,14 @@
   <Talent identifier="easyturtle">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="4,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.easyturtle">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupInterval>
       <Conditions>
         <AbilityConditionInWater/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyResistance resistanceid="damage" multiplier="0.8"/>
+        <CharacterAbilityModifyResistance resistanceid="damage" multiplier="0.6"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -136,12 +136,12 @@
   <Talent identifier="daringdolphin">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="5,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.swimmingspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="SwimmingSpeed" value="0.25"/>
+        <CharacterAbilityGiveStat stattype="SwimmingSpeed" value="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -159,17 +159,17 @@
   <Talent identifier="buff">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="6,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.buffdurationmultiplier" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.opiateaddiction" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="BuffDurationMultiplier" value="0.5"/>
-        <CharacterAbilityGiveResistance resistanceid="opiateaddiction" multiplier="0.75"/>
+        <CharacterAbilityGiveStat stattype="BuffDurationMultiplier" value="100"/>
+        <CharacterAbilityGiveResistance resistanceid="opiateaddiction" multiplier="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -186,14 +186,14 @@
   <Talent identifier="weaponsmith">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.crafthighqualityweapons">
-      <Replace tag="[qualitybonus]" value="1" color="gui.green"/>
+      <Replace tag="[qualitybonus]" value="2" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.shotgun,entityname.smg" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="weapon" stattype="IncreaseFabricationQuality" value="1" />
+        <CharacterAbilityGivePermanentStat statidentifier="weapon" stattype="IncreaseFabricationQuality" value="2" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="shotgun"/>
@@ -258,17 +258,17 @@
   <Talent identifier="swole">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="6,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.maximumhealthmultiplier" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.meleeattackmultiplier" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MaximumHealthMultiplier" value="0.1"/>
-        <CharacterAbilityGiveStat stattype="MeleeAttackMultiplier" value="0.25"/>
+        <CharacterAbilityGiveStat stattype="MaximumHealthMultiplier" value="0.2"/>
+        <CharacterAbilityGiveStat stattype="MeleeAttackMultiplier" value="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -276,8 +276,8 @@
   <Talent identifier="protectandserve">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.protectandserve">
-      <Replace tag="[xpbonus]" value="30" color="gui.green"/>
-      <Replace tag="[repbonus]" value="100" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="120" color="gui.green"/>
+      <Replace tag="[repbonus]" value="200" color="gui.green"/>
       <Replace tag="[missiontype]" value="missiontype.escort" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -285,7 +285,7 @@
         <AbilityConditionMission missiontype="Escort"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.3"/>
+        <CharacterAbilityModifyValue multiplyvalue="2.2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnCrewGainMissionReputation">
@@ -294,49 +294,49 @@
       </Conditions>
       <Abilities>
         <!-- this modifies the reputation gain multiplier, adding 1 means 100% more rep -->
-        <CharacterAbilityModifyValue addedvalue="1"/>
+        <CharacterAbilityModifyValue addedvalue="3"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
   
   <Talent identifier="firstaidtraining">
     <Description tag="talentdescription.skillbonus">
-      <Replace tag="[amount]" value="15" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
       <Replace tag="[skillname]" value="skillname.medical" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.medicaleffectiveness">
-      <Replace tag="[amount]" value="35" color="gui.green"/>
+      <Replace tag="[amount]" value="70" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="0,2" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="15"/>
-        <CharacterAbilityGiveStat stattype="MedicalItemEffectivenessMultiplier" value="0.35" />
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="30"/>
+        <CharacterAbilityGiveStat stattype="MedicalItemEffectivenessMultiplier" value="0.7" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="physicalconditioning">
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.movementspeed" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.oxygenlow" color="gui.orange"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,2" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MovementSpeed" value="0.1"/>
-        <CharacterAbilityGiveResistance resistanceid="oxygenlow" multiplier="0.7"/>
+        <CharacterAbilityGiveStat stattype="MovementSpeed" value="0.2"/>
+        <CharacterAbilityGiveResistance resistanceid="oxygenlow" multiplier="0.4"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="scavenger">
     <Description tag="talentdescription.scavenger">
-      <Replace tag="[probability]" value="25" color="gui.green"/>
+      <Replace tag="[probability]" value="50" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,2" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="OnOpenItemContainer">
@@ -345,14 +345,14 @@
         <AbilityConditionItem tags="container"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityRegenerateLoot randomchance="0.25" randomChancePerItem="0.3" />
+        <CharacterAbilityRegenerateLoot randomchance="0.5" randomChancePerItem="0.6" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="beatcop">
     <Description tag="talentdescription.extrastunonenemies">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.beatcop"/>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,2" sheetelementsize="128,128"/>
@@ -361,10 +361,10 @@
         <AbilityConditionCharacter targettypes="Enemy,InFriendlySubmarine"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="stun,incrementalstun,progressivestun" addedmultiplier="0.5" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="stun,incrementalstun,progressivestun" addedmultiplier="1" />
       </Abilities>
       <FallbackAbilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="stun,incrementalstun,progressivestun" addedmultiplier="0.25" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="stun,incrementalstun,progressivestun" addedmultiplier="0.5" />
       </FallbackAbilities>
     </AbilityGroupEffect>
   </Talent>
@@ -372,10 +372,10 @@
   <Talent identifier="bythebook">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.bythebook">
-      <Replace tag="[moneyamount]" value="1250" color="gui.green"/>
-      <Replace tag="[experienceamount]" value="200" color="gui.green"/>
-      <Replace tag="[moneyamountmax]" value="2500" color="gui.green"/>
-      <Replace tag="[experienceamountmax]" value="400" color="gui.green"/>
+      <Replace tag="[moneyamount]" value="1875" color="gui.green"/>
+      <Replace tag="[experienceamount]" value="300" color="gui.green"/>
+      <Replace tag="[moneyamountmax]" value="15000" color="gui.green"/>
+      <Replace tag="[experienceamountmax]" value="2400" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAnyMissionCompleted">
       <Abilities>
@@ -386,10 +386,10 @@
 
   <Talent identifier="slayer">
     <Description tag="talentdescription.extrapowertoharpoons">
-      <Replace tag="[value]" value="25" color="gui.green"/>
+      <Replace tag="[value]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.extrapowertoharpoonsinopensea">
-      <Replace tag="[value]" value="50" color="gui.green"/>
+      <Replace tag="[value]" value="100" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="4,2" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
@@ -397,7 +397,7 @@
         <AbilityConditionAttackData tags="harpoonammo"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.25"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
@@ -406,15 +406,15 @@
         <AbilityConditionInHull invert="true" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.25"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="warlord">
     <Description tag="talentdescription.warlord">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
-      <Replace tag="[maxamount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[maxamount]" value="100" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.hmg,entityname.hmgmagazine" color="gui.orange"/>
@@ -428,7 +428,7 @@
         <AbilityConditionNearbyCharacterCount distance="500" targettypes="Enemy" count="1"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.1" />
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.2" />
       </Abilities>
     </AbilityGroupEffect>
 
@@ -438,7 +438,7 @@
         <AbilityConditionNearbyCharacterCount distance="500" targettypes="Enemy" count="2"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.1" />
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="1" />
       </Abilities>
     </AbilityGroupEffect>
 
@@ -475,9 +475,9 @@
 
   <Talent identifier="bootcamp">
     <Description tag="talentdescription.bootcamp">
-      <Replace tag="[xpamount]" value="50" color="gui.green"/>
-      <Replace tag="[level]" value="5" color="gui.green"/>
-      <Replace tag="[skillamount]" value="15" color="gui.green"/>
+      <Replace tag="[xpamount]" value="200" color="gui.green"/>
+      <Replace tag="[level]" value="10" color="gui.green"/>
+      <Replace tag="[skillamount]" value="30" color="gui.green"/>
       <Replace tag="[skilltype]" value="stattypenames.weaponsskillbonus" color="gui.orange"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="3,3" sheetelementsize="128,128"/>
@@ -492,28 +492,28 @@
     <AbilityGroupEffect abilityeffecttype="OnAnyMissionCompleted">
       <Conditions>
         <AbilityConditionHasPermanentStat statidentifier="bootcamp_receivedweaponbonus" min="1"/>
-        <AbilityConditionHasLevel minlevel="5" />
+        <AbilityConditionHasLevel minlevel="10" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGivePermanentStat stattype="WeaponsSkillBonus" statidentifier="bootcamp" value="15" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGivePermanentStat stattype="WeaponsSkillBonus" statidentifier="bootcamp" value="30" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="bootcamp_receivedweaponbonus" />
       </Abilities>
     </AbilityGroupEffect>
 
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
       <Conditions>
-        <AbilityConditionHasLevel maxlevel="4" />
+        <AbilityConditionHasLevel maxlevel="9" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.5"/>
+        <CharacterAbilityModifyValue multiplyvalue="3"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="implacable">
     <Description tag="talentdescription.cannotfallunconsciousforseconds">
-      <Replace tag="[powerincrease]" value="25" color="gui.green"/>
-      <Replace tag="[seconds]" value="15" color="gui.green"/>
+      <Replace tag="[powerincrease]" value="50" color="gui.green"/>
+      <Replace tag="[seconds]" value="30" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.maxtriggeruntildeath"/>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,3" sheetelementsize="128,128"/>
@@ -535,8 +535,8 @@
 
   <Talent identifier="commando">
     <Description tag="talentdescription.commando">
-      <Replace tag="[spreadreduction]" value="70" color="gui.green"/>
-      <Replace tag="[powerincrease]" value="10" color="gui.green"/>
+      <Replace tag="[spreadreduction]" value="140" color="gui.green"/>
+      <Replace tag="[powerincrease]" value="20" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,1" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
@@ -545,7 +545,7 @@
         <AbilityConditionAttackData weapontype="handheldranged" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.10"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval>
@@ -553,16 +553,16 @@
         <AbilityConditionCrouched/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyStat stattype="RangedSpreadReduction" value="0.7"/>
+        <CharacterAbilityModifyStat stattype="RangedSpreadReduction" value="1.4"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
 
   <Talent identifier="stonewall">
     <Description tag="talentdescription.stonewall">
-      <Replace tag="[physicaldamagereduction]" value="25" color="gui.green"/>
-      <Replace tag="[stunresistance]" value="25" color="gui.green"/>
-      <Replace tag="[seconds]" value="4" color="gui.green"/>
+      <Replace tag="[physicaldamagereduction]" value="50" color="gui.green"/>
+      <Replace tag="[stunresistance]" value="50" color="gui.green"/>
+      <Replace tag="[seconds]" value="8" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="0,3" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="OnAttackedResult">
@@ -570,7 +570,7 @@
         <CharacterAbilityApplyStatusEffects>
           <StatusEffects>
             <StatusEffect type="OnAbility" target="This" multiplyafflictionsbymaxvitality="true">
-              <Affliction identifier="stonewall" amount="4.0"/>
+              <Affliction identifier="stonewall" amount="8"/>
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffects>
@@ -589,7 +589,7 @@
 
   <Talent identifier="tandemfire">
     <Description tag="talentdescription.tandemfire">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,3" sheetelementsize="128,128"/>
     <AbilityGroupInterval interval="0.1">
diff --git a/Content/Talents/TalentTrees.xml b/Content/Talents/TalentTrees.xml
index 24906d01..b8c361d4 100644
--- a/Content/Talents/TalentTrees.xml
+++ b/Content/Talents/TalentTrees.xml
@@ -1,411 +1,2360 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TalentTrees>
-  <TalentTree jobidentifier="captain">
-    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="bountyhunter"/>
-        <TalentOption identifier="logisticsexpert"/>
-        <TalentOption identifier="prodigy"/>
-        <TalentOption identifier="inspirationalleader"/>
-        <TalentOption identifier="veteran"/>
-        <TalentOption identifier="travelingtradesman"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="emergencymaneuvers"/>
-        <TalentOption identifier="sailorwithnoname"/>
-        <TalentOption identifier="camaraderie"/>
-        <TalentOption identifier="downwiththeship"/>
-        <TalentOption identifier="gunsmith"/>
-        <TalentOption identifier="steadytune"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary" blocks="skipper,politician">
-      <TalentOptions>
-        <TalentOption identifier="quickdraw"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="lonewolf"/>
-        <TalentOption identifier="deputy"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="drunkensailor"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="bigguns"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="skipper" type="specialization" requires="captain_primary" blocks="gunslinger,politician">
-      <TalentOptions>
-        <TalentOption identifier="leadingbyexample"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="helmsman"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="inspiringpresence"/>
-        <TalentOption identifier="trickledown"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="family"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="politician" type="specialization" requires="captain_primary" blocks="gunslinger,skipper">
-      <TalentOptions>
-        <TalentOption identifier="commendations"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="yourreputation"/>
-        <TalentOption identifier="affiliation"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="campaigning"/>
-        <TalentOption identifier="networking"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="figurehead"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-  <TalentTree jobidentifier="securityofficer">
-    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="protectandserve"/>
-        <TalentOption identifier="warstories"/>
-        <TalentOption identifier="firstaidtraining"/>
-        <TalentOption identifier="physicalconditioning"/>
-        <TalentOption identifier="swole"/>
-        <TalentOption identifier="buff"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="5">
-        <TalentOption identifier="weaponsmith"/>
-        <TalentOption identifier="bythebook"/>
-        <TalentOption identifier="dontpushit"/>
-        <TalentOption identifier="bootcamp"/>
-        <TalentOption identifier="munitionsexpertise"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="frogman" type="specialization" requires="security_primary" blocks="enforcer,gunner">
-      <TalentOptions>
-        <TalentOption identifier="boardingparty"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="scavenger"/>
-        <TalentOption identifier="slayer"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="easyturtle"/>
-        <TalentOption identifier="daringdolphin"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="specops"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="enforcer" type="specialization" requires="security_primary" blocks="frogman,gunner">
-      <TalentOptions>
-        <TalentOption identifier="pacificationkit"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="beatcop"/>
-        <TalentOption identifier="stonewall"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="crustyseaman"/>
-        <TalentOption identifier="inordinateexsanguination"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="implacable"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="gunner" type="specialization" requires="security_primary" blocks="frogman,enforcer">
-      <TalentOptions>
-        <TalentOption identifier="rifleman"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="tandemfire"/>
-        <TalentOption identifier="commando"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="gunrunner"/>
-        <TalentOption identifier="extrapowder"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="warlord"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-  <TalentTree jobidentifier="assistant">
-    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="playingcatchup"/>
-        <TalentOption identifier="mailman"/>
-        <TalentOption identifier="skedaddle"/>
-        <TalentOption identifier="crewlayabout"/>
-        <TalentOption identifier="starterquest"/>
-        <TalentOption identifier="mule"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="revengesquad"/>
-        <TalentOption identifier="inspiringtunes"/>
-        <TalentOption identifier="bagitup"/>
-        <TalentOption identifier="peerlearning"/>
-        <TalentOption identifier="indenturedservitude"/>
-        <TalentOption identifier="jengamaster"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary" blocks="apprentice,clown">
-      <TalentOptions>
-        <TalentOption identifier="thewaitinglist"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="nonthreatening"/>
-        <TalentOption identifier="tastytarget"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="insurancepolicy"/>
-        <TalentOption identifier="anappleaday"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="thefriendswemade"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary" blocks="grayshirt,clown">
-      <TalentOptions>
-        <ShowCaseTalent identifier="apprenticeship">
-          <TalentOption identifier="apprenticeship_captain"/>
-          <TalentOption identifier="apprenticeship_doctor"/>
-          <TalentOption identifier="apprenticeship_security"/>
-          <TalentOption identifier="apprenticeship_mechanic"/>
-          <TalentOption identifier="apprenticeship_engineer"/>
-        </ShowCaseTalent>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="logisticssystems"/>
-        <TalentOption identifier="journeyman"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="loyalassistant"/>
-        <TalentOption identifier="disloyalscum"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="graduationceremony"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="clown" type="specialization" requires="assistant_primary" blocks="grayshirt,apprentice">
-      <TalentOptions>
-        <TalentOption identifier="enrollintoclowncollege"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="waterprankster"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="psychoclown"/>
-        <TalentOption identifier="chonkyhonks"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="truepotential"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-  <TalentTree jobidentifier="engineer">
-    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="5">
-        <TalentOption identifier="stationengineer"/>
-        <TalentOption identifier="junctionjunkie"/>
-        <TalentOption identifier="egghead"/>
-        <TalentOption identifier="grounded"/>
-        <TalentOption identifier="remotemonitor"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="5">
-        <TalentOption identifier="funwithfission"/>
-        <TalentOption identifier="melodicrespite"/>
-        <TalentOption identifier="submarineofthings"/>
-        <TalentOption identifier="aggressiveengineering"/>
-        <TalentOption identifier="samplecollection"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary" blocks="electrician,physicist">
-      <TalentOptions>
-        <TalentOption identifier="militaryapplications"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="heavyhitter"/>
-        <TalentOption identifier="armsrace"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="weaponartisan"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="nuclearoption"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="electrician" type="specialization" requires="engineer_primary" blocks="weaponsengineer,physicist">
-      <TalentOptions>
-        <TalentOption identifier="gridmaintainer"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="pyromaniac"/>
-        <TalentOption identifier="unlimitedpower"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="betterthannew"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="lightningwizard"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="physicist" type="specialization" requires="engineer_primary" blocks="weaponsengineer,electrician">
-      <TalentOptions>
-        <TalentOption identifier="unstoppablecuriosity"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="cruising"/>
-        <TalentOption identifier="buzzing"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="dangerzone"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="phdinnuclearphysics"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-  <TalentTree jobidentifier="mechanic">
-    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="salvagecrew"/>
-        <TalentOption identifier="machinemaniac"/>
-        <TalentOption identifier="safetyfirst"/>
-        <TalentOption identifier="multifunctional"/>
-        <TalentOption identifier="engineengineer"/>
-        <TalentOption identifier="ballastdenizen"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="5">
-        <TalentOption identifier="modularrepairs"/>
-        <TalentOption identifier="oiledmachinery"/>
-        <TalentOption identifier="pumpndump"/>
-        <TalentOption identifier="ironman"/>
-        <TalentOption identifier="retrofit"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary" blocks="machinist,brawler">
-      <TalentOptions>
-        <TalentOption identifier="miner"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="residualwaste"/>
-        <TalentOption identifier="massproduction"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="scrapsavant"/>
-        <TalentOption identifier="toolmaintenance"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="ironstorm"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary" blocks="scrapper,brawler">
-      <TalentOptions>
-        <TalentOption identifier="hullfixer"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="tinkerer"/>
-        <TalentOption identifier="quickfixer"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="letitdrain"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="robotics"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary" blocks="machinist,scrapper">
-      <TalentOptions>
-        <TalentOption identifier="iamthatguy"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="heavylifting"/>
-        <TalentOption identifier="mudraptorwrestler"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="foolhardy"/>
-        <TalentOption identifier="berserker"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="powerarmor"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-  <TalentTree jobidentifier="medicaldoctor">
-    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="healthinsurance"/>
-        <TalentOption identifier="nobodyimportantdies"/>
-        <TalentOption identifier="exampleofhealth"/>
-        <TalentOption identifier="laresistance"/>
-        <TalentOption identifier="selfcare"/>
-        <TalentOption identifier="stayinalive"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="5">
-        <TalentOption identifier="firemanscarry"/>
-        <TalentOption identifier="medicalcompanion"/>
-        <TalentOption identifier="dontdieonme"/>
-        <TalentOption identifier="nopressure"/>
-        <TalentOption identifier="blooddonor"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="xenologist" type="specialization" requires="medical_primary" blocks="medic,scientist">
-      <TalentOptions>
-        <TalentOption identifier="geneharvester"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="bloodybusiness"/>
-        <TalentOption identifier="genesplicer"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="blackmarketgenes"/>
-        <TalentOption identifier="genetampering"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="geneticgenious"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="medic" type="specialization" requires="medical_primary" blocks="xenologist,scientist">
-      <TalentOptions>
-        <TalentOption identifier="medicalexpertise"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="medicalassistance"/>
-        <TalentOption identifier="emergencyresponse"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="drsubmarine"/>
-        <TalentOption identifier="vitaminsupplements"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="miracleworker"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="scientist" type="specialization" requires="medical_primary" blocks="xenologist,medic">
-      <TalentOptions>
-        <TalentOption identifier="plaguedoctor"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="deliverysystem"/>
-        <TalentOption identifier="labcontacts"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="supersoldiers"/>
-        <TalentOption identifier="whatastench"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="macrodosing"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-</TalentTrees>
+<?xml version="1.0" encoding="utf-8"?>
+<TalentTrees>
+  <TalentTree jobidentifier="captain">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary" blocks="skipper,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary" blocks="gunslinger,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary" blocks="gunslinger,skipper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary" blocks="enforcer,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary" blocks="frogman,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary" blocks="frogman,enforcer">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary" blocks="apprentice,clown">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary" blocks="grayshirt,clown">
+      <TalentOptions maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary" blocks="grayshirt,apprentice">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary" blocks="electrician,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary" blocks="weaponsengineer,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary" blocks="weaponsengineer,electrician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary" blocks="machinist,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary" blocks="scrapper,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary" blocks="machinist,scrapper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary" blocks="medic,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary" blocks="xenologist,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary" blocks="xenologist,medic">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
+  <TalentTree jobidentifier="securityofficer">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary" blocks="skipper,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary" blocks="gunslinger,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary" blocks="gunslinger,skipper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary" blocks="enforcer,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary" blocks="frogman,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary" blocks="frogman,enforcer">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary" blocks="apprentice,clown">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary" blocks="grayshirt,clown">
+      <TalentOptions maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary" blocks="grayshirt,apprentice">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary" blocks="electrician,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary" blocks="weaponsengineer,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary" blocks="weaponsengineer,electrician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary" blocks="machinist,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary" blocks="scrapper,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary" blocks="machinist,scrapper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary" blocks="medic,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary" blocks="xenologist,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary" blocks="xenologist,medic">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
+  <TalentTree jobidentifier="assistant">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary" blocks="skipper,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary" blocks="gunslinger,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary" blocks="gunslinger,skipper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary" blocks="enforcer,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary" blocks="frogman,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary" blocks="frogman,enforcer">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary" blocks="apprentice,clown">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary" blocks="grayshirt,clown">
+      <TalentOptions maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary" blocks="grayshirt,apprentice">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary" blocks="electrician,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary" blocks="weaponsengineer,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary" blocks="weaponsengineer,electrician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary" blocks="machinist,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary" blocks="scrapper,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary" blocks="machinist,scrapper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary" blocks="medic,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary" blocks="xenologist,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary" blocks="xenologist,medic">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
+  <TalentTree jobidentifier="engineer">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary" blocks="skipper,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary" blocks="gunslinger,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary" blocks="gunslinger,skipper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary" blocks="enforcer,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary" blocks="frogman,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary" blocks="frogman,enforcer">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary" blocks="apprentice,clown">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary" blocks="grayshirt,clown">
+      <TalentOptions maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary" blocks="grayshirt,apprentice">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary" blocks="electrician,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary" blocks="weaponsengineer,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary" blocks="weaponsengineer,electrician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary" blocks="machinist,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary" blocks="scrapper,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary" blocks="machinist,scrapper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary" blocks="medic,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary" blocks="xenologist,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary" blocks="xenologist,medic">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
+  <TalentTree jobidentifier="mechanic">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary" blocks="skipper,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary" blocks="gunslinger,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary" blocks="gunslinger,skipper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary" blocks="enforcer,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary" blocks="frogman,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary" blocks="frogman,enforcer">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary" blocks="apprentice,clown">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary" blocks="grayshirt,clown">
+      <TalentOptions maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary" blocks="grayshirt,apprentice">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary" blocks="electrician,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary" blocks="weaponsengineer,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary" blocks="weaponsengineer,electrician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary" blocks="machinist,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary" blocks="scrapper,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary" blocks="machinist,scrapper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary" blocks="medic,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary" blocks="xenologist,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary" blocks="xenologist,medic">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
+  <TalentTree jobidentifier="medicaldoctor">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary" blocks="skipper,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary" blocks="gunslinger,politician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary" blocks="gunslinger,skipper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary" blocks="enforcer,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary" blocks="frogman,gunner">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary" blocks="frogman,enforcer">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary" blocks="apprentice,clown">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary" blocks="grayshirt,clown">
+      <TalentOptions maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary" blocks="grayshirt,apprentice">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary" blocks="electrician,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary" blocks="weaponsengineer,physicist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary" blocks="weaponsengineer,electrician">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary" blocks="machinist,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary" blocks="scrapper,brawler">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary" blocks="machinist,scrapper">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary" blocks="medic,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary" blocks="xenologist,scientist">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary" blocks="xenologist,medic">
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
</TalentTrees>
diff --git a/Content/Upgrades/UpgradeModules.xml b/Content/Upgrades/UpgradeModules.xml
index 2bccc7db..677fd26e 100644
--- a/Content/Upgrades/UpgradeModules.xml
+++ b/Content/Upgrades/UpgradeModules.xml
@@ -65,12 +65,12 @@
   <!-- Work in progress. TODO: ResourceCost, MaxLevel per class and tier -->
   <!-- WALLS -->
 
-  <UpgradeModule identifier="increasewallhealth" maxlevel="6" categories="walls" increaseontooltip="20">
+  <UpgradeModule identifier="increasewallhealth" maxlevel="6" categories="walls" increaseontooltip="40">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+400%"/>
     <ResourceCost item="steel" amount="5" levels="1-2"/>
     <ResourceCost item="titaniumaluminiumalloy" amount="5" levels="3-4"/>
     <ResourceCost item="physicorium" amount="5" levels="5-6"/>
-    <Structure maxhealth="+20%" crushdepth="+15%"/>
+    <Structure maxhealth="+40%" crushdepth="+15%"/>
     <MaxLevel tier="1" level="2"/>
     <MaxLevel tier="2" level="4"/>
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="640,640,128,128" origin="0.5,0.5"/>
@@ -78,31 +78,31 @@
 
   <!-- FABRICATOR -->
 
-  <UpgradeModule identifier="increasefabricationspeed" maxlevel="3" categories="fabricators" increaseontooltip="30">
+  <UpgradeModule identifier="increasefabricationspeed" maxlevel="3" categories="fabricators" increaseontooltip="60">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="transport" level="+1"/>
-    <Fabricator fabricationspeed="+30%" powerconsumption="+5%"/>
+    <Fabricator fabricationspeed="+60%" powerconsumption="+5%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,768,64,64" depth="0.75" origin="0.5,0.5"/>-->-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="0,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- DECONSTRUCTOR -->
 
-  <UpgradeModule identifier="decreasedeconstructiontime" maxlevel="3" categories="deconstructors" increaseontooltip="30">
+  <UpgradeModule identifier="decreasedeconstructiontime" maxlevel="3" categories="deconstructors" increaseontooltip="60">
     <Price baseprice="1500" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="transport" level="+1"/>
-    <Deconstructor deconstructionspeed="+30%" powerconsumption="+5%"/>
+    <Deconstructor deconstructionspeed="+60%" powerconsumption="+5%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,192,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="768,640,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- TURRET -->
 
-  <UpgradeModule identifier="turretdecreasepowerconsumption" maxlevel="3" categories="weapons" increaseontooltip="8">
+  <UpgradeModule identifier="turretdecreasepowerconsumption" maxlevel="3" categories="weapons" increaseontooltip="16">
     <Price baseprice="1500" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
@@ -112,75 +112,84 @@
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,896,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="turretincreaserotationlowskill" maxlevel="3" categories="weapons" increaseontooltip="20">
+  <UpgradeModule identifier="turretincreaserotationlowskill" maxlevel="3" categories="weapons" increaseontooltip="40">
     <Price baseprice="1500" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="attack" level="+1"/>
-    <Turret rotationspeedlowskill="+20%"/>
+    <Turret rotationspeedlowskill="+40%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,384,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="256,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="turretincreaseoffsetonselected" maxlevel="3" categories="weapons" increaseontooltip="4">
+  <UpgradeModule identifier="turretincreaseoffsetonselected" maxlevel="3" categories="weapons" increaseontooltip="8">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="attack" level="+1"/>
     <MaxLevel class="scout" level="+1"/>
-    <Item offsetonselectedmultiplier="+4%"/>
-    <LightComponent range="+16%"/>
+    <Item offsetonselectedmultiplier="+8%"/>
+    <LightComponent range="+32%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="768,320,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="384,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- REACTOR -->
 
-  <UpgradeModule identifier="increasereactoroutput" maxlevel="3" categories="reactors" increaseontooltip="3">
+  <UpgradeModule identifier="increasereactoroutput" maxlevel="3" categories="reactors" increaseontooltip="6">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <Reactor maxpoweroutput="+3%"/>
+    <Reactor maxpoweroutput="+6%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="576,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,640,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="decreasefuelconsumption" maxlevel="3" categories="reactors" increaseontooltip="-20">
+  <UpgradeModule identifier="decreasefuelconsumption" maxlevel="3" categories="reactors" increaseontooltip="-40">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="transport" level="+1"/>
-    <Reactor fuelconsumptionrate="-20%" meltdowndelay="+20%"/>
+    <Reactor fuelconsumptionrate="-20%" meltdowndelay="+40%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="384,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="256,640,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- PUMP -->
 
-  <UpgradeModule identifier="increasemaxpumpflow" maxlevel="3" categories="pumps" increaseontooltip="10">
+  <UpgradeModule identifier="increasemaxpumpflow" maxlevel="3" categories="pumps" increaseontooltip="20">
     <Price baseprice="3000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <Pump maxflow="+10%" powerconsumption="-5%"/>
+    <Pump maxflow="+20%" powerconsumption="-5%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="896,256,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="896,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- ENGINE -->
 
-  <UpgradeModule identifier="increaseenginemaxforce" maxlevel="3" categories="engines" increaseontooltip="8">
+  <UpgradeModule identifier="increaseenginemaxforce" maxlevel="3" categories="engines" increaseontooltip="16">
     <Price baseprice="2500" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="scout" level="+1"/>
-    <Engine maxforce="+8%" />
+    <Engine maxforce="+16%" />
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="256,128,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="896,640,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- BATTERIES -->
 
-  <UpgradeModule identifier="increasebatterycapacity" maxlevel="3" categories="batteries" increaseontooltip="20">
+  <UpgradeModule identifier="increasebatterycapacity" maxlevel="3" categories="batteries" increaseontooltip="40">
+    <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
+    <MaxLevel tier="1" level="1"/>
+    <MaxLevel tier="2" level="2"/>
+    <PowerContainer capacity="+40%"/>
+    <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="832,0,64,64" depth="0.75" origin="0.5,0.5"/>-->
+    <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,768,128,128" origin="0.5,0.5"/>
+  </UpgradeModule>
+
+  <UpgradeModule identifier="increasesupercapacitorcapacity" maxlevel="3" categories="supercapacitors" increaseontooltip="20">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
@@ -189,66 +198,57 @@
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="increasesupercapacitorcapacity" maxlevel="3" categories="supercapacitors" increaseontooltip="10">
+  <UpgradeModule identifier="increasebatteryrechargespeed" maxlevel="3" categories="batteries" increaseontooltip="20">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <PowerContainer capacity="+10%"/>
-    <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="832,0,64,64" depth="0.75" origin="0.5,0.5"/>-->
-    <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,768,128,128" origin="0.5,0.5"/>
-  </UpgradeModule>
-
-  <UpgradeModule identifier="increasebatteryrechargespeed" maxlevel="3" categories="batteries" increaseontooltip="10">
-    <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
-    <MaxLevel tier="1" level="1"/>
-    <MaxLevel tier="2" level="2"/>
-    <PowerContainer maxrechargespeed="+10%"/>
+    <PowerContainer maxrechargespeed="+20%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="640,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="increasesupercapacitorrechargespeed" maxlevel="3" categories="supercapacitors" increaseontooltip="10">
+  <UpgradeModule identifier="increasesupercapacitorrechargespeed" maxlevel="3" categories="supercapacitors" increaseontooltip="20">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <PowerContainer maxrechargespeed="+10%"/>
+    <PowerContainer maxrechargespeed="+20%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="640,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- JUNCTION BOXES -->
 
-  <UpgradeModule identifier="increaseovervoltageresistance" maxlevel="3" categories="junctionboxes" increaseontooltip="10">
+  <UpgradeModule identifier="increaseovervoltageresistance" maxlevel="3" categories="junctionboxes" increaseontooltip="20">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <PowerTransfer fireprobability="-10%" overloadvoltage="+10%"/>
+    <PowerTransfer fireprobability="-10%" overloadvoltage="+20%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="63,320,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="128,640,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- MACHINE REPAIRS -->
 
-  <UpgradeModule nameidentifier="increasemaxcondition" descriptionidentifier="increasemaxcondition" identifier="decreasedeteriorationspeed" maxlevel="3" categories="electricaldevices,mechanicaldevices" increaseontooltip="20" >
+  <UpgradeModule nameidentifier="increasemaxcondition" descriptionidentifier="increasemaxcondition" identifier="decreasedeteriorationspeed" maxlevel="3" categories="electricaldevices,mechanicaldevices" increaseontooltip="40" >
     <Price baseprice="1500" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <Item healthmultiplier="+0.2"/>
+    <Item healthmultiplier="+0.4"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,0,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="128,896,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="decreaselowskillfixduration" maxlevel="3" categories="electricaldevices,mechanicaldevices" increaseontooltip="10">
+  <UpgradeModule identifier="decreaselowskillfixduration" maxlevel="3" categories="electricaldevices,mechanicaldevices" increaseontooltip="20">
     <Price baseprice="1000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <Repairable fixdurationlowskill="-10%" skillrequirementmultiplier="-10%"/>
+    <Repairable fixdurationlowskill="-20%" skillrequirementmultiplier="-20%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="256,896,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- MONITORS -->
-  <UpgradeModule identifier="enablemineralscanner" maxlevel="0" categories="monitors" increaseontooltip="100">
+  <UpgradeModule identifier="enablemineralscanner" maxlevel="0" categories="monitors" increaseontooltip="200">
     <MaxLevel class="scout" level="+1"/>
     <MaxLevel class="transport" level="+1"/>
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
diff --git a/Content/hashes.txt b/Content/hashes.txt
index c928f1da..83d43f3a 100644
--- a/Content/hashes.txt
+++ b/Content/hashes.txt
@@ -1,11 +1,11 @@
 Afflictions.xml d6f9a92ac1793e846fd72fb27945d8ebe64e0fdc12bc7b8858b0a39a290cd855
 AfflictionsGeneticMaterial.xml 4764e9041f2939ea38284a673c592eb65d6b8d04f674573ac7d18abbd525153a
-BackgroundCreatures/BackgroundCreaturePrefabs.xml 801567d5b7b07c90c721880ce910612e568c3c3c202b89159bae64be5dd281fd
+BackgroundCreatures/BackgroundCreaturePrefabs.xml 95cf679e765ab164da6cb13a857325d4f01ea766d606039231fb18ecbb904e3f
 Characters/Ancient/Ancient.xml 8bc0203c6a708719c19dba0cd911099b112ecfca1457ce1664ca84ab00275f6a
-Characters/Ancient/Animations/AncientSwimFast.xml 8b19fa9a44d16154691a7b378d908826d39295328d2ac3c76a8e2b025063dfff
+Characters/Ancient/Animations/AncientSwimFast.xml 8be672e5a0f2711aeb2e0cf890f590d6c1410769b659bdd5c8751985b2153066
 Characters/Ancient/Animations/AncientSwimSlow.xml 01a6105e988d992e1d76a006eb448af247592a4c9d793766914dbfa2363dd6c1
 Characters/Ancient/Ragdolls/AncientDefaultRagdoll.xml 10d4f2ae9e052e48b89ffc95c136a98b17267673c09efa31f85e91591a0cc360
-Characters/Balloon/Animations/BalloonRun.xml 4e50cf73bdd122aca3b6d256967669069518a88fe2d0b58b157a1e1a044c27ae
+Characters/Balloon/Animations/BalloonRun.xml 69ed8cb95140b51490bbe800be5d025f55e3916c6e183e9b042ef5026fb5bf46
 Characters/Balloon/Animations/BalloonSwimFast.xml b486c84d62ddcfe4be62c7fa2b2e1d58aba245f82f8348749bca3dab0f04911c
 Characters/Balloon/Animations/BalloonSwimSlow.xml 539ae4fb0dd110b0d53b4792ee2d6aaf8ba7931935002b23fcc913143c68d351
 Characters/Balloon/Animations/BalloonWalk.xml 6abd7204ff40455110b9c234b46736d764a14f58251e13e4b27200302f4ce11d
@@ -14,15 +14,15 @@ Characters/Balloon/Ragdolls/BalloonDefaultRagdoll.xml 9f390cc4c69f41d53c0548f7db
 Characters/Bonethresher/Animations/BonethresherSwimFast.xml 2b65caf1b003981348d040c4aa0078e72ec39443ce15e6d15e00b7408beaf564
 Characters/Bonethresher/Animations/BonethresherSwimSlow.xml b8933e4c99dc52e5c5fbc8c215ed2f761907c6ee3c9dd225c8a77940bf16a91a
 Characters/Bonethresher/Bonethresher.xml c656b75d5d5957d364ab3048fb2614e030b84b996f23378c4f5171eb00c34335
-Characters/Bonethresher/Ragdolls/BonethresherDefaultRagdoll.xml 0f605f4172511fae2715db49b9eb3e85e8cd76244b1fc0b7b0f231ece18e4eda
+Characters/Bonethresher/Ragdolls/BonethresherDefaultRagdoll.xml ca0bdf01e771e29c5ee8ac1aa82e3e9c0f471cac914ba64966f1550f83522e10
 Characters/Carrier/Animations/CarrierSwimFast.xml 4ad68d56a00d0b20e22d0a7a6fb6b639e88ba771e74a3f582e46ed7940ec611a
 Characters/Carrier/Animations/CarrierSwimSlow.xml 2c520260e8c9b05b8d28d9f2b9a6bdc89617d97ad1c91d69929c8602ba465034
 Characters/Carrier/Carrier.xml 51831eb7f9fd029ab2523a80deaba98fa664df7c96041caaaf7c1eb25e058db7
 Characters/Carrier/Ragdolls/CarrierDefaultRagdoll.xml 45af68620b64ee99acc02aee85da920c2bc7176563093d26c03b32b827976dd2
 Characters/Charybdis/Animations/CharybdisSwimFast.xml d3b10c2b0d07d9b3a2b6143904642d2d75df0db2facb8573404877a7160df37a
 Characters/Charybdis/Animations/CharybdisSwimSlow.xml 93d159694a8ce55b40c9a6d6e70104ce0218f280e716d137a1d624016841872a
-Characters/Charybdis/Charybdis.xml 5037f78dd315879c11dc268b81ff545850a3df82a8b9fdd94a32b59992a8e915
-Characters/Charybdis/Ragdolls/CharybdisDefaultRagdoll.xml 066be861348b78a83166b975febda7a30ea033475ebb12926bdeab3b5323272c
+Characters/Charybdis/Charybdis.xml 772b5f2353e41273cdd319e7a21cbbdf7ad816ed03b82113f1859687541ff2af
+Characters/Charybdis/Ragdolls/CharybdisDefaultRagdoll.xml e48fc470dc53862e127a5177f454376b6eeffb96a60bab8814f3b3e2e8369d0d
 Characters/Charybdisold/Animations/CharybdisoldSwimFast.xml ba771a51db89f72f16d7697ae8f3582461b07af6b42238606cfe40640d45a881
 Characters/Charybdisold/Animations/CharybdisoldSwimSlow.xml 7a874ae3bf30ceb854627dc408dbf800e85448d1a2883b8075317dc8067ccc09
 Characters/Charybdisold/Charybdisold.xml 1880979ea9f14b8eed6c38810f00ed4c7f1f3e5e5435888064b5451165c0e2c4
@@ -30,74 +30,74 @@ Characters/Charybdisold/Ragdolls/CharybdisoldDefaultRagdoll.xml bb725c0459cd302b
 Characters/Coelanth/Animations/CoelanthSwimFast.xml b654488d4a85f6fc4ae8fb021a0821a8512512d7925ef6b83f437497e657f40a
 Characters/Coelanth/Animations/CoelanthSwimSlow.xml 7eec06796c24f86c2895eb93fb35d570bd7a9ee409ae0c5d23741d5cc2840aef
 Characters/Coelanth/Coelanth.xml 26b79e6e18c9951e60d6c329a9b54ddb311a1c2f5d130a74cd7fac50c734ba26
-Characters/Coelanth/Ragdolls/CoelanthDefaultRagdoll.xml 1b6324443781af1edee0ffccda6e924dd400791bfdf76fbbfceb4200f0f619e2
+Characters/Coelanth/Ragdolls/CoelanthDefaultRagdoll.xml d629174ecad2cb7ca9f3326f7921984d8fd92b8958d79fbe64646c977c2727ee
 Characters/Crawler/Animations/CrawlerRun.xml 68eb8a1da2e3e2c37a35dad2c30d51d4bff07357af4976b51c5a05d9b49ac008
-Characters/Crawler/Animations/CrawlerSwimFast.xml c0bb178acbb93473c3a885913c6f23c7b9216a23a1471a82c507149bb7ffe996
+Characters/Crawler/Animations/CrawlerSwimFast.xml a82310c6949366807e56a798cc261f1329d85ba479773102656ba7fa10df1a4e
 Characters/Crawler/Animations/CrawlerSwimSlow.xml b743f4a446671d5c24c4151d21f7264c9b00746401505709b4e7c15998add909
 Characters/Crawler/Animations/CrawlerWalk.xml a1ecbd6fac306b7f137270100093022e9772749c3adec1d00888d3ebc92d7af3
 Characters/Crawler/Crawler.xml a57d65aa3c9ec73acbed6273a4b5e4aefefebf65f25be77132e5212a1938347d
 Characters/Crawler/Ragdolls/CrawlerDefaultRagdoll.xml 7dd8d66a925912154513cba57ac2b3366c2dc89114d5e072e113427cc26591f1
 Characters/Crawlerbroodmother/Animations/CrawlerbroodmotherSwimFast.xml 069ebcb129728fac05a880c81a4c97c84e1701ff31eb3567fda56f7552f8eb35
-Characters/Crawlerbroodmother/Animations/CrawlerbroodmotherSwimSlow.xml 4570e2d831275c892ccc1de906c9814b78b69757cdc6da86aba83aaa77a143d1
+Characters/Crawlerbroodmother/Animations/CrawlerbroodmotherSwimSlow.xml 50b68c583e25198880ef2fc58d3002e15b8a43f795a82cd050527676475037a5
 Characters/Crawlerbroodmother/Crawlerbroodmother.xml d14b55fb5b3ac78f92cdbca4804c20e77fc4946cd38d03da54bf562bbc0b2f7c
 Characters/Crawlerbroodmother/Ragdolls/CrawlerbroodmotherDefaultRagdoll.xml 9697cf57fef7d8d64b9a07296166d10113f996e089b1feb545e3069c69c25e89
-Characters/Crawlerhusk/Animations/CrawlerhuskRun.xml 64d85221c5edce50b981c4187db667db37f8f7b74c10b0c2ea303b35a5e51b91
+Characters/Crawlerhusk/Animations/CrawlerhuskRun.xml d4d1924e355b0d0777cccfca0c776155dd13a14bdf2ffc923e68f0db9d762f3b
 Characters/Crawlerhusk/Animations/CrawlerhuskSwimFast.xml 641303bf888f61be62afb28543ca623d9846420641f81f1fb1385a92c1c9a6bd
 Characters/Crawlerhusk/Animations/CrawlerhuskSwimSlow.xml 8fe3aba81776940a173806e69f19166d3de7ecf9a14e473e5eeeb80d614a7496
 Characters/Crawlerhusk/Animations/CrawlerhuskWalk.xml 68e6384c8d54ff6b0ef1529983fcfd56f2ab15c32e968c89bda7918981170870
-Characters/Crawlerhusk/Crawlerhusk.xml 827525a811e2de1b41a2525217bbfdade7f37fe9400d517a3dbf448809a72600
+Characters/Crawlerhusk/Crawlerhusk.xml 6c9ae1bfabdbc47cc8d5a0ee64f15e9667de7fc0421f3b89cd0292a7ce3f93d1
 Characters/Crawlerhusk/Ragdolls/CrawlerhuskDefaultRagdoll.xml 9f8a2b440738957fc90984debbd873fbac250856f534defa6f757d868c495d7e
 Characters/Cyborgworm/Animations/CyborgwormSwimFast.xml 438e22941dcac73cdd1221548d5235516253bfc9f68770deece2df0d2767f338
 Characters/Cyborgworm/Animations/CyborgwormSwimSlow.xml 923ffca782e96af54a8242c1368041c12ab535d78ea0711f36188dec58ddcf20
-Characters/Cyborgworm/Cyborgworm.xml c2fc355f2e56b52baceac12be3bb82eeeae1db3c7d44b0580c59bf2f5124a575
+Characters/Cyborgworm/Cyborgworm.xml 8e800fec09a064058fa6ebf6e39dd7adde2ada3c37064f396596d230207e81c9
 Characters/Cyborgworm/Ragdolls/CyborgwormDefaultRagdoll.xml 7e9ae2abe95088e9895ee885c38833c09a2dab820a184b293aa258fc5e2e8df1
 Characters/Defensebot/Animations/DefensebotRun.xml 2ca8c640f2e05573b7c61c4878b3bfd0ce031a7b01b36ea6b716da8b901f738b
 Characters/Defensebot/Animations/DefensebotSwimFast.xml 49b9918745cc322eef5f7a72c4ceb4e5d8d6aa3738b1baf12df356011c6dbef8
 Characters/Defensebot/Animations/DefensebotSwimSlow.xml c2b3cdb8982cc8bd1d6095a6a1caeb0c3c59adaf34a545fc4d11e7fcb24184c0
 Characters/Defensebot/Animations/DefensebotWalk.xml 2be802ad13ecfedb9bbdf7489c0088107ba6f1c6e7595975ecafd3dc25c9d076
-Characters/Defensebot/Defensebot.xml bb5a1b17fd922dd453b9e8647b683927f65c77cde3185bafcda0223dd9949f8f
+Characters/Defensebot/Defensebot.xml e664aa15a47389580a93e8c022b61bf5308def500cf6e6e72b66b7a7c27b7812
 Characters/Defensebot/Ragdolls/DefensebotDefaultRagdoll.xml 83a63e254fb345872630d4a0322f081a31bbebcc8f9b484925f07540049d427f
-Characters/Endworm/Animations/EndwormSwimFast.xml d32efd99462a7c6a371e04384aefea98a1a2f99325739d36a0eeb6f174ee422e
-Characters/Endworm/Animations/EndwormSwimSlow.xml e29f8dc9920f0ee506a329bb6132be82fb2f62f4eca7a90a1f8bee7cb07daf39
+Characters/Endworm/Animations/EndwormSwimFast.xml 5ed01739e62e0bb1bebfefd3eab561641c2e3684b9e3029818e0fa11a40d1350
+Characters/Endworm/Animations/EndwormSwimSlow.xml db4c4873f9d2b04c085a8152ed9c08719f8a7439c179e84ea37af832f3e06fb7
 Characters/Endworm/Endworm.xml 12612c8bf536c22eae856c9778dab73658e8bc2ce23c9a28510d9c73cd0323f8
-Characters/Endworm/Ragdolls/EndwormDefaultRagdoll.xml 811f79e2b286b776f545eee231fba76c764e80e938e973f8242b0562f17b2427
-Characters/Fractalguardian/Animations/FractalguardianSwimFast.xml 9a4c3b7627c6466aeabf02815df4e19d72d719a56508b2c033632e63024ddb54
+Characters/Endworm/Ragdolls/EndwormDefaultRagdoll.xml b02d7703dad3d54580bb09fb82f66660da0ab5148efcc62c4e9433db20ea072f
+Characters/Fractalguardian/Animations/FractalguardianSwimFast.xml 42fbf9ede48391d946ff4da5e7dc2310e00dc73a300e2cfccb1dd4c76136f850
 Characters/Fractalguardian/Animations/FractalguardianSwimSlow.xml 0f3d87cafd05820c0378baaf397e6997812a32585123e81dd1435ef19b6a0e4f
-Characters/Fractalguardian/Fractalguardian.xml ea71d262adcdaa70a91b6448c925909f72a39d096180205709c1fae63604f24c
+Characters/Fractalguardian/Fractalguardian.xml c3c339dc905257c5ebc5ec451bf2c235c45a34daad0e3d43600f307f9b9aedd3
 Characters/Fractalguardian/Ragdolls/FractalguardianDefaultRagdoll.xml ebc7b80e5e75f82bfc94b8a63525fcfd8562d3556b87e43ae9ea0a1afc89bd0f
-Characters/Fractalguardian2/Animations/Fractalguardian2SwimFast.xml 28a0d34cfb42360b292009d0f622fe64f563501e37407b282c838a979262477f
+Characters/Fractalguardian2/Animations/Fractalguardian2SwimFast.xml 5cd8f7b759db66840e83d25d62b0e59f36704261607604151297e87b43a48eaf
 Characters/Fractalguardian2/Animations/Fractalguardian2SwimSlow.xml 592580cc4b2731ad724c6a6e0b66d8a11b22f7bae8247564a2f4aee67ed2d93e
-Characters/Fractalguardian2/Fractalguardian2.xml 4d7465c1b71b8b1f07b4957fa57e9eaa58475e9ca1d269004d9ea3c90fa3bebd
+Characters/Fractalguardian2/Fractalguardian2.xml 09a203ddcca256ea3fd214b739c13e61c1700d1b57b0b1fa95267cd98dfea81d
 Characters/Fractalguardian2/Ragdolls/Fractalguardian2DefaultRagdoll.xml 80bcfdd1796f574f00f8473f88fddd2d580858278a75d8cda20281363c784ab7
 Characters/Fractalguardian_emp/Animations/Fractalguardian_empSwimFast.xml 8bbbc9a213a316a5c875fed69983b3fa1086afe809d158c4781c3cdf187ab310
 Characters/Fractalguardian_emp/Animations/Fractalguardian_empSwimSlow.xml 618817324c5207498f0f0fc02b80a7e75b7ed170485526b9aed7901b61005dda
-Characters/Fractalguardian_emp/Fractalguardian_emp.xml 69db9c90c3192c732c2161f9a28135b186b07e570690e4b7d1c64f613c3f6569
+Characters/Fractalguardian_emp/Fractalguardian_emp.xml de8d2e462ada8fee5474ab63ef6d951466b29308e3c6186d073a6837c7f5308c
 Characters/Fractalguardian_emp/Ragdolls/Fractalguardian_empDefaultRagdoll.xml 4fda8fd8c0c4a103c32110eb2e96cd8632f5f9f2dddb9607e5506018df5ad27c
 Characters/Guardianrepairbot/Animations/GuardianrepairbotSwimFast.xml ec3303b6b4b0d99144c80060f7436262d95b7b2f977cef44fb426126b4a8b133
 Characters/Guardianrepairbot/Animations/GuardianrepairbotSwimSlow.xml 99ac3b19b9b47abe4abc5607a681e588878b19964ce12b65e2356f472ccf24b0
-Characters/Guardianrepairbot/Guardianrepairbot.xml 38770aef6859f3a8386df9b82766cb86500f883e5619fd84a310532c90e9cff9
-Characters/Guardianrepairbot/Ragdolls/GuardianrepairbotDefaultRagdoll.xml b0a9b791ef5b678e12b73fada408136b39b5c2159408bb8d62876eb3ab7d8a89
+Characters/Guardianrepairbot/Guardianrepairbot.xml 1ab049e368e2b0e47a2ff1178398b8732014201e53409369a762119e8fc2bb2b
+Characters/Guardianrepairbot/Ragdolls/GuardianrepairbotDefaultRagdoll.xml 9f0c5b52fb2a654685e001b9a8d81fd47822854328f58d50bf470279a616b899
 Characters/Hammerhead/Animations/HammerheadSwimFast.xml e168950feb06019c05796a72b3a8cf4018878fed16b981abad722683dd55d363
-Characters/Hammerhead/Animations/HammerheadSwimSlow.xml 8878af7c4e3f695096783e1975c113e83b051065bb4bdc862abeaecc5f9382aa
+Characters/Hammerhead/Animations/HammerheadSwimSlow.xml 1f4a38df9da5cb4453fa2e5ee3e474ca7db05e29657de1537d04858f447bf4ec
 Characters/Hammerhead/Hammerhead.xml 75696c13fd4f33b7751281377fb32eb1072d26089179169af5ed49dbfc63b03e
-Characters/Hammerhead/Ragdolls/HammerheadDefaultRagdoll.xml 802023930b2ba8a67b4c85094258b0d2439aa9e6272adf95b332218bfb118f9d
+Characters/Hammerhead/Ragdolls/HammerheadDefaultRagdoll.xml c72eed739e78cbae68a3cdc5b6167dc37275a9723cd3c3080daf6ff02ea87b5e
 Characters/Hammerheadgold/Animations/HammerheadgoldSwimFast.xml 8fdc712572db57d789b66609d2ec5e83403293655dedd373387ed894dcf35385
 Characters/Hammerheadgold/Animations/HammerheadgoldSwimSlow.xml aaa8570aeecb846d3e63e0979152e5a8eed4f49d34412472c060aff2c7c84021
-Characters/Hammerheadgold/Hammerheadgold.xml 034153674b0887557ff4c79592862efd3d9a2e76ba2e3cbdfcbd9f1f679ab057
+Characters/Hammerheadgold/Hammerheadgold.xml d305fb62080b52405729c7fed5031461f723765a4e40fbdd76facd61966480e3
 Characters/Hammerheadgold/Ragdolls/HammerheadgoldDefaultRagdoll.xml d063729ef09af4fcfe878a5960ee4cf6cedd9c3972a19e05655ad61425c8f536
 Characters/Hammerheadmatriarch/Animations/HammerheadmatriarchSwimFast.xml 36a229213b87e47da2ab29332bdf65c9bcd457a29ff73a62a46f6f41272683c2
 Characters/Hammerheadmatriarch/Animations/HammerheadmatriarchSwimSlow.xml 1458b7fb0a7ed633e2d13a41ee7be55c3927f6efe10956aeb08bd55fd9e92909
-Characters/Hammerheadmatriarch/Hammerheadmatriarch.xml 91adf54656662a1455a819c2c5f91763254b561fe231f0f5eaa92fa540e55704
+Characters/Hammerheadmatriarch/Hammerheadmatriarch.xml f09456e4cc7c39da36d199cf48ec56a51f53a644db453d9096da6fd4f3410da6
 Characters/Hammerheadmatriarch/Ragdolls/HammerheadmatriarchDefaultRagdoll.xml 6a279f53fa020207b44ffe4b3e7268a6eb5d6fe157ccc555b49cf1579ada6230
 Characters/Hammerheadspawn/Animations/HammerheadspawnSwimFast.xml 010aeebeba377a378b25bcb219bb7754dc1d40526d6633d1dcdc36dffd9d97de
 Characters/Hammerheadspawn/Animations/HammerheadspawnSwimSlow.xml 82c69269df197b5fcc895d2c288161de9a77ce72db3507195b1a2a55d32cd173
 Characters/Hammerheadspawn/Hammerheadspawn.xml 368598a0929e9c9cd89377f0255614753e16426e70451d93909fd8589c88a86c
 Characters/Hammerheadspawn/Ragdolls/HammerheadspawnDefaultRagdoll.xml f9bc7ec1c0d959759da0323c4264466826e2a040337a845bd60c3bf74a301af9
-Characters/Human/Animations/DrunkenRun.xml 021c79a63ebb53b203bc8003b26b8065923397c5d38a4590c61033897732ecf3
+Characters/Human/Animations/DrunkenRun.xml e8ec64dbdd7379cc99f41ac21c8ff316d7bb9d960bc87b87568ad45fa7c4c72e
 Characters/Human/Animations/DrunkenWalk.xml 6d09dc713d7748ae9ca2c880d325deb86c836081f25a1386c153cc01e6f78de6
 Characters/Human/Animations/HumanCrouch.xml 939ed04052bbfffb88733796c6fd073c6408e9c4a8697348de6893de59bfdc47
 Characters/Human/Animations/HumanRun.xml 775c7d3c208d3708132405bd806670636746deae7ad0babd416675d0bdc3575e
-Characters/Human/Animations/HumanRunDivingSuit.xml 1e9bbb367a57e324326e85ba00128e258d06f66f14c9386470a93b5eaa428559
+Characters/Human/Animations/HumanRunDivingSuit.xml caae852b915c63c16ad95dd5c952932a644c47820a843321dc6ebe42235a1638
 Characters/Human/Animations/HumanRunExosuit.xml 3da4e4eb967c6129065403b1a48003313191a40da6105df3515109def5aa5a45
 Characters/Human/Animations/HumanSwimFast.xml e38379ebef5f1ed81423c2707a2f07831347f48be30d366650196edfb49d0c01
 Characters/Human/Animations/HumanSwimSlow.xml d499a6b78588c2d644e54e936df2dbc7b2a8fc64cfcff5d54b4e352b67b1939c
@@ -109,97 +109,97 @@ Characters/Human/Animations/Spasm.xml 9f470071856f4df143865bdbaf8133099d5311a3f3
 Characters/Human/Animations/SpasmRun.xml e501c8be055c35fc438f53328864c9b0467b2656a6e654f720ed08a33679605e
 Characters/Human/Animations/VigorousWalk.xml de25d363ac46c47f73338486fe804fb1436c76b7a881e4c6b890b98233dd6cbf
 Characters/Human/Animations/Vomit.xml ac9fb45018efb1ef67cef491e77055e29e1f3c0754074f5c80974d0510fad1b6
-Characters/Human/Human.xml 3eb7552cb03d899e54cb43d7f371d5a4560040bf35fcfb22c8931ec0e4194145
-Characters/Human/PersonalityTraits.xml 40900c4d4ca2079437c009337de5ed1732048d39513dea4ac32babf5a50a1017
+Characters/Human/Human.xml ef11c7e874282a3a4323487f1caeb9227ca50b15e9697b7d7dd37e32238cdfe8
+Characters/Human/PersonalityTraits.xml deb2e0e14784a1ceb63c2a506bd18f91f2fca12304887bbd52eb0abb368fb1a8
 Characters/Human/Ragdolls/HumanDefaultRagdoll.xml 046ccc74fba6aa5068cc03f6083d511a36db338fe6b508956f2f4016a165324b
-Characters/Human/names.xml 942c7b274775821ee646fd93bc2fa4c6dbe35e066b9ae515d5d0211cd392f841
+Characters/Human/names.xml dff1774526f644f871c43015d5ccdc5b829080906775943569346b74c62bc4de
 Characters/Humanhusk/Animations/HumanhuskCrouch.xml 4d8f494cfe44a2a364251388d419822f1f7295af5b3c2d8ed3d3ae355c2e0dcc
 Characters/Humanhusk/Animations/HumanhuskRun.xml b063448832ecc229545438b7e317b38df0d4924239be511b7087221fa4f82a5e
 Characters/Humanhusk/Animations/HumanhuskSwimFast.xml e31a05ca3a82eb9a8153876f26455b84272549822278365eb6639a43b1dc2a90
 Characters/Humanhusk/Animations/HumanhuskSwimSlow.xml f7ce308f59ba365b2024d497466d682752f5b11d8c7508e2abd8cfbff2b125e0
 Characters/Humanhusk/Animations/HumanhuskWalk.xml 1c6b8aeab676255355f8f6c3b33f9bd4aa435f86e3fe5da29a29d84c42a159b9
 Characters/Humanhusk/Humanhusk.xml ba55d17fa6e73c7a51f20193eff4f3bcf23b8aa6c1218b952d86c739a7ab5133
-Characters/Humanhusk/Huskappendage.xml 2da392cfef6072a21320827f1f7e44c463692b223befb90c19d177e4f812946d
+Characters/Humanhusk/Huskappendage.xml 9f2c8d2367830e4a3d7143b88779926289760c5ad669f67d4e68400ad41889d8
 Characters/Humanhusk/Huskappendagesymbiosis.xml d1aeb4e3ffd66c97235d646f97972b3444b1338b8a27e9914385909337afe31e
 Characters/Humanhusk/Mudraptorbeak.xml 431d98e2d8a1d14e78b234b787ff9dff373944eca780ec3f6107d3373161d2c5
 Characters/Humanhusk/Spinelingspine.xml 09197bab75e09655b6be9a5c8b73214dfdc643200ac96a016ddbb35b7f40c880
 Characters/Husk/Animations/HuskCrouch.xml 160b750dbaf99c3fe76d20ce1483403c96337b65c9f335c13d0667fcf992513e
-Characters/Husk/Animations/HuskRun.xml 4576d2ac2fe8c988e1110ad7db1b1ac5b1e566ce29f0d358ed56da52194e4f1a
-Characters/Husk/Animations/HuskSwimFast.xml d196c93a96e0cbcece6ae1d16c6c7690f24bbba49471e87cbb60b3379121fdcc
-Characters/Husk/Animations/HuskSwimSlow.xml 03c39ecf7fe5457ea88b9055fc9492ad681f8bd861c6ac5afdc55b05c34c43fc
+Characters/Husk/Animations/HuskRun.xml 3ec816cbf978ffb9ab47d81c888072a96e6c328dd380e1a824cf4d40328ba58d
+Characters/Husk/Animations/HuskSwimFast.xml d9ed89524af12767c473f8cd01b61c13fead1daf5f867894386c9fbf7f89fd39
+Characters/Husk/Animations/HuskSwimSlow.xml 30db3d38534ec4e965ccf096f22f9ff128dca2d1ae7da724797c1c60b7f2cef1
 Characters/Husk/Animations/HuskWalk.xml eb7b3fad02228e0454f41ca049c64927ca81844d31f585c6cf0c6b9adaa4a917
 Characters/Husk/Husk.xml 3bcc87e8ab8bf26c08b62ce24cd419a9849cac6ff6c127e639ed14c06fccbf44
 Characters/Husk/Ragdolls/HuskDefaultRagdoll.xml 096f459accba0728ba078a79e3e4c311e94619bc426dd7261d81aac63bfd38a2
-Characters/Husk_chimera/Animations/Husk_chimeraRun.xml e7acf3543e08ef2bac95ce8d547ddbaacbf36a07fb954c0485f40472b8298949
-Characters/Husk_chimera/Animations/Husk_chimeraSwimFast.xml 8503474650a7a42a6a47a0e8e7c87feca35b4fe6ed18fb57433177272c94f74d
+Characters/Husk_chimera/Animations/Husk_chimeraRun.xml 20ab08786135c149329cbe6f9f838f9887f1af692aeea8b98b04c87c3f8197a3
+Characters/Husk_chimera/Animations/Husk_chimeraSwimFast.xml 3920a767be028fce6ec15536687aa77acffe0efdefb8c68a386a886aef48d0a1
 Characters/Husk_chimera/Animations/Husk_chimeraSwimSlow.xml 2dec9f6ae4d9a431778062ac2f143ff5a8677b50b6fd28449ba26395c551d408
-Characters/Husk_chimera/Animations/Husk_chimeraWalk.xml dde2a72a402722b29217f807fe978d573c82ccb732487bb7bd018f4ea5aea676
+Characters/Husk_chimera/Animations/Husk_chimeraWalk.xml 89add7b272290b7d4827dc2a659d58267e2540971a470731a9d75ec2331f6821
 Characters/Husk_chimera/Husk_chimera.xml a72b15752245d1b966aeeda8ae49010c39eeef4ba77f077446077752de51f8a6
 Characters/Husk_chimera/Ragdolls/Husk_chimeraDefaultRagdoll.xml 5524c7deb4e9ea514f09c2b2340552fe4977372f76d9c6aac350e8ca3ea1e102
-Characters/Husk_exosuit/Animations/Husk_exosuitCrouch.xml 56144e4e5d7c4b129196b321b4652e8a3bed4bd72649103a3b5094b8de2f6231
+Characters/Husk_exosuit/Animations/Husk_exosuitCrouch.xml 97370f646229272ca18be5b1adca0806c08b87a458de422abd0689b59e70fbeb
 Characters/Husk_exosuit/Animations/Husk_exosuitRun.xml fea19080dc4d445fd7c132bebdc52f9bb656496edfa814c9aa0e4f39dc81f3d0
 Characters/Husk_exosuit/Animations/Husk_exosuitSwimFast.xml 0cbd02a5ddf26a6b1879e91db42eac925b48f4ad9f11ab8d0445ccbcb954ab91
 Characters/Husk_exosuit/Animations/Husk_exosuitSwimSlow.xml 1de480aa78ee1281ef0dca03ec86f5e111b3e250777fe0fe5812e37b84e4a6dc
 Characters/Husk_exosuit/Animations/Husk_exosuitWalk.xml 786e440af6ecdd9bbda8c40633c9dee8967ada1a22c246d15b32687be63c5edb
 Characters/Husk_exosuit/Husk_exosuit.xml 9ef933291351f2e759e8fbaa968007979fddc58d2c080e69f63014d9ffdfd038
-Characters/Husk_exosuit/Ragdolls/Husk_exosuitRagdoll.xml 1c73f214eb59d5d0bf396e0d110a18215ac299a9805eef1de019d277fe480983
+Characters/Husk_exosuit/Ragdolls/Husk_exosuitRagdoll.xml e923e72d1d62b0b585856ff3d90fd8c9160abd645d5e51c4c499477b8931ff9c
 Characters/Husk_prowler/Animations/Husk_prowlerRun.xml 1eddbf4b9dc6b78b63e74d0ecd8b5f9a3c050cc2720d930d066c126c40db1396
 Characters/Husk_prowler/Animations/Husk_prowlerSwimFast.xml d428c14bae5556935ae5ebb37149c97a06391f98f6ef2a5d2dba1247b5a7131e
 Characters/Husk_prowler/Animations/Husk_prowlerSwimSlow.xml 7cb8c73417909caedffc3b22938fd43ac8767995f828a6d776c688956256a66f
-Characters/Husk_prowler/Animations/Husk_prowlerWalk.xml 784633870605c7b50f2ee358bec5de6eac0656bac82ccacd81cf86b6478b2d15
-Characters/Husk_prowler/Husk_prowler.xml 75f5cbd800ae38d5a0690df65451abbcfc82540ca3f0c7259c960fe6ba3ec4c3
+Characters/Husk_prowler/Animations/Husk_prowlerWalk.xml bd6b2dce684fc5f33afd2dcc41528d9eed2ea20eca2af31fbca6cc980195aabb
+Characters/Husk_prowler/Husk_prowler.xml d212929a66f288f8662d842baa00afbb8471f937f450a5327d8065fc1a10e398
 Characters/Husk_prowler/Ragdolls/Husk_prowlerRagdoll.xml 6f8147562336ba1263c5a5293d9ec3ca94986cb93ac1656dff80a030870e1d4a
 Characters/Huskcontainer/Animations/HuskcontainerRun.xml 1f56f0dc5f263a01b08eb5a923176666f09bf149e7f641e9c9ba2e831964feae
 Characters/Huskcontainer/Animations/HuskcontainerSwimFast.xml e72e1dfe0aa10a507c6c7d1d36e24253fb433e8a0b34ea9770c044e29040ad0e
 Characters/Huskcontainer/Animations/HuskcontainerSwimSlow.xml 3f27566aa93e3962e7a79725dac5dc92f4e73eb9b616658396e1ac9a31557f29
 Characters/Huskcontainer/Animations/HuskcontainerWalk.xml 5f2ea7f4006f539bf3e0b29ad77928917086dfeada0fe6381b866e16c1004879
 Characters/Huskcontainer/Huskcontainer.xml 1755cd1508eaa727063a4a1784cf0afd679f522fa4916fa086817f88020d8d06
-Characters/Huskcontainer/Ragdolls/HuskcontainerDefaultRagdoll.xml af1d7ebab67942e9f9ad7840cfed10fe2a6cc32be97921050b8eb1a581dffbb8
+Characters/Huskcontainer/Ragdolls/HuskcontainerDefaultRagdoll.xml a65e90c51c21feb7941db65f5abb2772ee378bbe4e5f7e094e64f2582fbc82d0
 Characters/Jove/Animations/JoveSwimFast.xml 6039f72bb3befb2e590c57b9df3028c3d06b367847959913ffe13e97502be93d
 Characters/Jove/Animations/JoveSwimSlow.xml 8ecc4d1ba422efe2df040feddb0143f073f88734350f618d6bc8eebdc881bf88
-Characters/Jove/Jove.xml ad2ff80b39b1907208dc805a42c29be801be77963b7b6f2203911de146314afb
+Characters/Jove/Jove.xml 160c562be1ab7b3b8c1d2172b26dfa7d959663e29f541b2c9ef6e3e06c1d9c1c
 Characters/Jove/Ragdolls/JoveDefaultRagdoll.xml edd5acf6ebf1652f00c371fe4d52df35f6054c3a024e2aa62bf8fdfe6b0f796d
-Characters/Jove/Ragdolls/JoveDefaultRagdoll_nondeformed.xml bae852d7c415bacb86316867a4be7470c4a235e119503935da580c074f44ee6d
-Characters/Latcher/Animations/LatcherSwimFast.xml 4b9049104e50f2fa6bc3152e64dfb88cc4cb002b628481c8c6bca8e3eaf2e641
+Characters/Jove/Ragdolls/JoveDefaultRagdoll_nondeformed.xml 0934a456ff91705e394711453613479a06c79d11a25d90c6f63ef5e85f988437
+Characters/Latcher/Animations/LatcherSwimFast.xml 769e994fd970f8621874a185cdbb347090974772ad8a415ea7b25acb68a0df54
 Characters/Latcher/Animations/LatcherSwimSlow.xml a7e55983694de9ad45fbf8fd60d391796db0a3ea6fffd9fb0b3c56af3a99e48a
 Characters/Latcher/Latcher.xml 6d44d76eb246395ced0737ce8b219979e584ae8a38ee0796901ed77aff66b2ee
 Characters/Latcher/Ragdolls/LatcherDefaultRagdoll.xml b2b32b467f5097339799df5e26d52cba102e58e202adcc069961af9648ffcf40
 Characters/Legacycharybdis/Animations/LegacycharybdisSwimFast.xml 804980e2e062f0e35bebcc8b45ba66e1c98ac53f3441d364927a37cec6615aa5
-Characters/Legacycharybdis/Animations/LegacycharybdisSwimSlow.xml 30ff37c0234d9d4bb7ef313f9546667524f8caf1465244ce70f19b6440eccb45
+Characters/Legacycharybdis/Animations/LegacycharybdisSwimSlow.xml 094b2217c1360d4287e045b7456566f62820b54d229966d4c715c6005d1a4592
 Characters/Legacycharybdis/Legacycharybdis.xml 2e56ed0cb7579057870afec304c2193ee66156ea79df962d8744cba4a7737b4f
 Characters/Legacycharybdis/Ragdolls/LegacycharybdisDefaultRagdoll.xml 0ed2c9b2688fe2e97efaa5265bec2ee6dcf4e413901a020ae6e86a95334e44ca
 Characters/Legacycrawler/Animations/LegacycrawlerRun.xml 9ea5ce191852cfe1b11ca6f3e8d2481038101d758a33f8f9ef2112bf9acdc7dd
-Characters/Legacycrawler/Animations/LegacycrawlerSwimFast.xml 38293ba7a4ba3b9292f7b91b23f0a970520fbd846079328c39814f0e8232f9bf
+Characters/Legacycrawler/Animations/LegacycrawlerSwimFast.xml 81d31cbe59dbc7d534bb29cb3fe5e0eac54bf6fa9febd1cf6a7b960ca2c95d71
 Characters/Legacycrawler/Animations/LegacycrawlerSwimSlow.xml 67f33faefaa158c3c2046cad122572f6a02ccb951de62165add89f1fdffa89c2
 Characters/Legacycrawler/Animations/LegacycrawlerWalk.xml 77d2ac35e00babae2cff2c5e39a3e81e810c6b51e6043972b5491187555d7e6b
 Characters/Legacycrawler/Legacycrawler.xml a3c27c98b3a2b673f64593169d598d608a96c4429d9a07e3aea936dea2989479
 Characters/Legacycrawler/Ragdolls/LegacycrawlerDefaultRagdoll.xml 74357953cf1e551fc5ab2ff50b1c1653d77878c835ccd47aa5eae68c5c87efdc
 Characters/Legacyendworm/Animations/LegacyendwormSwimFast.xml 7c2a6fe34536747a4b16364ee0d62c879b7937fede50ca9df19ca539e7c8324e
 Characters/Legacyendworm/Animations/LegacyendwormSwimSlow.xml 7de6188eb3ce2bd3d1aaccf71f0fc077a73761c7fbd94cbdda0b3e6f388095c2
-Characters/Legacyendworm/Legacyendworm.xml 99231880581496fa4219386090010927ecdf375589f80a38339f450e8b39c5fc
+Characters/Legacyendworm/Legacyendworm.xml 48a362b689063d099f43c43e77c0bf5b5369b8711a55038a81a27b58eb6d96ec
 Characters/Legacyendworm/Ragdolls/LegacyendwormDefaultRagdoll.xml 44986f81bb2e52b735bbd947d53cbbccaae39effc645c10f027a1c235b98e98f
 Characters/Legacyfractalguardian/Animations/LegacyfractalguardianSwimFast.xml bde40303b676eeb7858db192cbe72523f46c9cebac3e954f06e160101af0cbe7
-Characters/Legacyfractalguardian/Animations/LegacyfractalguardianSwimSlow.xml 1cb0d489ce4975fe943963cad2fddda0feeb1a2803f57a39e7086bfd7df9ed2f
+Characters/Legacyfractalguardian/Animations/LegacyfractalguardianSwimSlow.xml 9975b759bd42a1b1820b78fe9d5571679516fc16c61d2ef3c718dfa70d36b5c7
 Characters/Legacyfractalguardian/Legacyfractalguardian.xml 5ae91a57c6f080e4d624e3a3c684bcdf408fc1bd32897791fd4da7103dd6cbc9
-Characters/Legacyfractalguardian/Ragdolls/LegacyfractalguardianDefaultRagdoll.xml 6364f0d5fc067e32ea5d63335ed18de89f332a9865c0922318da2da1442ccb5e
+Characters/Legacyfractalguardian/Ragdolls/LegacyfractalguardianDefaultRagdoll.xml c7cca10e46a8a59b2a39b8e28ddac0b230e39b2e03d49f4bdf16593cea3743e4
 Characters/Legacyfractalguardian2/Animations/Legacyfractalguardian2SwimFast.xml c326d25d282fe7df996ff13447eb12d674accacc7f6306e831817c3579c21486
 Characters/Legacyfractalguardian2/Animations/Legacyfractalguardian2SwimSlow.xml 837525cb86a17fd78f7eda818c04dbd3e5127d379ddc4a81ee53efb104524d49
 Characters/Legacyfractalguardian2/Legacyfractalguardian2.xml 95df7dfcd430bb5d3403dc24af29d79a7a076112ab616d5128f7ea0fa293121b
-Characters/Legacyfractalguardian2/Ragdolls/Legacyfractalguardian2DefaultRagdoll.xml 8138d201ff79d8e3f5e8d7452024ddf84941fcc13c65894ddd837f181dce6568
+Characters/Legacyfractalguardian2/Ragdolls/Legacyfractalguardian2DefaultRagdoll.xml a7fce571cd93e539f9d00c64f96fbce603eb9d9b2010f7dff80d1cb62a00f6ce
 Characters/Legacyhusk/Animations/LegacyhuskCrouch.xml b043a69e318dfdc96cea93032cf22476f6f3f078d20786e53a3e8ef736edb22f
 Characters/Legacyhusk/Animations/LegacyhuskRun.xml 1bd1d43f9ea8a17e0f0e6f9fabdece5ed6e76bf36f2f35fd0f2e498f31675672
-Characters/Legacyhusk/Animations/LegacyhuskSwimFast.xml fbacd630e473be93c27191083d5f2ae8f1a98639ff153c1f1f9f7e8b72073a37
+Characters/Legacyhusk/Animations/LegacyhuskSwimFast.xml e317f27e0e2a70cc435b23bbca09d6df9797853a1e7cb059bff1bf8d2bb69641
 Characters/Legacyhusk/Animations/LegacyhuskSwimSlow.xml 7773074148f12dc729fad73e2f50101a6378b4bf1b637b1a849270ca14aba96b
 Characters/Legacyhusk/Animations/LegacyhuskWalk.xml 001376f3b6dc72aeb380f2e62ed499e9281084cf7aa0107b893550ac49491058
 Characters/Legacyhusk/Legacyhusk.xml 1750a37f2e5f629cc5ef82c0dff81bd593547d93a70a91c2064fc19cf6c2f541
 Characters/Legacyhusk/Ragdolls/LegacyhuskDefaultRagdoll.xml 1ae71d2c3b9d44819c60103e2032045878279036675d2828ea55c637cb117f85
-Characters/Legacymantis/Animations/LegacymantisRun.xml 112e8e03693b8ef099c7462d6f4cd1163f1e34d3b2afe90a5d183dbc2cd25e2f
-Characters/Legacymantis/Animations/LegacymantisSwimFast.xml 81dd853f12b29e80de7e7c5ea02457bd9ad398043bbb535978b120ff983705e4
+Characters/Legacymantis/Animations/LegacymantisRun.xml a78c22f4bf6dc77db77b8f1a66cbb4dcf51e154effaefc327b8c7134ce6f1a30
+Characters/Legacymantis/Animations/LegacymantisSwimFast.xml 86e6063ca30c115d79212dba97e8f1e9ff953c4bd954da872888545f3e26b762
 Characters/Legacymantis/Animations/LegacymantisSwimSlow.xml bfb0e3a81417f9f06826cf612dd772f84f9c9438ee002969c88cccf5b8c152e6
-Characters/Legacymantis/Animations/LegacymantisWalk.xml 5722cedaf7f2a7e5dfe3e8b2094d75f4cae663838d6dccf66a6901738aeb52ee
+Characters/Legacymantis/Animations/LegacymantisWalk.xml db1ecd2ec3d67e462955045d8eb5456a90991fc85c58f24568817b15286060f5
 Characters/Legacymantis/Legacymantis.xml a5a10fd8deb30dd8139a0f6504e631285976207389fdcae5d545808482e74233
 Characters/Legacymantis/Ragdolls/LegacymantisDefaultRagdoll.xml 2667188b21a9397cd1aa93202655470d4bff9d265fe02971f0f214b2640ee568
-Characters/Legacymoloch/Animations/LegacymolochSwimFast.xml dbd5295e8136c4d704799281e41377bb2ad7f16a6b4cb0f578b8672b54d88375
+Characters/Legacymoloch/Animations/LegacymolochSwimFast.xml 7e53e7db748a0cd82e3f06d3a9b4c5aaa41d165ccdf093dc6dc618b5b3f273f6
 Characters/Legacymoloch/Animations/LegacymolochSwimSlow.xml 22664e83be3327d10390f43b22052a2047de7375551f075cd4ff89b7f61c83cc
 Characters/Legacymoloch/Legacymoloch.xml d3dcb7f828977757c5d31aa7fa233dc2b3eb27a699d36a3be5c3117b35cfad47
 Characters/Legacymoloch/Ragdolls/LegacymolochDefaultRagdoll.xml 9309da94dc6cabbe2c63def2988bffa1c0194570b583ce816e8cce9d00875d8e
@@ -209,14 +209,14 @@ Characters/Legacytigerthresher/Legacytigerthresher.xml d4470777e91805dcb28b8b785
 Characters/Legacytigerthresher/Ragdolls/LegacytigerthresherDefaultRagdoll.xml 2d52c262d4fa7522d8bc8457baf115816af14bb0f42fedf52f6d400c275b57b5
 Characters/Legacywatcher/Animations/LegacywatcherSwimFast.xml 448e62ec533c9a8d7be8f98b52acb5e63a680df4515cbff7b24d867565d73b4f
 Characters/Legacywatcher/Animations/LegacywatcherSwimSlow.xml a5bcc9519e5a9321b63698196f04afe7db3d25d3240928c44baee044a50161d2
-Characters/Legacywatcher/Legacywatcher.xml 6a66307f6b8d7d10193ed0e3fba9ae3306f749758cd86820d8da0a34828f293a
+Characters/Legacywatcher/Legacywatcher.xml ca49a50f7253e797e493474b0b623a069ec2e172e2599b4a852437c24ff7cad1
 Characters/Legacywatcher/Ragdolls/LegacywatcherDefaultRagdoll.xml acf1cfd93193940981e49072bd82fc30f3eb1d432d120e9c9f3dee7ebe62cf91
 Characters/Leucocyte/Animations/LeucocyteSwimFast.xml e0125aa7a36a6e0a09148c51b1a87e300bf463c27d418561e82bd648a99f647e
 Characters/Leucocyte/Animations/LeucocyteSwimSlow.xml 499d43f71c26fd64e577689ea8ad9b5db9c086a701d227e07d876879f2290319
 Characters/Leucocyte/Leucocyte.xml 84c06c15a72e1519944638b2882f1328895953ddb2fead178dd449bd2727ceb7
 Characters/Leucocyte/Ragdolls/LeucocyteDefaultRagdoll.xml eaf607e7dd436313def488c6a083016478d36e2d330eaf01205e7327a89a4db8
-Characters/Mantis/Animations/MantisRun.xml aa1062ab574b0ef886d0b7b77e85358d77691aad727dfecaa0b105b482d35a1b
-Characters/Mantis/Animations/MantisSwimFast.xml 3ea773c0eee36ee408c8ce128462b82a5f7a3ea6e9407de0bc6ead4a2444dddc
+Characters/Mantis/Animations/MantisRun.xml 6e5473b84021545a085c7831a8dfb07f9018e0d0a7f4a6b8ffffd61628b16fcb
+Characters/Mantis/Animations/MantisSwimFast.xml bfbc7e489c6c0d284ed09a06d61062ce925368a3eeb5b2c9610a2a26c41fe2a3
 Characters/Mantis/Animations/MantisSwimSlow.xml f80dd0609325fcc1b70809f9457f3562ef738afe818fc81466ac712ac5f6b59f
 Characters/Mantis/Animations/MantisWalk.xml 3da2d2bd5e0b5cc82b5be942b7782b96eb02641e9c00961f3b94c1c226c1297f
 Characters/Mantis/Mantis.xml 87aa868fe4e81ea7997fca4e2d6940235443535a2af7197c2b2ef588e86dea9c
@@ -228,49 +228,49 @@ Characters/Moloch/Ragdolls/MolochDefaultRagdoll.xml 80d76f5c1c1bd5aa688c141ad29a
 Characters/Molochbaby/Animations/MolochbabySwimFast.xml 58941b331e8fb50c2d13ab9a41152ba8803abb6613ae85744d1521ffb359b87e
 Characters/Molochbaby/Animations/MolochbabySwimSlow.xml aafc9da8f43ae38aa8775b8474dbcfe0f28261c0de53326cb50ac17e464b3baf
 Characters/Molochbaby/Molochbaby.xml 927c7d11269070e58f590db4115f85965b2d7120278f9e65a2bd96930bc4dec9
-Characters/Molochbaby/Ragdolls/MolochbabyDefaultRagdoll.xml 7196aea4b3048b422744509cbc574087eb1a2e4c1fe909f053570a7c4750a5c9
-Characters/Molochblack/Animations/MolochblackSwimFast.xml 8bc204b971750a80e57c09ff869fb18207edd46fefaac49754689aeaa667d9c6
+Characters/Molochbaby/Ragdolls/MolochbabyDefaultRagdoll.xml be97d1f68e96656f0d71ed3ea93aef4e60ec7abc59bd823dda065340afddc820
+Characters/Molochblack/Animations/MolochblackSwimFast.xml b1d60a5e8c383f656ca19a403686820cf7e472410bdf1bebb8809976154786b7
 Characters/Molochblack/Animations/MolochblackSwimSlow.xml 2158dbd7cbe52defd8ee16fb8a8aebd81c2d274a52a16265c100e8435c381b3b
 Characters/Molochblack/Molochblack.xml c31c4f756f76df9e4d71a7c175d79cf61d8d1dadbafdc570cb8d05742b8b78e0
-Characters/Molochblack/Ragdolls/MolochblackDefaultRagdoll.xml e95ba34a9f560e7d267f985ba5aec5eb1ac6ce3711d9cb0d5743129ab53f540d
+Characters/Molochblack/Ragdolls/MolochblackDefaultRagdoll.xml 5740121fd4543c1adc7358b23f3455ab8e5a834c877fff8d224af28f3080a038
 Characters/Mudraptor/Animations/MudraptorRun.xml 52861e7928dca0e264b4cb08d97849d0a7b8b39b654fc216f3e105bf69a3cb21
 Characters/Mudraptor/Animations/MudraptorSwimFast.xml 37c7b5632b4a869b8a9d8cb384cf83218ce84872f4044cb31f3a38a7584ff2f3
 Characters/Mudraptor/Animations/MudraptorSwimSlow.xml 93bafc835cff9e8921fdb289dd5eefb37021dcf7774ac0cbb195f57a4292318d
 Characters/Mudraptor/Animations/MudraptorWalk.xml e05e706713c081bedc80bc51a4593824077066b07e4ffa6ac352f100a8a947d4
 Characters/Mudraptor/Mudraptor.xml cceb4e764bc6c497df4381f452a084709cd86531d732d3a123615fcf8c23838f
 Characters/Mudraptor/Ragdolls/MudraptorDefaultRagdoll.xml 977ac048e7c6e9f12b5140627c1e8369a2843f1002132d5219be8b76edd6abfa
-Characters/Mudraptor_unarmored/Animations/Mudraptor_unarmoredRun.xml 1316732f4d31c00df281f9427edac91748b6adb8fe537805d82ac48157e09476
-Characters/Mudraptor_unarmored/Animations/Mudraptor_unarmoredSwimFast.xml b0fc06c571c9151fbd8c67acf0b31e7279d5424ddbff4ea379fae6d4b75579fe
+Characters/Mudraptor_unarmored/Animations/Mudraptor_unarmoredRun.xml 1aa1e7d0fe3fbd6cbdefc92a1043e2bf58424b1696ab76a291bc836896c24194
+Characters/Mudraptor_unarmored/Animations/Mudraptor_unarmoredSwimFast.xml 37fae07fd6c228174568b62398e96ea84a9f4bc118e524f1001d521b060691f0
 Characters/Mudraptor_unarmored/Animations/Mudraptor_unarmoredSwimSlow.xml 310ea752e49b4c8f3e85adb0d1085ac51915e6195aa0d832d254e170b204ee5b
 Characters/Mudraptor_unarmored/Animations/Mudraptor_unarmoredWalk.xml b9b0ec96f884c7d4aa2035379180500cda818a97233f5ef28a17a5bfea5c33ac
 Characters/Mudraptor_unarmored/Mudraptor_unarmored.xml 23d623c53d0b4a2ede4385980d458f627c7bdf8566c002624a601b2b3066c114
-Characters/Mudraptor_unarmored/Ragdolls/Mudraptor_unarmoredDefaultRagdoll.xml 5e5b6e06a8b3a4124b74ccfd87cb06a27b20062c71e54c9e8bf98bc7996ba205
+Characters/Mudraptor_unarmored/Ragdolls/Mudraptor_unarmoredDefaultRagdoll.xml f94346aba45a4b4be916a9668048f403fd7a3de3ce8bea1e9fbd122c28aa4e0a
 Characters/Orangeboy/Animations/OrangeboyRun.xml 3655e17d29b0544147f1269d5274516f0bb6edf1764f6f81d3b8e34c9ed5390a
 Characters/Orangeboy/Animations/OrangeboySwimFast.xml 04eb26947d7f4e8a81904a09105ec4e9d31b24c8a9144b9ee03da6acd88f048e
 Characters/Orangeboy/Animations/OrangeboySwimSlow.xml ff3f02e5c073c52ac66335e96eb9de1e50ee2f0f9f5836751d6546723a40bceb
 Characters/Orangeboy/Animations/OrangeboyWalk.xml ae95f438dd721647a32f46c36c9b67493bf7c044f5ebff5604e1c2a79eed4b29
-Characters/Orangeboy/Orangeboy.xml ab3841bf443f5f9dd8d29e64d9eb4b800a083d81e6f75100de57bda6899a07aa
+Characters/Orangeboy/Orangeboy.xml 1a1e5f0eef84ba4caf935dbf4a87a9f675f18827f5dd04a4489791134985efd0
 Characters/Orangeboy/Ragdolls/OrangeboyDefaultRagdoll.xml 3f19be861b7b167270f9c2ee1bebf2e3815b59b72868887c67a536f800b559f6
 Characters/Peanut/Animations/PeanutRun.xml edf6f03c6a6e3a718747159f4f74e037bc5f7f51906fc449f8332bdd3e1c8cae
 Characters/Peanut/Animations/PeanutSwimFast.xml 39253f4c39e11ca11d48d0378ec22f59a9df2317c78eb07a6a6fcff87a3d9a83
 Characters/Peanut/Animations/PeanutSwimSlow.xml 8adc902479b51e0daabd80390ce43316fcc9d620ec593a26d482be2548a25980
 Characters/Peanut/Animations/PeanutWalk.xml 18c58e8c07b68c8d9af553914ff2967379e56aedef14a5deaad6524b148475ba
-Characters/Peanut/Peanut.xml baaf3ecd70310c02046dd7e7f90421ae243386bf4023bc1bf7cef9faa1c22a65
+Characters/Peanut/Peanut.xml fca27343e24b03542d5cffb159c099b1d9d175f1fed23c1bcbe2790d20d98075
 Characters/Peanut/Ragdolls/PeanutDefaultRagdoll.xml f442552384c27046b3be7afed05873577acc6c9e527a8c58bca318697b59678e
 Characters/Portalguardian/Animations/PortalguardianSwimFast.xml 92a4541223d2f4544559b1958eff88b5f6f8f2460ad81cb0152a27d8c01286a1
-Characters/Portalguardian/Animations/PortalguardianSwimSlow.xml 8ee15d9a6a41c46e8bb7a9986c67d5452e882b90f6cbfb81c9c6cf84ea93458f
+Characters/Portalguardian/Animations/PortalguardianSwimSlow.xml 07e67b7b88b6c2f4d81975616bba5fd95f857ac070a2a69b001dec9403c4e8e0
 Characters/Portalguardian/Portalguardian.xml d612b31b795589feedeb0b6b108a2b3ba4664f2330646a1cb6f967c6427b3835
-Characters/Portalguardian/Ragdolls/PortalguardianDefaultRagdoll.xml c9752287b638b0b6675771a109d5718c1bc82b22f19d5ab1999030d6ba89d1b2
+Characters/Portalguardian/Ragdolls/PortalguardianDefaultRagdoll.xml 4432215994f47ba02a615411f61a89124e5b85a56e1655fb87e38f49fb718e8c
 Characters/Psilotoad/Animations/PsilotoadRun.xml 1e3f9f036346893a8176351b2709efc5fecab5099f63f476b2aff8b6cac78552
 Characters/Psilotoad/Animations/PsilotoadSwimFast.xml 6ae204ff7175cfab437331dc6104a2bc3deefd430ede343c82153e1beab593db
-Characters/Psilotoad/Animations/PsilotoadSwimSlow.xml 28313accccf44fa87466fcaf1064bf345fd7cf712eff0ab3084bef140f3aca89
-Characters/Psilotoad/Animations/PsilotoadWalk.xml 531a4f91bd22c8fbef2c0da50f1b2661dc25d7f5ec08da09c489a4480983f798
-Characters/Psilotoad/Psilotoad.xml dae016058a9d84b07a803ae1e7aad301b6bdcf757f1d817c93d21bdd2c1d40e9
+Characters/Psilotoad/Animations/PsilotoadSwimSlow.xml fbfb73c682bb27c11acb04bcc3ba6c252483f2f0d7729d726a3afb88c232f5bf
+Characters/Psilotoad/Animations/PsilotoadWalk.xml 178b6008e1eb8184c38bf82f6bbf5e9e8f27fd3f8f62be7de3e37a9ddfc5f591
+Characters/Psilotoad/Psilotoad.xml a1d50ab00cba464b66d665e216964d6f83d9f0bddcca2b2a471ac19b58d3be0a
 Characters/Psilotoad/Ragdolls/PsilotoadDefaultRagdoll.xml adf6392d3976ca6a79c59fee95008abc92cf81c016cdca04349284175bf0a8ac
-Characters/Spineling/Animations/SpinelingSwimFast.xml 192e92a35ac672df0fb882a2d3f350abc7dfb923ae54d969b19fe7cd875ebd38
+Characters/Spineling/Animations/SpinelingSwimFast.xml a6f01d93e8ecb8f1ef70c3b0248ce86bd56e1dbc48a20ce16a3738474d4f03c4
 Characters/Spineling/Animations/SpinelingSwimSlow.xml 828229ae2ad1ae01a59d151d07ff164de1c9f9e91469de3595a20bf997fe875d
 Characters/Spineling/Ragdolls/SpinelingDefaultRagdoll.xml 820cfae6aa9af278e4cb93093c2e88a0b9928e557dcc47bfe6964a065d028264
-Characters/Spineling/Spineling.xml dc2287fd748eb7e610e37f14bcc894a057aa1e11f61c3279dc37d5903ad6cc1e
+Characters/Spineling/Spineling.xml 7e288e260d93f19c2730c1f3e3b4096e2cd27ef1ac4f6e0e5736e83558ac3b58
 Characters/Spineling_giant/Animations/Spineling_giantSwimFast.xml 4a98692dc22795c6ccd60798fbeb49c89932260401e77b5433384cc882ac7322
 Characters/Spineling_giant/Animations/Spineling_giantSwimSlow.xml 45d58ce053d1835f9b7b45f56389a2521156a48f08648f9d0e90c28fba73105a
 Characters/Spineling_giant/Ragdolls/Spineling_giantDefaultRagdoll.xml 4a6bc4327b0d36242bb121b742b439912ace3b48ba5c288bb8a142359bcd0d63
@@ -282,30 +282,30 @@ Characters/Swarmfeeder/Animations/SwarmfeederSwimFast.xml 126c79dc3e3e5d55535500
 Characters/Swarmfeeder/Animations/SwarmfeederSwimSlow.xml 9fa4b5ac84ca3fe523ce5f071ff8b80cea15f728c551398f8ff8b16cfe5d9aa2
 Characters/Swarmfeeder/Animations/SwarmfeederWalk.xml d8648a0fd2b44d46fd3c881d05b8623390f70ab2eae521a97ab856a1b5d1abab
 Characters/Swarmfeeder/Ragdolls/SwarmfeederDefaultRagdoll.xml f7dc2d5a65eb14c1fea3e3b4ef9530dca284eb0266cbfd27b6ae37b9e4fd1587
-Characters/Swarmfeeder/Swarmfeeder.xml 72bd225fcb766ab021b3e93ad11bcba26592f67238cd3ade0f979a6bd02d8a81
+Characters/Swarmfeeder/Swarmfeeder.xml 7bb44fcef20246219a8c025f22325e2bc83834c190e2bd7a283599b44b934f20
 Characters/Terminalcell/Animations/TerminalcellSwimFast.xml d417015be199b4e56d83b25493654bd7da017d81180df0b0d7dba1d75fdbe3b5
 Characters/Terminalcell/Animations/TerminalcellSwimSlow.xml 479be6f48439b46ffde449de160d6b50d0a90ff2f87febe3ebb922d1a8a4928e
 Characters/Terminalcell/Ragdolls/TerminalcellDefaultRagdoll.xml 3772d3165f4a296bae6fbd685f08f6061b18d3beb21d27c30a3ed816dd80f9ad
-Characters/Terminalcell/Terminalcell.xml bb47ad8b8acc2528f5db7b1238eaab32055ffe083a85c10bc1805c78902cec6b
+Characters/Terminalcell/Terminalcell.xml 8b86ed091e797ebdbfbf8a4f2bde928ceee2cd23dedf1f1e73c306ed268561bb
 Characters/Tigerthresher/Animations/TigerthresherSwimFast.xml 9eedcf8e382433caabf5f6cc10766d032a5f5ecbf3425a330d3dd4538a8c7cbe
 Characters/Tigerthresher/Animations/TigerthresherSwimSlow.xml ec16f5d627f2678ef75a587386a4eaa28f7d2592cd3c688c82e7a6512fd1e996
-Characters/Tigerthresher/Ragdolls/TigerthresherDefaultRagdoll.xml 6701265e344463e9c88478e86d038a0522b65ab2ba56e049686601e01dc4c315
+Characters/Tigerthresher/Ragdolls/TigerthresherDefaultRagdoll.xml 982ba67c2ac36dcee3f8b27316045a294866026f2f5f375452bd4045b3cd0ae7
 Characters/Tigerthresher/Tigerthresher.xml 33fed22829bc3e1cdd5611ea843fab93332d8da873a343b7a5748817580ec005
-Characters/Variants/Crawler_hatchling/Animations/Crawler_hatchlingRun.xml 53fe34b36242f8ad0a3ef802ad6231f91b08037a68e77b12b71cf060e2d815ae
+Characters/Variants/Crawler_hatchling/Animations/Crawler_hatchlingRun.xml 88992a889009fdaf11e02a26e1acf260119a5b435b5b177cf1ef577b14444b9d
 Characters/Variants/Crawler_hatchling/Animations/Crawler_hatchlingSwimFast.xml b4458a664840e4bfd6d3a65141902a96b05c2ab6fc0f92c13c24871e235aecc6
 Characters/Variants/Crawler_hatchling/Animations/Crawler_hatchlingSwimSlow.xml 074d9614ec86b4213980642eed8ab64deb4975747150e03480d5b38fe66bb67e
-Characters/Variants/Crawler_hatchling/Animations/Crawler_hatchlingWalk.xml e5889ab490141be26ac23905511dc363bf3aa7e85227d88e1ac89b628789bd50
+Characters/Variants/Crawler_hatchling/Animations/Crawler_hatchlingWalk.xml dfe4a3b79e4400391c2a708b75eb6c3e31d43a9abb24f10f9c5158a4ebde3630
 Characters/Variants/Crawler_hatchling/Crawler_hatchling.xml 2b795e330aa515fdb9a295b930d4e01f2fd007e9b44f97bf7e02ca19319fc273
 Characters/Variants/Crawler_large.xml a4d8ba3fa4cd19a696d6cea672d1b6b79294f6d4ad0e78436569fe7ff7e309f2
 Characters/Variants/Crawlerbroodmother_m.xml 70a7fbbf177122f49bcd59129c61e57cbab99ae2a807e3f1af4227147714b437
 Characters/Variants/Doomworm.xml b2ecb5a4fe5a26e1357e16261d7bbb5313f3d2059c99cd45967d028970625cb9
 Characters/Variants/Fractalguardian3.xml aef9fddadb2f181733f8223edcc32443ef7e4403daf2758a711dba3f5fb22de8
-Characters/Variants/Hammerhead_m.xml ffb9bc75828e379959005c75867551187da4a5712f65fe6626f095f43032333c
+Characters/Variants/Hammerhead_m.xml 6fc96bd29ecb8ac0e3cfc5010d8f04c262b88fb22aa4691b946e897c7f8f0510
 Characters/Variants/Hammerhead_mNamed.xml 6adba4d2b52e994996ee2c6cd0312e7360637099327a6b2f3008d90b9e7d46ae
-Characters/Variants/Hammerheadgold_m.xml 70cb716083427bcdcaf7da60635bebc6c29ab67be834431a597f5031b389358d
+Characters/Variants/Hammerheadgold_m.xml 661a431e1265d88c3efa370c656f73321132800b8c1babf59e5679f16b50264f
 Characters/Variants/Moloch_m.xml 522da056f0abbf3f7f720f658ce4acfeeaa21ed5b078e720055034b23521a001
 Characters/Variants/Molochblack_m.xml cce7e564890a0fa6033dcb7524cc820d0ef4e5cc951969ff5e6e27aa4310c8a1
-Characters/Variants/Mudraptor_hatchling/Animations/Mudraptor_hatchlingRun.xml 40b677ac6f32c1fa1cec525d29c5626a8a479afb809ca33b9d346ec93d8b9f90
+Characters/Variants/Mudraptor_hatchling/Animations/Mudraptor_hatchlingRun.xml 035a0f60281e2efbae74e9945f97c6ef42779ce92f8bfbd6b101328cf2a5d305
 Characters/Variants/Mudraptor_hatchling/Animations/Mudraptor_hatchlingSwimFast.xml a9e4c3b11ace976637be92ee4a77ac17ee0dd35bc15bd9ef440bcc803d7b362f
 Characters/Variants/Mudraptor_hatchling/Animations/Mudraptor_hatchlingSwimSlow.xml 65edd0272fe50457804a814a2c9d7aa6f95407318f6495a389fe4eddc5b0eb3a
 Characters/Variants/Mudraptor_hatchling/Animations/Mudraptor_hatchlingWalk.xml 2d3799e374b522742761eaa3c240a3089b7c43058b70ca083bad0bd11e910e77
@@ -315,65 +315,65 @@ Characters/Variants/Mudraptor_pet/Animations/Mudraptor_petRun.xml f9241789f57244
 Characters/Variants/Mudraptor_pet/Animations/Mudraptor_petSwimFast.xml b48c7181b391993622b5eaac12aaf97ddf4a9887545ab801e666212204f63483
 Characters/Variants/Mudraptor_pet/Animations/Mudraptor_petSwimSlow.xml 73668feefa8850f96655b7ae17798eb950e32e3351ab60baf0ce2d47835e83f5
 Characters/Variants/Mudraptor_pet/Animations/Mudraptor_petWalk.xml 341bc4939e8080535a7a1009c664656baf6c5a34f71742641c7e36848f1488fc
-Characters/Variants/Mudraptor_pet/Mudraptor_pet.xml b6c104cfef0be9ae76a499fbb250233efbe1adb2eb8abf11ac90397cdb3186d0
+Characters/Variants/Mudraptor_pet/Mudraptor_pet.xml 3b968bfe0c6f60878b0dedb5f6cc446b0182d0e9a74b58b3041b3901e7aca341
 Characters/Variants/Mudraptor_veteran/Animations/Mudraptor_veteranRun.xml 3ea46e7e751d2b69565ed07883558d5dc0ffe5fb8cea0dc70d4eec2d5bbeddf6
 Characters/Variants/Mudraptor_veteran/Animations/Mudraptor_veteranSwimFast.xml 37c7b5632b4a869b8a9d8cb384cf83218ce84872f4044cb31f3a38a7584ff2f3
 Characters/Variants/Mudraptor_veteran/Animations/Mudraptor_veteranSwimSlow.xml 93bafc835cff9e8921fdb289dd5eefb37021dcf7774ac0cbb195f57a4292318d
 Characters/Variants/Mudraptor_veteran/Animations/Mudraptor_veteranWalk.xml 97e7ad37c327d5517bc588bcc306ed7b0c66410d1fe6a274d0004ce38eb00a24
 Characters/Variants/Mudraptor_veteran/Mudraptor_veteran.xml b9773a39b81223158efab8f730203da7a3d7ca6449d2ff45b36a2e1c155f03ec
 Characters/Variants/Tigerthresher_hatchling/Animations/Tigerthresher_hatchlingSwimFast.xml 7f9f2f91605ed92ce510b053b4f9c755f0fffbcf3ab67ecd1e33a68579358260
-Characters/Variants/Tigerthresher_hatchling/Animations/Tigerthresher_hatchlingSwimSlow.xml 5b294a6fb05e901d0bcafc3447ec3263966ced064810b70feefd877d99fc43a3
+Characters/Variants/Tigerthresher_hatchling/Animations/Tigerthresher_hatchlingSwimSlow.xml 9c5fdf35322dd155742e5d93733fd927853a20c3bf1e30e7357c685b24643ddd
 Characters/Variants/Tigerthresher_hatchling/Tigerthresher_hatchling.xml 6076ec0a817d273909fe95f745f1b1c8498260899f918e0aff6abe60457959af
 Characters/Watcher/Animations/WatcherSwimFast.xml ce7f3c115712f9bd4b17d1678ea38aac403ac9473a7af296635353581fb68a0a
 Characters/Watcher/Animations/WatcherSwimSlow.xml e78575527cc9b623f3a01788dda8f37d09b4787b8575c8929de9928e41ca95d3
 Characters/Watcher/Ragdolls/WatcherDefaultRagdoll.xml d0b13d8395dc7ff2ad4b7c77b594b447a97704b2b6386e14b415b50523fe893a
 Characters/Watcher/Watcher.xml 32340b229fc04dc26830c0b2eefe0783d35d6a17992a8417da568fbaf44589d7
 ContainerTags.xml ff8e0c627f765cc3359208aaf7581121d2b620c134ff02745a97a244fcd4c48b
-ContentPackages/Vanilla.xml 5cbbc6ad8c3295e2fc1fe775d58f9eae7ac4e0ff0d62f0af499d599bbc0cba3e
+ContentPackages/Vanilla.xml f7f8225148d7b2b00e01f3db93f5a546f795fc6a012d973b3fe7566202c217e9
 EventManagerSettings.xml 7a58aee0cf703e91752552a7c9d689a99e644fdd682a8662cfe6ff0de3a5afd6
 Events/ChainingEvents.xml 401f2bc4744fff694617a2cf8500a37fdb0a85d5b4e34710401af5857c6b1eed
 Events/EventSets.xml 4efc56bdd01cd54f7483d71985fd2f8bd7af5bde42517e4d26de1bb5c08522ae
 Events/FactionEvents.xml ff644ac9f33010264b8557ee7687c7f0aea420096a3046cd2a20dff2e0c023cc
 Events/MainStoryEvents.xml b6ec32679fc1712442ef115694c0cc87560b452191655b8bd00a842cf32a4b65
-Events/MissionEvents.xml 7a45884588043d91538d1eec35f3dc46c38ad611fe3a512e59d12393d0023220
+Events/MissionEvents.xml a3a5825b7f4c4b24fc413133d6b1e4da0761c1c374b1c8d82a42b557f88073ba
 Events/OutpostEvents.xml 4894d247817630828560f716550f474534c0437ce2e221f47f4e24d354e7ec16
-Events/OutpostEventsLegacy.xml 7a37b3d66cb4ebeede2a87eee1074b61ca50b88fc214101666ee390c4dc79fd6
+Events/OutpostEventsLegacy.xml 6b0b3e69d2f3a2cbebe2230df6b622209f0af3d9fd210c25c5d8038c437a0106
 Events/PvPEvents.xml 17673e2b2e688e22534d7a68cf1c4b0e8aa1643de3595cd452bc4722d9949ae7
 Events/TraitorEvents.xml 94378c8823b3a58b66fd9e0adcfc0d14b273c8ac97aeeaa9873a25039f826f93
-Items/Alien/alienitems.xml a7be507c43af4a0873e15830ab7cc3f5bf59c87985bd99312df1c0ae2389c2ee
+Items/Alien/alienitems.xml c808e3baeb3689bc4249cfa354a1aa2034f64b95aa78f5969a9839eeaf56ffee
 Items/Assemblies/AirlockDoors.xml 04f88bbf68fb2383397d4498a3e52aac285416ff86e813b7ad11c00a2ab4fd9d
 Items/Assemblies/AirlockPump.xml e4a0771ea83dbfe1fbcf780d04bfc107c59028ef893e930732703cf0db89201f
 Items/Assemblies/AlienAssemblyDevice.xml 22849033d7bc7a333b0f989837aef9e58b06a85c915fd8652114ddb2af685cf3
 Items/Assemblies/AlienCellBottom.xml f99684c275fb4c212b7f9b72f117c4f6554239cfb7a41b989c7cbbc96fd3e75d
 Items/Assemblies/AlienCellTop.xml 75e7dcb3f7729a4cec93adf899eb537a589ff8fbce22fe059970280bf0dd5341
-Items/Assemblies/AlienChestLarge.xml 6fb1c844cda555ccb24c7088fee0f8eda8056ce0706b3ca87b42df18f481bf73
-Items/Assemblies/AlienChestSmall.xml 7b5d0f96186dccbaa1ea9e93b960ae4eac7d0e63e2a872a21b6b860db8ef1d06
+Items/Assemblies/AlienChestLarge.xml f53bdd2f17450edcb8b2ebe451b1634d7de81bba83993acb3028e952cf86af4c
+Items/Assemblies/AlienChestSmall.xml 89f03dc74b989c16a6e9eb002ff0291bdd79411fc3a40bec93ee491b95972a7d
 Items/Assemblies/AlienCoilAssembly.xml a94dc43504033b697d994cecf4fda4662e8dffc5d15dcbe08c57b5ef551b20c5
 Items/Assemblies/AlienDoorAssembly1.xml 17f0ad5fd6918b89d63d4d4d4fb296ed30c8d820cc0b6ea909cb47d6c267c3e2
-Items/Assemblies/AlienDoorAssembly2.xml d69e73ac73a8db2051d2ff8bb52d26ba264d86e2614cddde1daa2063d05cf039
-Items/Assemblies/AlienDoorAssembly5.xml 0804078efd057d0e14282467d657eebad9c9962ff33d7108dd54fa75d2a045cc
-Items/Assemblies/AlienDoorw2Terminals.xml 6832e98f55e421845188965bd52ec355f9fde34e9b6c4ffc569df53f400fd4fb
-Items/Assemblies/AlienDoorwTerminal.xml 84a448e9836199429a8b97267ef9cecedf3f974664e4fcef4584beb7170231e1
+Items/Assemblies/AlienDoorAssembly2.xml 30772d7824cebe01d770862532dd9995772296f11b1347859d2a62a603ec67de
+Items/Assemblies/AlienDoorAssembly5.xml 682e79d6929edd97c2badc27199d58b768721d9b0d63d2f0ff5d8cda7b46d15c
+Items/Assemblies/AlienDoorw2Terminals.xml 9a8470d9158a90afc5a40c8fb92291405d044fd37b1796d8617e329529ab1a85
+Items/Assemblies/AlienDoorwTerminal.xml 5ad89deb2418897f587b1e634c07aca9e9073ef4e67f071d0466283202f8d761
 Items/Assemblies/AlienFractalSpawnpoint.xml 875b783cee1eceb454016d65be8db1e14a6de6ab7b001e77160959d9d9636380
-Items/Assemblies/AlienGeneratorCharged.xml 5ca62e2c73c354ee0135c412eb57662bd8345a5ddc0205c2fe710036f7033880
-Items/Assemblies/AlienHatchAssembly.xml f1f0cc14a635ce9f7e811291983b745ff10dc61338e0d03c3cded0d101fcc5b2
+Items/Assemblies/AlienGeneratorCharged.xml 7e806227536cf7c1f92fdd2f5d636f7a97d68a5afa19c69c32a973d37bbbebc7
+Items/Assemblies/AlienHatchAssembly.xml 4fd7b2bb572c2beadecb874793a9c1a5706a966aa1b953f28374f6ec2c2e89c2
 Items/Assemblies/AlienHatchAssembly2.xml 00c284cfe6a65f3dd34e8c024d9abc1e3d2c3c334a96443f15d4e6c6e5b1099f
-Items/Assemblies/AlienHatchw2Terminals.xml efd551430de726f32d7b19c6bf7b8a43beaaacc46c312318ca02c0a5b58b7a36
+Items/Assemblies/AlienHatchw2Terminals.xml f253be830ae37326c69993516285667662dbfb0be249a1c3f756057e93693ae0
 Items/Assemblies/AlienHatchwTerminal.xml 5610a7b3ce6df639bcb09c97e0d67171c9fd79f833ad26bd8642ec5b97d18f78
-Items/Assemblies/AlienPumpAssembly.xml 5ec26f9fd36eed5561542204c60e0cef9c57c76c2bbfa14580fb4d71ccb2086c
-Items/Assemblies/AlienPumpAssembly1.xml eff4b1b9b33ae5a5de768683426452bdff3d6c06c7faceeb89da6f61f78d9502
-Items/Assemblies/AlienPumpAssembly2.xml 4e7de57c7f4640db4a6122cc44c3bd9aad6eaf99af282495c852a434301f1ff1
+Items/Assemblies/AlienPumpAssembly.xml 4ea77e1c479b4c7540e60cea3b6000b641738d0ea666509d3d501cadc6e6980e
+Items/Assemblies/AlienPumpAssembly1.xml 23125ac31a2ea29e07048c54963fd2dc28b06f8ed55a2af47f532cb954f4310f
+Items/Assemblies/AlienPumpAssembly2.xml d3e161b3f6401c326e8b677037f93cdc5eb5c25c178b60b74f28a133f8cc298a
 Items/Assemblies/AlienTurretAssembly.xml 4b732a1bf8be8a8a2c5d406d00128455fe5922048bae66a30df9db44edbee07e
-Items/Assemblies/AutoAirlockDoors.xml 54923c0d2f19d68f0c87835dc27e57eba86caee6f6e0480c48a591d5588f0fa6
-Items/Assemblies/AutoBilgePump.xml 4af6cb5ef857bb7fa8ec712ab897bfed8edb5f83db8184f3512505432c14be39
+Items/Assemblies/AutoAirlockDoors.xml caf204a93eab8eea60573e5abbf94ab3c11abf9fb3dd3a9dd3148c089c8baa6d
+Items/Assemblies/AutoBilgePump.xml 6bd297bd1ff45e24716f38ff8215cb9587f8f11ba7fb68d2700c37261615418f
 Items/Assemblies/AutoDockingHatch.xml 375fab2dc69fc49da10bd5460d2c943ea06683f10229bcf82b45de0fae903f1b
 Items/Assemblies/AutoDoor.xml f2a0813dff9a98d33e95da680302c6537305aedb2349fddc1de9a7ac1bfa5bab
 Items/Assemblies/AutoDoorWindowed.xml e14abb17738ffcd5087cff0ad464f7de925a61d0b2356dfe8313b4f7d886ff93
-Items/Assemblies/AutoHatch.xml 6ad9fbd9494445a2d61217019e86659e537f970ab286b9d809798e79b620713d
-Items/Assemblies/CurrentGeneratorAssembly.xml e3a62c069a1328d66606d289d255bc36cc2194b728666458295d0ace4003e799
-Items/Assemblies/DivingGearCabinetLarge.xml 19790303543eed68bd2a73785039444c990fcc759b65d84e8227aba78965c7ba
-Items/Assemblies/DivingGearCabinetSmall.xml 847532b67963ed529a1695694ba66189aecb1cc9cc090f06c7842f6762e2d5f7
-Items/Assemblies/DivingSuitLocker.xml f60aa1fd82bae9fbfbff447df5b2cca4b01ed7b5b382859e464b6c083bf35676
+Items/Assemblies/AutoHatch.xml 83bd74c68b1264f0220ac87bde4f6f1451f281db979d9f89e3338859555cc842
+Items/Assemblies/CurrentGeneratorAssembly.xml c4a4ea4a8a3a72f05cfbac2ca1cbb5618f8025450c8ab63de37f4e25cb1dcfa0
+Items/Assemblies/DivingGearCabinetLarge.xml fabb8590ec571373bda6cea26833a0b04b0eac254304f025067b9a76cfb3cde4
+Items/Assemblies/DivingGearCabinetSmall.xml 58fb92a676eb0f3d6afa00e84d934cfc1102269db543f874337f44ccb38bdbc1
+Items/Assemblies/DivingSuitLocker.xml d9d15e4794874ed915de06d5da7d893c159f3b0f0bdb1095f5543e22b4dbc00c
 Items/Assemblies/Door.xml 419c85a1790226fb8527b22ccfaa500ef2526a0febf30ddb7f0593078210086f
 Items/Assemblies/GasCloudVent.xml 03e09ecb7b9a661ebd03d983e757e54c869b1a7ca3fdc8140872534553d35a15
 Items/Assemblies/GravitySphereAssembly.xml f6ab98e4943ab5fd611a517b6d536fcc5c9a00ff1319ad875a5b94d6979624de
@@ -384,123 +384,123 @@ Items/Assemblies/RuinAutoDoor.xml 0e605e5dcdfdcdc518d7d8d7d146843d4d040d4237a607
 Items/Assemblies/RuinAutoHatch.xml 0661b2e09932dc8188e6334429a53cad283a5cbbbc71a3c4cc03793f31e71fe1
 Items/Assemblies/ToxinsGeneratorAssembly.xml 648da14d9d919baa4560d5a6fd16bae1553456136431c36dff594ac0e25db4e1
 Items/Assemblies/WiredSurveillanceSystem.xml ae03ecada2bf0c48cbaf85a38c47cad7bc34132be41968fb6589160843582cd1
-Items/Button/button.xml 48c95ae1b38a80c07903497f8b764ad8afe7282d9322c4e1c5d481caf5efa1be
-Items/Command/command.xml 904a9000f6ec4562537f410866601b193088aa36fd758e61b62be11df8b462f2
-Items/Containers/containers.xml b96b080a4262c4251ca67770654e3ec3b9226ae48fb4f3c3f59c4e0ceee61282
-Items/CreatureLoot/creatureloot.xml 5be138cc48567bd39ca069c71a7342bb353132f1bd5569f40cc1b35d5de5c21a
-Items/Diving/divinggear.xml 31b276d03b29f625de6552fb48e51af18e1f5a3231bb94f07cf32f378e90e51c
-Items/Door/doors.xml de4b62a55fa2d760cce0dccaa20c0c12e22360d86154de8d0f1aad962896e14f
-Items/Electricity/lights.xml f2fc5ee3e8f6f5ca71dd2c780b90397b89b393477a431f599c263ea178b63b35
-Items/Electricity/poweritems.xml 01a3799a5815e40f7baaf74a73838cf84e86937c899c8add629fd1c4ee3f51db
-Items/Electricity/signalitems.xml fab7f01b80fcd86f9e2e40ef9c55e4630426a2ed6a7bcf69272cc19635b6c7d8
-Items/Engine/engine.xml 6e4c67ed6101720ba3eafe3c73d043480f1f6fafce5775f5953040a1417e9104
-Items/Fabricators/fabricators.xml 1048dd7d074479f95d0cb31d874be81c319ad66c2216264846838872ed65388f
-Items/Gardening/ballastflora.xml ac5056f3f42b470a60b125469a81a7bc8894de23f41e79b5d60901515222ff84
-Items/Gardening/gardeningtools.xml 3cda8ba50d8d1a5151eda775a6adc87d0b3cfab6fc10991b3b35a3e8abcf43fe
-Items/Gardening/growableplants.xml 0e7385cbfb3675ff64ed40f8ce22d07dcea6949942a906205a130193a5695019
-Items/Gardening/plantproducts.xml 4c6ca8d9c96a77b5b68239331427e7c495372e985c86b0eb2bb4d5ec60fbfa56
-Items/Genetic/genetic.xml 58a51163aaea7c12338c1c809b215b47ca58246191fee533c35b2a3ffcca0a65
-Items/Jobgear/Assistant/assistant_gear.xml e91e863608199592a999e48e65e726e230de6fb2bb5ef03d7171924a015362ba
-Items/Jobgear/Assistant/assistant_talent_items.xml 4208fa3705c284a5446f0ee9e97b7968b4cb195e6b314514cfb8c802ed6c037c
-Items/Jobgear/Captain/captain_gear.xml f887f041b9861bb109f8aa7223ac8335a53f2244e35c2da2e32c782573d7e66d
-Items/Jobgear/Captain/captain_talent_items.xml 73caa5938816c8273430feea171918c7a0ed31028b694e1bcb9eee056ad8c815
-Items/Jobgear/Clown/clown.xml 4362f976589d249a3b1785bd9780a1171af2c5a29ea548e8499666f33edfe794
-Items/Jobgear/Commoner/commoner_gear.xml b298752949aff64bb33b1bed855123870465da0a424d59d04f56630febafcf83
-Items/Jobgear/Cultist/cultist_gear.xml 02d291044703000b4bb4981abebe05a50b5c3c4d8f659d30c90acd3fd84f6095
-Items/Jobgear/Engineer/engineer_gear.xml 0372e5a073217b51b955b340d6a824c03f637a6814207b238788ebe9e2596082
-Items/Jobgear/Engineer/engineer_talent_items.xml 517dde3f6a879e52cec296ea5e2e1028266fa9519885c8d41b80202e10fae0a0
-Items/Jobgear/Mechanic/mechanic_gear.xml af0c0a9765953b947896ea355fb58dde2bad44e93722250ebc26de854c93246f
-Items/Jobgear/Mechanic/mechanic_talent_items.xml 67c0d130e52e401b04487282c15bbe92fb8456d03aabcf53d7ee66d674b19c24
-Items/Jobgear/Medic/medic_gear.xml 0dca656e67ba2d39f6b77ff8c8fc2cedbb73a9ed736640c6f21c439be142d6a9
-Items/Jobgear/Medic/medic_talent_items.xml d2b236437a6cee9212d4a6839c0a6496a2f2ec793ff1fc1bace64c4fd093a91d
-Items/Jobgear/Security/securityofficer_gear.xml 9dc57ecad4d5b6aafba3490b08410df594089d4bf77c513fe1befc959c69222a
-Items/Jobgear/Security/securityofficer_talent_items.xml c9d32fa122e4cb88363c9a9eba1728fbadaeb82d40feb73f7569a39e508857e7
-Items/Jobgear/Watchman/watchman_gear.xml 665019cf32280f76f8d537092c23a4db5876d572c0162ca47bad5194aedb705c
-Items/Jobgear/misc.xml c002e435fa5dc054877cdc25c6c79599ec58b40c64c8c1d22f63a36633b4b404
-Items/Labels/labels.xml 872596079bf9faaf10e6f9c540e8cbad58bff0a21732b7137ef32d9ee6f89b2a
+Items/Button/button.xml 13efb571c361f01ef0398318ce3f2c5cac0850551a751735781d805f39c84f75
+Items/Command/command.xml 7cc84ea16b8a943c034a654e81f29d3d36484c979e03ea94a4dd3db7aaaa2c7b
+Items/Containers/containers.xml 0c35643fe38db04c515059877b36e995ee5b7afde45931c47489c74d947a3eea
+Items/CreatureLoot/creatureloot.xml 2877dde4acf36009d7ced5412e432b27e3c6e3531964f07526bf9098a15a7390
+Items/Diving/divinggear.xml 966308fdba3715d38b1e23e6b959eaef4aa9ada4a7410c1b1927310c6629856d
+Items/Door/doors.xml 4280d98db605bf8e2166d76f7db039b3e8a3ccefe85cc331d404621e3d754012
+Items/Electricity/lights.xml fed520a7bd1eecdb3132cc1ff2fffd748f0a24a362b0dd15ae5ff186f57f6f76
+Items/Electricity/poweritems.xml 7e40eb98295e9ffe89263f25489612e098eef2e31c1004e076dcdb7e5ca62c18
+Items/Electricity/signalitems.xml 7e1d48efe1a42d44b4b1ba1688cfe271b23a7601b56a8f6f872cd84b254cb4a0
+Items/Engine/engine.xml bcf3162c22c51ee2e34e85d7125a7bf88f17aa0dc3ccc4d3ebb172c605b99d67
+Items/Fabricators/fabricators.xml 79d1c1e8be79b8d9db76f4c1c845aba2a2a314932dc815272ad25b6ea2dd87ed
+Items/Gardening/ballastflora.xml 29556d52a2c549df6d22cc795c0a567fbe120fad5188fae26587971a49844e5f
+Items/Gardening/gardeningtools.xml d753910066b109950cb0ac73193939a65e3830b515a3101076ff71191c4f1f0e
+Items/Gardening/growableplants.xml 914e244216ffa3ed0ff38d6804e459d223569dfa5835ad2812bff35c278b1f36
+Items/Gardening/plantproducts.xml e874c9c45c03fd9c4a26ceed9021cf33a9b1818b246efa04249d021bd32faec4
+Items/Genetic/genetic.xml 946811920d868e569a35d5a8194011f49d694b8bb49bb6ef8aef24bab5de0fbc
+Items/Jobgear/Assistant/assistant_gear.xml f9bece49d4083d6f84a7dd3db0d4f0aee7c71e0ae3398db190994ae662c0c7a1
+Items/Jobgear/Assistant/assistant_talent_items.xml d241e0a24e704347981ea26d3575c5edec5617d78b27998dee29a5cf7144bebb
+Items/Jobgear/Captain/captain_gear.xml 0092d28c7fda5d52fb5765548c7f429ece30dedf1c14cafd1c425b80987a74e3
+Items/Jobgear/Captain/captain_talent_items.xml 899e9e84a6078178bc6924a31928e2c39d2eab6e73babca68802894891d362bb
+Items/Jobgear/Clown/clown.xml 065862e9134300046cbfdc785bfb7247c93d3e784e01756b27a08c08ef8c84c3
+Items/Jobgear/Commoner/commoner_gear.xml 8151a47827c4a8d62286d43f1783a785b1919125a93a7c25683800a66580c8c6
+Items/Jobgear/Cultist/cultist_gear.xml 9ad8a3b3d588d094afed90c6b46a70905edab32b3309457443b748a0dcbebc3f
+Items/Jobgear/Engineer/engineer_gear.xml d78a5c1da5c4ee5e68327e6d18454508587193577c0102ca9dada67c68d12e40
+Items/Jobgear/Engineer/engineer_talent_items.xml f7e3e0e69a7773fd2614969240782363c70642c2ef065433ff89b70aaec9e9f3
+Items/Jobgear/Mechanic/mechanic_gear.xml 963d6c98f53444fb333e2afcdf24fcdd2ee18269f4bd9e6516485707d65f8214
+Items/Jobgear/Mechanic/mechanic_talent_items.xml d53640687ab934d4607dbaf750dafc59924d7e6c9515866cd5ec176c6ab5cef6
+Items/Jobgear/Medic/medic_gear.xml 28a901ce1fbb64f83ab91324e3c05d1fe623c3fc000fda65df903341ddab776b
+Items/Jobgear/Medic/medic_talent_items.xml 19f9c93bdb8f78276a10cb784499dd5f4df87df0d6bdd8adfb0dd78b95c6e06c
+Items/Jobgear/Security/securityofficer_gear.xml 687a736830eba858f7ffffc12c1276a769c4982d59bef70e87bc0829021422ee
+Items/Jobgear/Security/securityofficer_talent_items.xml e65da6ee1448369e01d6ad9ed1540d0969a5944964cf2282c63aa95943443758
+Items/Jobgear/Watchman/watchman_gear.xml ae83e08d7a8f697c37260d5b7a1f79fee53bc2534861aa8fd4d3326f0b39636a
+Items/Jobgear/misc.xml 910856f9bf399143dfffc0f638f3cb4bd04c667c8bc1a07ca1606ffe4ace078b
+Items/Labels/labels.xml 681b8b652a9c8b7d03972205af198ef1fe5ebc54d433993d035e6127e4b73991
 Items/Ladder/ladder.xml 9f5842ec61f7ec10d06a7cfbf9b469a11727608caf34ce455bc0046e9f963220
 Items/Legacy/legacycommand.xml 3016be5dce63d864bfee01b6a0352790f1f38e9833f3d03a87552a85c1776c37
-Items/Legacy/legacycontainers.xml 2af815dde0c44234f48fccdf18af0f8029134216d53ddf21ced5c30f19ce4f07
-Items/Legacy/legacyengine.xml 0b68a8f924c0680dc8fda6c917aed6101903b81779740208e5b82732143a6115
-Items/Legacy/legacyfabricators.xml de92dfd49d6424ab31c6cc62435fd58bb834d37ffddead3f0335296094aa091e
-Items/Legacy/legacyoxygengenerator.xml 76851bce03b3b36d78de19ac89888fc66f6f416874291dd777ac0cbbfb0ad3c5
-Items/Legacy/legacypoweritems.xml 9576023f9a6512647eb13bbba4f646fdb4fd6842727dd2b0df7705333704ebe4
+Items/Legacy/legacycontainers.xml ed022642429c491160edf454225a704ede77f525d0fac95771235880a8886407
+Items/Legacy/legacyengine.xml 67abf995984d13e2a788cfcfec49a495d5e1b3685dd224f7831ede3e790c3ca1
+Items/Legacy/legacyfabricators.xml 30db589cc09ceeca92edc0a14674610bfe5aa57fc440ce0d8c6cb1e0e6de59b9
+Items/Legacy/legacyoxygengenerator.xml 3c118270c83d067ba4e008fd69bfcbb638f9b5bf857fc23276d5506d84398294
+Items/Legacy/legacypoweritems.xml 9c08de0e7040acba32fc32a33b99121126d2a531d3860ece3d5b18de1e305b8a
 Items/Legacy/legacypump.xml 43928f46b032ff49d38d04a0dfcde805a37c18b2ad65fe887a1650ebbea7f690
-Items/Legacy/legacyrailgun.xml deb314ecacccf1e2a4f87acedaa3ab3ef3090841f89e7d749bd9e55ca160c9ad
-Items/Legacy/legacysearchlight.xml 8a31520e627897a8734ba37c60aea54b46adb878af8619b2d73c7504afcbeed3
-Items/Materials/materials.xml cf638304c968cf0f645698b5ab68153ecfad62b221b4275a9b45428d4cbbcbea
-Items/Materials/medmaterials.xml 4f077defc38f5a97973c75e8aba0a2b33c7b9379af14d67e8857fab95b79fc9f
-Items/Materials/minerals.xml 78a5574e85b879c058ff12f6135a4c8dd618d3796bf5874118d13bd8f8b8414e
-Items/Medical/buffs.xml 2c820c0750cb7854a6990f33878b5c828e4b155ad1a81e858a1b5333a1c84db4
-Items/Medical/medical.xml 275e32d4d0720429baef43d877248263631cccb5e039994200d97da8a5e75ed7
-Items/Medical/poisons.xml c6677a5710ffbd018cff54d832f8e8e85fea57a630923fdd80f5014866058b85
-Items/Misc/misc.xml cb1aa423ab1dbcfc722426349c41df942ee93a78cc3264768bb3fcfdbbcaaa67
-Items/Misc/pvp_items.xml b359e412c02bd9ebe73a109d57c7e9cb0f8940262e573af7b43ce87621e1bf15
-Items/Misc/traitor_items.xml ff991b1ca5b60078ad5f63d6d92d06c6b18853f52b606af6fdb57885f9777d7a
-Items/OxygenGenerator/oxygengenerator.xml 83770005fbb7e44eb5b1be08bd4170556bf5e0b6371844b292a77e5145a8f4f3
-Items/Pets/PetEggs.xml 2584aecc0ac46c575542bfe074ee00bb9c99a3df98624273c4599a0cdfc2a40f
-Items/Pets/PetItems.xml 48c4f742d4fc8eb084aef70fc284aa6dac93427c2c1cd8ba35382cfc08cf5f92
-Items/Pump/pump.xml 4fdf25211bb630434d338ddf0699ffef36bacfe6d94840bd34f19d97789cd49a
-Items/Reactor/reactor.xml 8b166249e6e97a08cb3d1f91776488f38bd2b0552bc887649acf9a11a9632979
-Items/SearchLight/searchlight.xml d8a41c43330dc5efee02092fa7e54145e733d392924a5c65a3f732e6ddf18322
+Items/Legacy/legacyrailgun.xml 757ff49391f6e9e10bf09cd6527e16bb60571acc1294fae49c07ec8d9c1bfdb9
+Items/Legacy/legacysearchlight.xml 231639b1055e12b807df3a9e670d46647bf6d5cc5e9f42ed54a4aaf58b2fc22a
+Items/Materials/materials.xml 246bf791dfb5881bd9cee15dc0b5e2d7d2b8b362dc9438fda6581b85ca240a04
+Items/Materials/medmaterials.xml 86d8faf0d1efbcb4de88475a4d5d67008987b39b53a7985def1bce289863af3a
+Items/Materials/minerals.xml 02cdbab6124e6836545fbc14652a476feda8e9a90148aae77665d09a6422430f
+Items/Medical/buffs.xml ceb6a83f901ee8b6a138378f7b44df2b586c585ade80fb2d5934fc4944f5af01
+Items/Medical/medical.xml c643c642c58b3d0b5c5fda5b58dd3de87179296e1f615a7a26c3101ea8a6dcdb
+Items/Medical/poisons.xml 3039ad76a4ca76a86f124bdb52ee34faf47437f3b3dd9ad4a3d58b3af84c9d0d
+Items/Misc/misc.xml 59725409470388ea675b507993e14505930a362e3054443d8e7eaafd0010872c
+Items/Misc/pvp_items.xml 07a77ab70fdd20f797a69480fd87ada960ae4a47538569636e36cdadef567517
+Items/Misc/traitor_items.xml f84c9996057844b73dacf59541200bd07bc0c402b2bae2019ccaa46bf56246f7
+Items/OxygenGenerator/oxygengenerator.xml 12d5c4b6d8a92674fafca0b21c1266e236b6d3a6d7076342629eee6e71449faa
+Items/Pets/PetEggs.xml 924be57643ed73a81393269f98db60dde9f9c0d0b7b43c0e0d98a520ac644606
+Items/Pets/PetItems.xml 00a48ceb4fd4e6f5ec3f0de7f87535e041c291d7204f6767749428ffe30e5113
+Items/Pump/pump.xml a7b351cd57bc868dbbde457a660059d9afbd1d63dce5af58b58fb346a477b2ca
+Items/Reactor/reactor.xml 6fadf065b5d2dd551250cc25b5f182ed75ae867b33b186845509b4863107c7c0
+Items/SearchLight/searchlight.xml e27a7758ad9c8468f8c36071edb517cda7f3bb02468a80a7fa4b466e72fb8597
 Items/Shipwrecks/StructurePrefabsWrecked.xml 0e40310765d1347576c698138d4bb9c955e2ad28c4b99f2ca4f71b5a3f6f42ba
-Items/Shipwrecks/wreckeditems.xml 5c3ffca367536c91b7ce9ba79e1b4ee38cba185dbd131d4407f6ad349a8bf621
+Items/Shipwrecks/wreckeditems.xml fbd555ae66672143182a457c2e435b66fe8377f53e4b3bb61fc08a6a77dac9ce
 Items/StartItems.xml 6b8ec4cb6fbfcdb6c38c9b466cb8ddcda64385499c0dd5dc1bcdb73f35e90483
-Items/Tools/tools.xml b7c632eaeed09cd33c145dd8aa08ec82eafe6d1c2ae38c54c6e8ca95cc0ad10c
-Items/Weapons/chaingun.xml 643b3e85bf6f8cb0f50bcede4a2462ea48b62006ff277e922ef1f4db96e461fc
-Items/Weapons/coilgun.xml 60b85891612768774d420ad1eeac86ee57f582def8b7e22f82014834ca18a58b
-Items/Weapons/depthcharge.xml ec72028c98a5fa25274f5d66548766c685b24fd2b244b490c692d7e8f8b5553c
-Items/Weapons/dischargecoil.xml aa140cf85ad90d70dea8acd52b47ed0f493e6ee9e01e401f66010de53944d961
-Items/Weapons/explosives.xml 2a5e44089b3f3364beb3fae49133b26cfff3a9d21b43e6227a863bbdeabbf062
-Items/Weapons/flakcannon.xml 1a78a4cebe047105b227a7be996d4487807d344a003c07fceaab775df2737837
-Items/Weapons/pulselaser.xml df0d32e36c6842f526c44c62ecdda963d3139329aedfb05f12acbd919848ba11
-Items/Weapons/railgun.xml 0268517a516f39c7244ad27f7349c49936afd9e93259a8b1dd5d9e0fead03004
-Items/Weapons/turrethardpoint.xml 3da1d055f126e573bb2b0a0ee91f9113ff2aebd590e9bb9f973df2dd6b33ca5b
-Items/Weapons/weapons.xml 667d3e7a42c85f22a4df402c9b806a318f8713b5f3397447219437bdc8259885
-Items/idcard.xml 55597ee262486b25f5ccdf6ab64c924e4cccb55527712a2b987020d07f5fefdb
+Items/Tools/tools.xml 480675db267a16e0b3e49fe7931bcd1d9beac3552a8b181b04fa859118d67068
+Items/Weapons/chaingun.xml 8d8020339e01aa71b4542f667baa4f05193fab8861930fd412aaaa1adb5cf507
+Items/Weapons/coilgun.xml 8ea1a770ebf173e4bfedd36a7ebfe598ce9475ba8e4384ab4d21d5ba28a805aa
+Items/Weapons/depthcharge.xml e041a4f7b6486f687d303f1a544ff9b7cd170a6fa2e69182e62aedd4843a68a0
+Items/Weapons/dischargecoil.xml 5ce74fe8a41ee4bdffd1c7be69076dc5cf703004e1a0abbf64168b22cffc4199
+Items/Weapons/explosives.xml a06b9d97bb1dffe1504b029f3c179e06f5df7a2927b1dc41d1eb4af53087e517
+Items/Weapons/flakcannon.xml e5e5ed4fe2f95c3a8d8ea1a0038f7587af3ebba921de7d08ecde293fecf4664c
+Items/Weapons/pulselaser.xml 1dc302f03087c13deb776fe316c47a928feab9f92925ee6fdcda0fc87174d648
+Items/Weapons/railgun.xml 7179e53164597ca441aa7c874ed5984b544c37d43773243b1e8e61b91ea347c9
+Items/Weapons/turrethardpoint.xml 17be71871274f3503981f260f503974393aed0f5cc3972870f0fce3a6b7f4dee
+Items/Weapons/weapons.xml 0affbac732be9237435270739a76151a6c97233a1fd54eb742a7c1b990bf6840
+Items/idcard.xml a88833434f86967e33963ace7d8a906b534fd4feb58a4092265e94b1c32a7f4f
 Jobs.xml b49c5d944b77229e071e8c2d838705c5e74b19402ecc530db5d7c77802e1136c
 Map/Biomes/AphoticPlateau/AphoticPlateau.xml a7b9daa7965822d4104d9d2f22faeaf799ac5d69e83b68971db33288f50e17d5
-Map/Biomes/AphoticPlateau/AphoticPlateauObjects.xml c691e90e8e2be0a1899838ec7ff9fbae168b0199a5baa60230a9ece4e79e48ba
+Map/Biomes/AphoticPlateau/AphoticPlateauObjects.xml 0dd3589c807d8c600f5051205788b687a24efb81859cf235ee8f289102a9a464
 Map/Biomes/BioluminescentCave/BioluminescentCaveObject.xml ea182166b3923eecf28c558585e0cf548a1a72abc147d75d466c2ec6afdb98ce
 Map/Biomes/Biomes.xml 5848d67a90a2744fb29d1ca00580d652eb5c2322f707cd526d7f14167b391b19
 Map/Biomes/CaveGenerationParameters.xml 95567598c7a0026c876e785f3fecd92310a33e09e9bc995d1015b15aaf554b38
-Map/Biomes/ColdCaverns/ColdCaverns.xml 3b77c6c8de127004425f731b7f49a5c5d9b84ebf50fa7b68a6a2496603c11701
+Map/Biomes/ColdCaverns/ColdCaverns.xml 48a410571c2dd94e0b91c7a4cc7a91d46ef2be3ba6bf16a87cba0ffb47e07cec
 Map/Biomes/ColdCaverns/ColdCavernsObjects.xml e98a8e6fd36169631f0b0ccee9bbf81ae5c6b152025ffec7b475d4491e54145d
-Map/Biomes/Common/CommonLevelObjects.xml 14d0d5872cf17e26be3efac9d48da916ac2b779044c19a4b7b0f735fcf66adb7
+Map/Biomes/Common/CommonLevelObjects.xml 96727dcdbfaf6737192e521807d366e4dd5cfbae42333fabc751620e990e39b2
 Map/Biomes/CrystalCave/CrystalCaveObjects.xml 0fa9119ce3a47f32e89f94e958cc85b40da5f104178931a3437a5b11dcd7a943
 Map/Biomes/EndBiome/EndBiome.xml 802c9a85b5a71d89232363f8fa4df357aa97e765236ec55f559d18f9f93d2a28
-Map/Biomes/EndBiome/EndBiomeObjects.xml b6d5b079415b636410a35b8dbaefb1f862b987918085416b52d7be5b3f277352
-Map/Biomes/EuropanRidge/EuropanRidge.xml 494b234e932a3ab748d17705430acad2d13b57d5a2ee92f380fa79ceda0f097e
+Map/Biomes/EndBiome/EndBiomeObjects.xml baafbef51fc681e8d3bcebe9741cf426777db5fd6adbabc232f213f8c124e5e1
+Map/Biomes/EuropanRidge/EuropanRidge.xml f180102556f6431f85d67759c62ffb7cc3df0094ff8e4be336059acc9145a48b
 Map/Biomes/EuropanRidge/EuropanRidgeObjects.xml 748d89be5acee18f9980b2d09b477a01a83b567237c702cef4cd553e7d82f9a9
-Map/Biomes/ForestCave/ForestCaveObjects.xml 771952c54919a91af74679981960a255f48c5b2a2b6d9a9a7671a3a52ddcec8e
+Map/Biomes/ForestCave/ForestCaveObjects.xml fb1d3222455e226a03613523636ec0d3f1525e17e777684268fcd44c740b8336
 Map/Biomes/HydrothermalWastes/HydrothermalWastes.xml 2109d06483dec5ed3b12ae87c1bf1e5fd609c35c1e33b3370d36a63e0ec3fa20
-Map/Biomes/HydrothermalWastes/HydrothermalWastesObjects.xml e062f16e8876950673c174e02676d9623bf5c1bc032f44ae94b37ed691c11180
-Map/Biomes/IceCave/IceCaveObjects.xml d6852597b652dd031c08e7474270a588ac5c147e54525aea3e36e79698027e0a
+Map/Biomes/HydrothermalWastes/HydrothermalWastesObjects.xml 3f9c5561d76c6fab04b8be0c518ce2f472c980986c006b365cceead08ddda4be
+Map/Biomes/IceCave/IceCaveObjects.xml 3ce6d2f5b0209c46464e6a647f76ebc5fe533694705cb2881e9a3df80100cdee
 Map/Biomes/MushroomCave/MushroomCaveObjects.xml 9e9fe538f929ab0739a0c9e8c8a1ec4076c1189a7deddb40ea6a126faebe3ffe
 Map/Biomes/NestObjects/NestObjects.xml 1c0a854cf7c988e258ba288607bdb7a5e0630ce7b348f5d437eac674319e31cf
 Map/Biomes/RockCave/RockCaveObjects.xml 4ea5eedb391350a220e74b84a9ee438e88fcad462cc8c24ed3b5e04dd8fd1ea2
 Map/Biomes/TheGreatSea/TheGreatSea.xml e89416ea603fa4864d5231e518c67dcca06cda3e778e06706d28f02df5d0e5cc
 Map/Biomes/TheGreatSea/TheGreatSeaObjects.xml 78c6c95ab42bb87914d745249992737bb7a0950c4181a73e9e76c541c3591631
 Map/MapGenerationParameters.xml 509f97fff9723e07f7fcd92b1639558f98d9fcb014fefe6dc2fd89b9c3a9368e
-Map/Outposts/AbandonedOutpost/AbandonedOutpostDecals.xml 3a98eb9cda3c9cbd3a76987f11b0535a8492f4de5dad198429f41efcdff9295a
+Map/Outposts/AbandonedOutpost/AbandonedOutpostDecals.xml d0f9bcf6d867ee3fc59783b3b135e442785daca31d6b9e0129c3a87554a8e9ea
 Map/Outposts/OutpostGenerationParameters.xml e868ba1f064dfeb54103f405e76bc5159af0c29ae94effcd7275b08d36e65638
-Map/Outposts/OutpostItems.xml 42208fb52cad3a07ce5ca7de139ed65197d930d6a132f89b98d1baef3e227ead
+Map/Outposts/OutpostItems.xml e6b1f05fb24ac87bdf35671481969167109d0344f97e118745cb0fceefc20eaa
 Map/Outposts/OutpostStructurePrefabs.xml 448ab0e4ed6c9dc89da1bcbc9e1374bba0d8fa52d9595769455cfe1b9c80f57d
-Map/Pirates/PirateItems.xml 6e6bb28cb7c69871a4cc6508cd126ae72cfb35d1060f5b4c7f911705e9fde90c
+Map/Pirates/PirateItems.xml f7c825ebe68195a378a8c944756b1f8d8b53a750f7fc3c476d328add99f975d5
 Map/Pirates/PirateStructures.xml 7014212df21f37ec6dadd6b6409b3a01a50c44392df94d83dd8a99708d7076bd
-Map/RuinConfig.xml 3275a6e3cdcf60e6760a8422be5699f0f7cf6f24101d3c346f428bb412493017
+Map/RuinConfig.xml 3107b708f1c12eb14bb36731bd1dd9ac51eb13f8ea77c86b0d659ef504be9dab
 Map/StructurePrefabs.xml ad9c13f25e16935dded1eb8223198e5e218199e9371c724dfd708fec6f62539c
 Map/Thalamus/ThalamusAI.xml ab3f5f8d7d07fb02b5f030aed1ab29b7cd1c9e966bed8891c5654f3731628473
-Map/Thalamus/thalamusitems.xml a26924bc86939db64af022a4b7e3279261575f01c3b336041937def29bd2b68d
+Map/Thalamus/thalamusitems.xml af7d6b9865e686e1ef525eac29f33e86381d2ff90e03424e959d73474eb198a8
 Map/Thalamus/thalamusstructures.xml 36aac41609cd4dcaf9974a51972793f7924ddd1d3f0b8cab224d83698e58224b
 Map/factions.xml 13827c614ec0d54d0c6f0e6dcc83b1cde0a0aaf51c2c35a27d5257ba0799c5ad
-Map/locationTypes.xml dc3a10b8a74a4870a803168faf70324fc09aed8c5de6745063f2477c41b8d1f9
-Missions.xml 9b55c77713b952063fdd808036241d7d5aa5359be291c76ebbcd4fdaf84bf7d7
+Map/locationTypes.xml be72004696257e739d451785897b4d4a8c693bd9e0d32e4a0fac5445561299d7
+Missions.xml 689b81da1bb373e3d6d49d758e52731c9bf56171eaea0029212bd5617fb588e6
 MissionsPvP.xml e11a931a922e80a184a58a61ccee57b935505bb0863f71e400cc74ff6992b016
 NPCConversations/BrazilianPortuguese/NpcConversations_BrazilianPortuguese.xml 662bbbdd014953aca64c681d696c566aebf4b3bf5a431bc7a21faba46c19299f
 NPCConversations/CastilianSpanish/NpcConversations_CastilianSpanish.xml 34b6fd8bceb9c2b519dcc6076b5a84f6006b51aa2b518ff6c588a0eaf2aca9e5
-NPCConversations/English/NpcConversations_English.xml a32b32090a5da365edfa8827e166e55c2413781848a6e6603997b0877e0980f4
-NPCConversations/French/NpcConversations_French.xml 79e95502561f774b1a30ef3a6756b395a42656d3a6ad7093aea1c5a12af9b3a4
+NPCConversations/English/NpcConversations_English.xml 7feed9ea6f2f49511be90039b654f218a5d751255901083d4087d89ba39f6d89
+NPCConversations/French/NpcConversations_French.xml f010e041c35c44c6d5f48a51496b1a398a0051d87caf00b0ef58ec1f17b838d3
 NPCConversations/German/NpcConversations_German.xml d5f19b7d86820a914fba5543a82bb2a1e122619eb627d0bacc72912134e4141f
 NPCConversations/Japanese/NpcConversations_Japanese.xml 7636a3d476d65da35ed860d83e477d0f06f2fee5eb0dd2bc04f58ecaeccd3a31
 NPCConversations/Korean/NpcConversations_Korean.xml 464f1bbbe033e5e6067893a9e0c5029b199e54f992dfc6d87e0da7b1a5d11bb8
@@ -510,10 +510,10 @@ NPCConversations/Polish/NpcConversations_Polish.xml fe5ce8719606fff790df6c2b1460
 NPCConversations/Russian/NpcConversations_Russian.xml 61e8f275c6d0f4f5fdc650aee0d9e6f6408ee3eddb94290f3fde1926d0e32b63
 NPCConversations/SimplifiedChinese/NpcConversations_SimplifiedChinese.xml 2ac8effd3ca514db530255436c4743d16f0541b2b841560433a4ebd519669ac3
 NPCConversations/TraditionalChinese/NpcConversations_TraditionalChinese.xml 3d1c53bf0020856b4c734e86a028f357d2419e75fa5314340cc61143db4be09d
-NPCConversations/Turkish/NpcConversations_Turkish.xml 78ef545123bfd0dbd9e2148482b62043beb964fea3eeefb9b0b7408b0e5055e4
+NPCConversations/Turkish/NpcConversations_Turkish.xml e9c2dc986345fa223a3e43847c2b7650bd77eb4ff91b3a2e4ca32aac0acf09e7
 NPCPrefabs/CombatMissionNpcs.xml d1d5de4731a28fcb26ee574a742c70590a0fedc4fda35c3e16982c6cb0c4fb67
 NPCPrefabs/Corpses.xml eaf944f0c3b0c8b3f3e45ee3545169761c19b0ac36102e941671f61ee0b9b570
-NPCPrefabs/EscortMissionNpcs.xml f8200aab9ede508387d4ea784d2ecd045e437a5d74422c31ba07720da138cd44
+NPCPrefabs/EscortMissionNpcs.xml 2e874c70d9e2c971eb47c9a0d68116ebc659e24ebe5da36d04452468bd4c4a8a
 NPCPrefabs/OutpostNpcs.xml 5cb5e7fdd1b47fa877441354a235897aea2ad34c2e8541474fd4fd52ad68e391
 NPCPrefabs/SpecialNpcs.xml 437cb8f15521bd8289e3f6bc5ace5db969dbe0f0681ca2e7562b7860794b02ab
 Orders.xml 79c3a604651b7231d4d1efc3fbf88a70fd77f31b5f8a5c18b08e8dd1e96f45ec
@@ -522,83 +522,83 @@ Particles/ParticlePrefabs.xml 044f07561425dd69ded7ada0e76b661d6f5d3bffd20d6efa72
 SkillSettings.xml 423ef573a93446cc598ef394157bc6666eca16aad9a881eb0a2d59fad1450ced
 Slideshows.xml dc32e638fa3062dd1714d1c5e83605ba9c62d081a3bf154637d17bc1cb0a1352
 Sounds/sounds.xml e355a25c800a31b359f3501a5178ccecd84fe34cabc7204ce8436bb7eccc2074
-Talents/Assistant/AfflictionsAssistant.xml 602a25202aa88f6bbd839ceb3ff86cbaf3ee0c76c6050da79bbbf7ff75ef994c
-Talents/Assistant/TalentsAssistant.xml 3a27dafb27602d562cadf79b85d8839e568ed8ce28d1a67cb316568d021fe38b
-Talents/Captain/AfflictionsCaptain.xml 0e5453aad8009f5a585dcbb2afc46f8988066fa26b52c7701f3bbf67bac0378f
-Talents/Captain/TalentsCaptain.xml dd70b4cc988eb1d98514176b55d7d5a739ddc0236cae7ba0d411dac0e72d0096
-Talents/Doctor/AfflictionsDoctor.xml cf1e35702f4232ec2d024e6a04b06d11aa743c29f2473a84a2b9b001b32ce70d
-Talents/Doctor/TalentsDoctor.xml 695fc2d30f05dc852a5396af4bba6af716c8d7c718e9df1782ff9caaadd330e0
-Talents/Engineer/AfflictionsEngineer.xml 46b7f34491c73e0079664b01d80fe6da5a162300a401b058e03fc94c525c6285
-Talents/Engineer/TalentsEngineer.xml dd0f58c41fb3cf9f6a1cb3591aa7a6b3f60c0e82ad572577b4c9b51f4a5cb868
-Talents/Mechanic/AfflictionsMechanic.xml d228354068d4555f34688708b392b83199526f9f7b78f214711f6904feb97840
-Talents/Mechanic/TalentsMechanic.xml 07002154ad44e73607311ea834a72b6125669d78dceeba1a97a17ade6a5e915e
-Talents/Security/AfflictionsSecurity.xml ebf3b5a0ba88a1a450cbc49b8d3c407955e4441584c6fa767ee0487d461a9736
-Talents/Security/TalentsSecurity.xml cf25774c0ac43aad3d417ece21b466274a1546babadee9033c8d1685c9280ebd
-Talents/TalentTrees.xml 8177e5240a40699fa09db03456f466fdb390e734b568df8091e7325572dd0e92
+Talents/Assistant/AfflictionsAssistant.xml 8be72356a4227eb96d69a8a8d84f7a37347f0e0afa74505b90868d1361af7ab4
+Talents/Assistant/TalentsAssistant.xml b2b58e516c58468638d81d123d271c7d0130af1af56f765a6a21102c2f01a50a
+Talents/Captain/AfflictionsCaptain.xml e68a835d67d61c5a3a4a97785efbb55550c8e22e7650d3564d99dd0a216fc130
+Talents/Captain/TalentsCaptain.xml f3966310db0004a50d22824965804cc406baa5a19f02f72a9cdfa4d828bed363
+Talents/Doctor/AfflictionsDoctor.xml a49142f545e8c56687bd2f4b72b2ab92c390b7b54c938196fa5fcacd541d23a5
+Talents/Doctor/TalentsDoctor.xml a26c4034b359634e2b83e3e5f4c128ddb98c76174ec147cf72e5d11349471855
+Talents/Engineer/AfflictionsEngineer.xml f4f6c6f2392eb42a1a2abb4eff8e065c1a3509cd07a231654a48d00012218f3a
+Talents/Engineer/TalentsEngineer.xml 71c3ffe41396a0b83ff5a41381e6be14c2d49e0558d7b602de1fb9a87fff6c83
+Talents/Mechanic/AfflictionsMechanic.xml cb47548206cd7246d983b677d41cb23385133fc581ab9f4d3193cf2be7631043
+Talents/Mechanic/TalentsMechanic.xml c0940307e0e2d50cade216fb4b251b81217e4a3f9092669d56e9518077bb39df
+Talents/Security/AfflictionsSecurity.xml 5676662d3463637733ece86d3ea741f060925fa270af613bd280a760e82ddc37
+Talents/Security/TalentsSecurity.xml ca62fed675c0c6aefd3313a27563f894563fbfd0154d997f371d20908affe159
+Talents/TalentTrees.xml a1d2d63939037c7b456c7c57ab77eaccf5483255d15aecc813d4c016e9dbad97
 Texts/BrazilianPortuguese/BrazilianPortugueseVanilla.xml 6abaa370402488c276710bcb65241015774e0fd8d4fb58926e9f334dc5d6e504
 Texts/BrazilianPortuguese/BrazilianPortugueseVanillaEditorTexts.xml 66faca6034420b906ef6aa1abc3b14987a5d7a39cdc715451ffc25a9f26d541e
 Texts/BrazilianPortuguese/BrazilianPortugueseVanillaEndgame.xml e8cad7735e28c926bacfaf1de9d66f3fe9acb033ff16cf8a95895bfb65425f5d
-Texts/BrazilianPortuguese/BrazilianPortugueseVanillaFactions.xml 8518301ce8cdecfb62494bacecf9584f121c92c6e764dd17862c871c1590c7e8
+Texts/BrazilianPortuguese/BrazilianPortugueseVanillaFactions.xml 1bd52eeec1f7a8b7dcd4117dec84b05711073d1d0c7c443a8dd552dd96c388d7
 Texts/CastilianSpanish/CastilianSpanishVanilla.xml edd380769c15516fbc89557162c0c887d3c18b6536b53addf41ecda2e0308df4
 Texts/CastilianSpanish/CastilianSpanishVanillaEditorTexts.xml 81ecef263dd9012bd8f301c39e8364fcdf3186dd2a9bed19ecabbc6c2fa2b5ff
 Texts/CastilianSpanish/CastilianSpanishVanillaEndgame.xml 0692544a49bbc43186118af66dd5adb7a900acefa69926ce459802c44150e994
 Texts/CastilianSpanish/CastilianSpanishVanillaFactions.xml b76c70d631595b0dc3840b439d21af2260730425c59e3127c35d50ff3c1f0b6b
-Texts/Credits.xml b22a46d0724cdb8283268a103e311731352fb1361aad29898484cb361fded8ef
+Texts/Credits.xml 166e1cd7fca773bf8c94d26b39b0665552a1a1d9408dff599d51cd3b156c9325
 Texts/English/EnglishVanilla.xml 87e30b390f4aff937004260615f9b6057944d49f0e8a3efae6176a4390191e1f
-Texts/English/EnglishVanillaEditorTexts.xml e37de88a1d37cb5cdd63dc5b3c909a1c7c518861ba8f1f3cbbb44421f6a9089a
-Texts/English/EnglishVanillaEndgame.xml 88cac471852c7e5cd7788f5ba3c8ca4db721b7c87fe03d81c93edbe3dd34d72e
+Texts/English/EnglishVanillaEditorTexts.xml cfe59c60a2164fd8b4c178bab11f3544c481eb6b8a4dfee4c498d6b9db78581f
+Texts/English/EnglishVanillaEndgame.xml 1694c5f3ebe33505d444cf19e8384f45ffa87926c55a800f2532b43abf0cb717
 Texts/English/EnglishVanillaFactions.xml 11b9fc493a50e312ce5df7d6abeee111911d8507a7960e3d6a9a375f2a46482f
 Texts/English/EnglishVanillaNew.xml 8cfe4644681ab88d8c9f260d450efb5385a8e8b3b4eeec99cd59950abb5fd7d3
 Texts/FinnishVanilla.xml abeb3e861545941474f583c0d6c9efc6f930a2948a63f9f943df5450225c5abf
-Texts/French/FrenchVanilla.xml 02ceaa4ef6a0f49fdd1fc944ce795a95702a259d0d9dba875c1e02bc94a0b172
+Texts/French/FrenchVanilla.xml 078aa0e5fa04685468c6861b446683a9f2f3d40cc8108620a96d28f1a56e986b
 Texts/French/FrenchVanillaEditorTexts.xml 1a1ca16cc3134ab69c0c0bec793e97e90fea81bcb806d554a6fd6f820e62cd58
 Texts/French/FrenchVanillaEndgame.xml c705d1f174fdc2520ddef20f7b4b42954fa75802cc1901599031d4209f9b1c16
 Texts/French/FrenchVanillaFactions.xml 79c6af4ff743e86bd67620da8f80609ea0e6cd809bfa887cf1492a6113a1fb71
 Texts/German/GermanVanilla.xml 6ca15273d38b332cd4def85b148e6ff6e611512c8d16e5555f49d8d3c4ca2b4d
 Texts/German/GermanVanillaEditorTexts.xml 651b4bca7485b4d281fb2231ea41dccd0b2adbff10722f5989f60bc7a0283331
 Texts/German/GermanVanillaEndgame.xml c1830b6329f87fd562fc385568e41c03b963efbbd74d1a3b606f4e4585a28a9f
-Texts/German/GermanVanillaFactions.xml b023a13683cc8eef91111011c34a1dbd3fda3d20556e932de8a5309cdcb175ff
+Texts/German/GermanVanillaFactions.xml 6b34412b8ba84d19550e5e079f915279cfd282c27e72c709cfdbb8c19b44ec99
 Texts/Japanese/JapaneseVanilla.xml a110435d2f6bb69d7bb5d7457a4220bc95b89b14ad6bf9d9c3d08f20f63f0438
 Texts/Japanese/JapaneseVanillaEditorTexts.xml 9a7660fbd6fe09dcd813282e584504d037f97d2dc6e57b28e48beaf7b3b557ff
 Texts/Japanese/JapaneseVanillaEndgame.xml b462da25125f4147c5a9fcd139f998ee9e4898dbad8ec474aa0a2efec9d44896
 Texts/Japanese/JapaneseVanillaFactions.xml b9c6f1a466d8e0cb9d19df3e1be7c91ff01bbbb7cee1ce05663e0b0328e5fa5e
-Texts/Korean/KoreanVanilla.xml a5da58c31eff1bfd098add1e27bdde1039831991332c1312ec5c62dc8cc7b28e
-Texts/Korean/KoreanVanillaEditorTexts.xml 01b2c3c269a085cb826f79a5ae5e8adfdd9773e25e7a9f84e5af7964669780e4
-Texts/Korean/KoreanVanillaEndgame.xml 6f4f2d7ad2d85c1b95e97412f622764fd4ae3f23aba90b3d43bd113624b17514
-Texts/Korean/KoreanVanillaFactions.xml 4bfeec1dc6a8b8611d5df3eb72de023fe4736c75aac49e85928141653890acaa
+Texts/Korean/KoreanVanilla.xml 0b882fa11df477167fcb28266a8679737376ca2946f2d57da0ebecb9151d0d5e
+Texts/Korean/KoreanVanillaEditorTexts.xml a83c1edad2943d4d71169c8cf99aeeafbc79028e18a36205d3b8a33ea28dbd69
+Texts/Korean/KoreanVanillaEndgame.xml c4a70509059baa764c18161cdf0204e4aee82049b348b500c62279659f810357
+Texts/Korean/KoreanVanillaFactions.xml 6395152bdacd4fd8926574fe451cb27e9b5e2a11b8f5cefc0a984b5182c97bd0
 Texts/LatinamericanSpanish/LatinamericanSpanishVanilla.xml c322a8c94bf9183ab94c35a8ad81e92212be6ed8a54ec965f3a86acd855ac9da
-Texts/LatinamericanSpanish/LatinamericanSpanishVanillaEditorTexts.xml a148d3b5bda1dae1935938e701311c0160b69f3b6f8fefa0401efcfcf2197ff3
+Texts/LatinamericanSpanish/LatinamericanSpanishVanillaEditorTexts.xml a80c36d17e50fa8ecb465c2ab22ba5ec0ab045292ebe31353f48ba911cf04e38
 Texts/LatinamericanSpanish/LatinamericanSpanishVanillaEndgame.xml 33b832e8c7f28f57ae95d8134b6f53b3a376b8eb013e6d3d6b53b026d2be492f
 Texts/LatinamericanSpanish/LatinamericanSpanishVanillaFactions.xml 426a8b4b2e1d0d35436451952360ff688cfab860acc142c64f2d4ad660805716
-Texts/Polish/PolishVanilla.xml 77d87d4fcf1eded3a73b32947bb9ab87d92fc95a48e9231eaa73d9f1664cb919
+Texts/Polish/PolishVanilla.xml e64a48bfa08d2f1badc9ebe981ec1e3aa849db0b8304fdeb9069db15746976aa
 Texts/Polish/PolishVanillaEditorTexts.xml ff13a9a0a2c9f1ea17889bb5a738860364c629db67e5e3a596b038e00d0df602
 Texts/Polish/PolishVanillaEndgame.xml defb146d19a2babaf3e919ae5ecaafdfde760dd2988a55813e0e8ffd4984a302
 Texts/Polish/PolishVanillaFactions.xml d2700a33bbc217aef659e452c9fe42abc971027cabc40f794a6fbc7f6858e3d4
 Texts/Russian/RussianVanilla.xml 243b907dd970dbc7299a1a41f63e5715ae2d3ec7476470033935e36d1bf5e800
-Texts/Russian/RussianVanillaEditorTexts.xml 884daf2a969fd4ea8e075c8c771a7b8ec9a12150a1a8c18f38576037e4c61bde
-Texts/Russian/RussianVanillaEndgame.xml c5852ee9193d0c7f35a3d33c1fa6b0c9184502983658b1e7a855a6f15e95553c
+Texts/Russian/RussianVanillaEditorTexts.xml 94d6b0e8ed1dbc3a8f48689bbcd1f11dbf77c7623f2b1714d66c376c17d78af1
+Texts/Russian/RussianVanillaEndgame.xml c0b6c5d987358acbbc036a4de88bd2b7c0dcff9159027b82f34c04b032e260c8
 Texts/Russian/RussianVanillaFactions.xml 0da8328103abe2e68c6e6e880c938baa879598187941ddc3ab03c22a4ca1c3e5
-Texts/SimplifiedChinese/SimplifiedChineseVanilla.xml e16473d8a2817295ac4d14ea88c6467652495b18630158a59f8e8f0647a7a3a9
-Texts/SimplifiedChinese/SimplifiedChineseVanillaEditorTexts.xml dda43013ef3ea891aaa996457e6b2af6068397e4a3751d910fe5301357f6cf8b
+Texts/SimplifiedChinese/SimplifiedChineseVanilla.xml 232ab61d62ffd18e59708530a14ee05f47a1b67d2a0aa75b3ce84e787c484244
+Texts/SimplifiedChinese/SimplifiedChineseVanillaEditorTexts.xml 61e445c81d1f29490d31c239507b7db636fe1a3cd72eefddf66efb5eef8abd0b
 Texts/SimplifiedChinese/SimplifiedChineseVanillaEndgame.xml 6ba8b325c7aebb7abf28c599dd166bcd3c516884345aba2966df8433c37da44e
 Texts/SimplifiedChinese/SimplifiedChineseVanillaFactions.xml cfb7c3e34751f47f42fab1a5bc5c26f87d472d35d4b9aa0db83a1a503906c112
-Texts/TraditionalChinese/TraditionalChineseVanilla.xml a5cb51aa14708baf9b3ce2db79d3d3b27e7047dc6cb3d73ee504640bb7e3f3b5
-Texts/TraditionalChinese/TraditionalChineseVanillaEditorTexts.xml 406ddb013f4b01e2ea5a454d7d6172847bc8484d61bbfc03141a9aaa580d1ad5
+Texts/TraditionalChinese/TraditionalChineseVanilla.xml 7bdcaf592c2751d6d526dd1710e83816ef514d3bacb54b24b382e463cef225e0
+Texts/TraditionalChinese/TraditionalChineseVanillaEditorTexts.xml ebc43d0d833485ce8a21c98ec5c606fd1fea57925ceb6bcd86535398a3ec0021
 Texts/TraditionalChinese/TraditionalChineseVanillaEndgame.xml ad38446129fff255433b09689a0618d00a2f927c60a76702aa9e9f542ad3c767
 Texts/TraditionalChinese/TraditionalChineseVanillaFactions.xml f32b4a113355f87524ba1cd16878bd204844fab5ceb6055963e904400b805138
-Texts/Turkish/TurkishVanilla.xml 9cbf327c90df1f5a5f3c0ecd34e57f621f03390cb599284cdc31d35ebe0b6f41
-Texts/Turkish/TurkishVanillaEditorTexts.xml 89b2e5bdca71f5a1b49b0d226dc63900e71abb2c81607461d014ead48e493788
-Texts/Turkish/TurkishVanillaEndgame.xml c0bf33719e15aea68077973553e740f89a061398d548bb32acf054d18bb863f9
+Texts/Turkish/TurkishVanilla.xml b33339ebd0c62c341edb64df0656ce2cb68d465fe5fe251b3ba072af80ba7a46
+Texts/Turkish/TurkishVanillaEditorTexts.xml ca9510f4f90857fee7052ebd1ca0564210d090513005fbf79b476af08ced6498
+Texts/Turkish/TurkishVanillaEndgame.xml 94d05c588ca7674c9f87f4f8b572d94bf9e28f8b3cbfd50bc791b6ddbe5bd7a1
 Texts/Turkish/TurkishVanillaFactions.xml 80ae556d0e3cf0bdf1225a41dface4254d79701cad895331a2bf70ddaeae14f4
 TraitorMissions.xml f4e0b72d98d3fe8788d2c059cfa9898f604c182a8744995052cd2b098d803192
 Tutorials/CampaignTutorialEvents.xml 00323b529f6dd068c02a2fb719886fc6bddd74f224970cfc0be67f7cc6ecdb01
 Tutorials/TutorialEvents.xml 2dd246a50694e5d92555956ff5e71e12e7266ae31178431b5c47b4845f68edda
 Tutorials/Tutorials.xml 0d2ad2815b8a2227bc3f18d6dd76860e657544c63bb111afbe98adbf46b160fa
-UI/MenuContent.xml 0826a1685ab9162c20e0be2be7240872c09b0d2e91d0619c1a4e52bb4f1327a6
+UI/MenuContent.xml d2d4986de4fe18c224e71e2b9b976f730defcf029ccc4e2ebfbe494868e21098
 UI/Server/PlayStyles.xml f673a9131455d66c79ed1ae19adb698ad385c8123fa667cb58f6787c44480a62
 UI/Social/Social.xml ee822d23d2f397e4e01c75a3234d99be82c1c15a5fbadca5b388ba49e3fb1cb6
 UI/style.xml e6fa04448dec932a07eed527e93e7fbb88e4c433410887a8dbed7fd63729879a
-Upgrades/UpgradeModules.xml db5a636efd89b05bdae7e13bb8d32ef2deef2101262a64b196eee79395c4ddb2
+Upgrades/UpgradeModules.xml 09eeed972573f793604e0b1f19ce985e00bfedcd4bf712f4354130a4d0cc7aca
 disembarkperks.xml 4afb7edf7363d92d6260b2a2989ad5dafeba1decb378335920fca1da49d11bbf
 randomevents_campaign.xml 5083e284423749351b7b9cf9a047c73659976746ea6c14cf8d36398dea710766
 randomevents_lineardifficulty.xml be2728fb5eaca3141dbab88f97c50aaa7a1350703d65e5bfeb941608e92c0a70
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Containers/ek_containers.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Containers/ek_containers.xml
index 1215db8a..9f74e9ad 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Containers/ek_containers.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Containers/ek_containers.xml	
@@ -4,7 +4,7 @@
     <Sprite texture="containers_ek.png" depth="0.84" sourcerect="0,224,192,200" origin="0.5,0.5" />
     <BrokenSprite texture="containers_ek.png" depth="0.84" sourcerect="512,0,192,200" origin="0.5,0.5" maxcondition="90" />
     <DecorativeSprite name="Weapons Cabinet Doors" texture="containers_ek.png" depth="0.82" sourcerect="192,224,192,200" origin="0.5,0.5" offset="0,0" />
-    <ItemContainer autofill="False" capacity="4" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.3" slotsperrow="4" msg="ItemMsgInteractSelect" itempos="34,-120" iteminterval="38,0" itemrotation="90" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="9" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.3" slotsperrow="3" msg="ItemMsgInteractSelect" itempos="34,-120" iteminterval="38,0" itemrotation="90" allowuioverlap="true">
       <!--<GuiFrame relativesize="0.2,0.2" anchor="TopCenter" style="ItemUI" hudpos="0.5, 0.3" />-->
       <GuiFrame relativesize="0.3,0.3" anchor="Center" style="ItemUI" hudpos="0.5, 2" />
       <RequiredItem identifiers="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
@@ -12,7 +12,7 @@
     </ItemContainer>
     <!-- Open in the year 2080 when container-mode finally works
 	
-	<ItemContainer autofill="False" capacity="10" canbeselected="true" hideitems="true" hudpos="0.5, 2" slotsperrow="5" allowuioverlap="true" >
+	<ItemContainer autofill="False" capacity="22" canbeselected="true" hideitems="true" hudpos="0.5, 2" slotsperrow="5" allowuioverlap="true" >
       <GuiFrame relativesize="0.2,0.3" anchor="Center" style="ItemUI" hudpos="0.5, 2" />
       <RequiredItem identifiers="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true"/>
       <Containable identifiers="smallitem,magazine,round,shell,ek_microtorpedo,ek_ammobox_shotgun" >
@@ -30,7 +30,7 @@
     <Sprite texture="containers_ek.png" depth="0.84" sourcerect="0,424,192,104" origin="0.5,0.5" />
     <BrokenSprite texture="containers_ek.png" depth="0.84" sourcerect="512,200,192,104" origin="0.5,0.5" maxcondition="90" />
     <DecorativeSprite name="Weapons Cabinet Doors" texture="containers_ek.png" depth="0.82" sourcerect="192,424,192,104" origin="0.5,0.5" offset="0,0" />
-    <ItemContainer autofill="False" capacity="10" canbeselected="true" hideitems="true" hudpos="0.5, 2" slotsperrow="5" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="22" canbeselected="true" hideitems="true" hudpos="0.5, 2" slotsperrow="5" allowuioverlap="true">
       <GuiFrame relativesize="0.3,0.3" anchor="Center" style="ItemUI" hudpos="0.5, 2" />
       <RequiredItem identifiers="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
       <Containable identifiers="smallitem,magazine,round,shell,ek_microtorpedo,ek_ammobox_shotgun">
@@ -61,7 +61,7 @@
         <Conditional Condition="eq 90" />
       </StatusEffect>
     </Holdable>
-    <ItemContainer autofill="False" capacity="3" maxstacksize="1" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" capacity="7" maxstacksize="2" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
       <Containable identifiers="smallitem,mediumitem,weapon" />
     </ItemContainer>
   </Item>
@@ -76,7 +76,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="10,-70" handle1="-40,8" handle2="40,8" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.85" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="12" slotsperrow="5" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" capacity="26" slotsperrow="6" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
       <Containable identifiers="smallitem,magazine" />
     </ItemContainer>
   </Item>
@@ -91,7 +91,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="10,-70" handle1="-40,8" handle2="40,8" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="12" slotsperrow="5" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" capacity="26" slotsperrow="6" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
       <Containable identifiers="smallitem,magazine" />
     </ItemContainer>
   </Item>
@@ -106,7 +106,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="10,-70" handle1="-40,8" handle2="40,8" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="12" slotsperrow="5" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" capacity="26" slotsperrow="6" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
       <Containable identifiers="smallitem,magazine" />
     </ItemContainer>
   </Item>
@@ -121,7 +121,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="10,-70" handle1="-40,8" handle2="40,8" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="6" slotsperrow="2" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" capacity="13" slotsperrow="4" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
       <Containable identifiers="smallitem,ek_ammobox_shotgun" />
     </ItemContainer>
   </Item>
@@ -136,7 +136,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="10,-50" handle1="-45,-30" handle2="45,30" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="12" slotsperrow="2" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" capacity="26" slotsperrow="6" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
       <Containable identifiers="smallitem,ek_microtorpedo" />
     </ItemContainer>
   </Item>
@@ -151,7 +151,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="10,-70" handle1="-16,20" handle2="16,20" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.85" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="6" slotsperrow="3" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" capacity="13" slotsperrow="4" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
       <Containable identifiers="smallitem,magazine,round,shell,ek_microtorpedo,ek_ammobox_shotgun" />
     </ItemContainer>
   </Item>
@@ -159,13 +159,13 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="200" />
     <Price storeidentifier="merchantCity" buyprice="280" />
     <Price storeidentifier="merchantOutpost" buyprice="320" />-->
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.6" />
     <Price baseprice="480" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -178,11 +178,11 @@
         <SpawnItem identifiers="ek_shotgun_shell" spawnposition="Inventory" />
       </StatusEffect> 
     </Holdable> -->
-    <ItemContainer autofill="False" capacity="12" maxstacksize="1" slotsperrow="4" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="26" maxstacksize="2" slotsperrow="6" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="shell,shotgunammo" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="1" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="4" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="1" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-60.0" delay="0.01" stackable="false">
         <Conditional Condition="gt 41" />
@@ -207,11 +207,11 @@
     <Price storeidentifier="merchantCity" buyprice="200" />
     <Price storeidentifier="merchantOutpost" buyprice="240" />-->
     <Price baseprice="360" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -220,11 +220,11 @@
     <Sprite texture="containers_ek.png" depth="0.54" sourcerect="80,528,80,48" origin="0.5,0.5" />
     <Body width="64" height="48" density="15" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="0,-20" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" capacity="12" maxstacksize="1" slotsperrow="4" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="26" maxstacksize="2" slotsperrow="6" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="shell,shotgunammo" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="1" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="4" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="1" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-60.0" delay="0.01" stackable="false">
         <Conditional Condition="gt 41" />
@@ -248,13 +248,13 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="240" />
     <Price storeidentifier="merchantCity" buyprice="320" />
     <Price storeidentifier="merchantOutpost" buyprice="450" />-->
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
     <Price baseprice="720" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -263,11 +263,11 @@
     <Sprite texture="containers_ek.png" depth="0.54" sourcerect="0,576,80,48" origin="0.5,0.5" />
     <Body width="64" height="48" density="15" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="0,-20" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" capacity="12" maxstacksize="1" slotsperrow="4" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="26" maxstacksize="2" slotsperrow="6" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="shell,shotgunammo" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="1" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="4" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="1" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-60.0" delay="0.01" stackable="false">
         <Conditional Condition="gt 41" />
@@ -291,13 +291,13 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="240" />
     <Price storeidentifier="merchantCity" buyprice="320" />
     <Price storeidentifier="merchantOutpost" buyprice="450" />-->
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
     <Price baseprice="600" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -306,11 +306,11 @@
     <Sprite texture="containers_ek.png" depth="0.54" sourcerect="240,576,80,48" origin="0.5,0.5" />
     <Body width="64" height="48" density="15" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="0,-20" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" capacity="12" maxstacksize="1" slotsperrow="4" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="26" maxstacksize="2" slotsperrow="6" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="shell,shotgunammo" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="1" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="4" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="1" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-60.0" delay="0.01" stackable="false">
         <Conditional Condition="gt 41" />
@@ -334,13 +334,13 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="260" />
     <Price storeidentifier="merchantCity" buyprice="350" />
     <Price storeidentifier="merchantOutpost" buyprice="480" />-->
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
     <Price baseprice="540" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -349,11 +349,11 @@
     <Sprite texture="containers_ek.png" depth="0.54" sourcerect="160,576,80,48" origin="0.5,0.5" />
     <Body width="64" height="48" density="15" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="0,-20" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" capacity="12" maxstacksize="1" slotsperrow="4" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="26" maxstacksize="2" slotsperrow="6" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="shell,shotgunammo" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="1" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="4" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="1" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-60.0" delay="0.01" stackable="false">
         <Conditional Condition="gt 41" />
@@ -376,11 +376,11 @@
   <Item name="" identifier="ek_ammobox_shotgun_grenade" category="Equipment,Weapon" aliases="shotgun grenades,shotgun grenade box" tags="mediumitem,ek_ammobox_shotgun,ammobox" cargocontaineridentifier="ek_ammocrate_shotgun" scale="0.4" pickdistance="150" impactsoundtag="impact_metal_light" HideConditionBar="true">
     <!--<Price storeidentifier="merchantMilitary" buyprice="750" />-->
     <Price baseprice="780" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -389,11 +389,11 @@
     <Sprite texture="containers_ek.png" depth="0.54" sourcerect="80,576,80,48" origin="0.5,0.5" />
     <Body width="64" height="48" density="15" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="0,-20" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" capacity="12" maxstacksize="1" slotsperrow="4" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="26" maxstacksize="2" slotsperrow="6" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="shell,shotgunammo" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="1" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="4" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="1" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-60.0" delay="0.01" stackable="false">
         <Conditional Condition="gt 41" />
@@ -416,11 +416,11 @@
   <Item name="" identifier="ek_ammobox_shotgun_physicorium" category="Equipment,Weapon" aliases="shotgun alien slug box, shotgun alien box" tags="mediumitem,ek_ammobox_shotgun,ammobox" cargocontaineridentifier="ek_ammocrate_physicorium" scale="0.4" pickdistance="150" impactsoundtag="impact_metal_light" HideConditionBar="true">
     <!--<Price storeidentifier="merchantResearch" buyprice="550" />-->
     <Price baseprice="840" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.7" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.1" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -429,11 +429,11 @@
     <Sprite texture="containers_ek.png" depth="0.54" sourcerect="160,528,80,48" origin="0.5,0.5" />
     <Body width="64" height="48" density="15" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="0,-20" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" capacity="12" maxstacksize="1" slotsperrow="4" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="26" maxstacksize="2" slotsperrow="6" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="shell,shotgunammo" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="1" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="4" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="1" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-60.0" delay="0.01" stackable="false">
         <Conditional Condition="gt 41" />
@@ -453,19 +453,19 @@
       <!-- Break the item, to prevent it from being sellable -->
     </LightComponent>
   </Item>
-  <Item name="" identifier="ek_weaponparts" category="Material" aliases="weapon_components,weapon parts,weapon_parts" tags="mediumitem,ek_fabricator_kit,crate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_heavy" maxstacksize="3">
+  <Item name="" identifier="ek_weaponparts" category="Material" aliases="weapon_components,weapon parts,weapon_parts" tags="mediumitem,ek_fabricator_kit,crate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_heavy" maxstacksize="6">
     <!--<Price storeidentifier="merchantMilitary" buyprice="400" />
     <Price storeidentifier="merchantCity" buyprice="550" />
     <Price storeidentifier="merchantOutpost" buyprice="650" />-->
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.2" />
     <Price baseprice="400" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="false" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="steel" mincondition="0.6" />
@@ -489,19 +489,19 @@
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
   </Item>
-  <Item name="Loading Kit" identifier="ek_loadingkit" category="Material" aliases="loading_kit,ammo kit,ammo_kit" tags="mediumitem,ek_fabricator_kit,crate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_heavy" maxstacksize="3">
+  <Item name="Loading Kit" identifier="ek_loadingkit" category="Material" aliases="loading_kit,ammo kit,ammo_kit" tags="mediumitem,ek_fabricator_kit,crate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_heavy" maxstacksize="6">
     <!--<Price storeidentifier="merchantMilitary" buyprice="150" />
     <Price storeidentifier="merchantCity" buyprice="175" />
     <Price storeidentifier="merchantOutpost" buyprice="200" />-->
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.2" />
     <Price baseprice="150" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="steel" mincondition="0.85" />
@@ -533,7 +533,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="55,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="10" slotsperrow="2" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" capacity="22" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
       <Containable identifiers="smallitem,mediumitem,ek_rocketammo" />
     </ItemContainer>
   </Item>
@@ -541,11 +541,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="25" />
     <Price storeidentifier="merchantCity" buyprice="35" />-->
     <Price baseprice="25" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -558,7 +558,7 @@
     <Sprite texture="containers_ek.png" depth="0.54" sourcerect="512,528,64,80" origin="0.5,0.5" />
     <Body width="48" height="78" density="15" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="0,-20" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" capacity="3" slotsperrow="3" maxstacksize="1" canbeselected="true" hideitems="false" itempos="2,23" iteminterval="0,-18" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" capacity="7" slotsperrow="3" maxstacksize="2" canbeselected="true" hideitems="false" itempos="2,23" iteminterval="0,-18" keepopenwhenequipped="true" movableframe="true">
       <Containable identifier="handcuffs" />
     </ItemContainer>
   </Item>
@@ -590,7 +590,7 @@
       <GuiFrame relativesize="0.4,0.45" style="ItemUI" anchor="Center" />
       <sound file="Content/Sounds/RepairLoop.ogg" type="OnActive" range="1000.0" volume="0.7" loop="true"/>     
     </Fabricator>
-    <ItemContainer autofill="False" capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="" allowuioverlap="true"/>
+    <ItemContainer autofill="False" capacity="11" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="" allowuioverlap="true"/>
     <ItemContainer autofill="False" capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true"/>
 
   </Item>
@@ -604,7 +604,7 @@
     <Sprite texture="Mods/EK Armory/Items/Materials/materials_ek.png" depth="0.54" sourcerect="192,64,128,64" />
     <Body width="120" height="60" density="25" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="-5,25" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" capacity="4" canbeselected="true" hideitems="true" slotsperrow="2" uilabel="Gauss Coil Crate" allowuioverlap="true" keepopenwhenequipped="true" movableframe="true"/>
+    <ItemContainer autofill="False" capacity="9" canbeselected="true" hideitems="true" slotsperrow="3" uilabel="Gauss Coil Crate" allowuioverlap="true" keepopenwhenequipped="true" movableframe="true"/>
   </Item>
 
 <Item name="Laser Diode Crate" identifier="ek_laserpartscrate" aliases="laser diode box" tags="mediumitem,ek_fabricator_kit,crate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_heavy"
@@ -616,7 +616,7 @@
     <Sprite texture="Mods/EK Armory/Items/Materials/materials_ek.png" depth="0.54" sourcerect="192,128,128,64" />
     <Body width="120" height="60" density="25" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="-5,25" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" capacity="4" canbeselected="true" hideitems="true" slotsperrow="2" uilabel="Gauss Coil Crate" allowuioverlap="true" keepopenwhenequipped="true" movableframe="true"/>
+    <ItemContainer autofill="False" capacity="9" canbeselected="true" hideitems="true" slotsperrow="3" uilabel="Gauss Coil Crate" allowuioverlap="true" keepopenwhenequipped="true" movableframe="true"/>
   </Item>-->
   <!--
   <Item name="EK Debug Shotgun Ammo Box" identifier="ek_ammobox_shotgun_debugger" category="Equipment" tags="mediumitem,ek_ammobox_shotgun,ammobox" 
@@ -637,11 +637,11 @@
 		</Button>
 	  </CustomInterface>
 	</Holdable>
-    <ItemContainer autofill="False" capacity="12" maxstacksize="1" slotsperrow="4" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="26" maxstacksize="2" slotsperrow="6" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="shell,shotgunammo" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="1" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="4" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="1" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-5.0" delay="0.01" stackable="false" >
         <Conditional Condition="gt 41" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Jobgear/ek_divinggear.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Jobgear/ek_divinggear.xml
index a1f4e5e7..eafd380a 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Jobgear/ek_divinggear.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Jobgear/ek_divinggear.xml	
@@ -54,11 +54,11 @@
 	20
 	-->
     <Price baseprice="450" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="0.7" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="titaniumaluminiumalloy" />
@@ -95,7 +95,7 @@
     <Holdable slots="RightHand+LeftHand" msg="ItemMsgPickUpUse" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect">
       <sprite texture="%ModDir%/Items/Jobgear/ek_divinggear.png" limb="Head" inheritlimbdepth="true" hidelimb="true" hideotherwearables="true" inheritorigin="false" inherittexturescale="false" sourcerect="256,0,96,96" origin="0.5,0.55" scale="0.4">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true" comparison="Or">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -103,14 +103,14 @@
         </LightComponent>
       </sprite>
       <sprite texture="%ModDir%/Items/Jobgear/armored_diving_suit.png" limb="Torso" inheritlimbdepth="true" hidelimb="true" hideotherwearables="false" inheritorigin="false" inherittexturescale="false" sourcerect="0,0,128,256" scale="0.4">
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="400.0" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="1600" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
           <LightTexture texture="%ModDir%/Lights/pointlight_bright.png" origin="0.5, 0.56" size="1.0,1.0" />
         </LightComponent>
         <!--
-		<LightComponent canbeselected="false" AllowInGameEditing="false" range="100.0" lightcolor="250,50,40,100" powerconsumption="0" pulsefrequency="0.3" pulseamount="0.8" IsOn="true">
+		<LightComponent canbeselected="false" AllowInGameEditing="false" range="400" lightcolor="250,50,40,100" powerconsumption="0" pulsefrequency="0.3" pulseamount="0.8" IsOn="true">
 		  <Conditional type="Character" Health="lt 0.05" />
           <LightTexture texture="Mods/EK Armory/Lights/pointlight_bright.png" origin="0.5, 0.56" size="1.0,1.0" />
         </LightComponent>
@@ -191,7 +191,7 @@
       <damagemodifier armorsector="0.0,360.0" afflictiontypes="concussion" damagemultiplier="0.0" damagesound="" deflectprojectiles="true" />
       <StatValue stattype="FlowResistance" value="0.9" />
     </Wearable>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       <StatusEffect type="OnWearing" target="Contained">
@@ -222,11 +222,11 @@
 	20
 	-->
     <Price baseprice="450" soldeverywhere="false" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.7" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="titaniumaluminiumalloy" />
@@ -256,7 +256,7 @@
     <Holdable slots="RightHand+LeftHand" msg="ItemMsgPickUpUse" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect">
       <sprite texture="%ModDir%/Items/Jobgear/armored_diving_suit_paintbandit.png" limb="Head" inheritlimbdepth="true" hidelimb="true" hideotherwearables="true" inheritorigin="false" inherittexturescale="false" sourcerect="304,16,96,96" origin="0.5,0.5" scale="0.4">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true" comparison="Or">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -264,7 +264,7 @@
         </LightComponent>
       </sprite>
       <sprite texture="%ModDir%/Items/Jobgear/armored_diving_suit_paintbandit.png" limb="Torso" inheritlimbdepth="true" hidelimb="true" hideotherwearables="false" inherittexturescale="false" inheritorigin="false" sourcerect="0,0,128,256" scale="0.4">
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="400.0" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="1600" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -370,7 +370,7 @@
       <damagemodifier armorsector="0.0,360.0" afflictiontypes="concussion" damagemultiplier="0.0" damagesound="" deflectprojectiles="true" />
       <StatValue stattype="FlowResistance" value="0.9" />
     </Wearable>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       <StatusEffect type="OnWearing" target="Contained">
@@ -401,11 +401,11 @@
 	20
 	-->
     <Price baseprice="450" soldeverywhere="false" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.7" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="titaniumaluminiumalloy" />
@@ -435,7 +435,7 @@
     <Holdable slots="RightHand+LeftHand" msg="ItemMsgPickUpUse" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect">
       <sprite texture="%ModDir%/Items/Jobgear/armored_diving_suit_paintmercenary.png" limb="Head" inheritlimbdepth="true" hidelimb="true" hideotherwearables="true" inheritorigin="false" inherittexturescale="false" sourcerect="304,16,96,96" origin="0.5,0.5" scale="0.4">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true" comparison="Or">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -443,7 +443,7 @@
         </LightComponent>
       </sprite>
       <sprite texture="%ModDir%/Items/Jobgear/armored_diving_suit_paintmercenary.png" limb="Torso" inheritlimbdepth="true" hidelimb="true" hideotherwearables="false" inheritorigin="false" inherittexturescale="false" sourcerect="0,0,128,256" scale="0.4">
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="400.0" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="1600" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -549,7 +549,7 @@
       <damagemodifier armorsector="0.0,360.0" afflictiontypes="concussion" damagemultiplier="0.0" damagesound="" deflectprojectiles="true" />
       <StatValue stattype="FlowResistance" value="0.9" />
     </Wearable>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       <StatusEffect type="OnWearing" target="Contained">
@@ -581,11 +581,11 @@
 	80
 	-->
     <Price baseprice="800" minleveldifficulty="33">
-      <Price storeidentifier="merchantoutpost" multiplier="0.7" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="ek_armored_hardsuit" />
@@ -624,7 +624,7 @@
     <Holdable slots="RightHand+LeftHand" msg="ItemMsgPickUpUse" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect">
       <sprite texture="%ModDir%/Items/Jobgear/armored_diving_suit_mk2.png" limb="Head" inheritlimbdepth="true" hidelimb="true" hideotherwearables="true" inheritorigin="false" inherittexturescale="false" sourcerect="296,8,112,120" origin="0.5,0.5" scale="0.4">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true" comparison="Or">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -632,7 +632,7 @@
         </LightComponent>
       </sprite>
       <sprite texture="%ModDir%/Items/Jobgear/armored_diving_suit_mk2.png" limb="Torso" inheritlimbdepth="true" hidelimb="true" hideotherwearables="false" inheritorigin="false" inherittexturescale="false" origin="0.51,0.46" sourcerect="0,0,144,256" scale="0.4">
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="400.0" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="1600" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -785,7 +785,7 @@
       </ItemComponent>
     </Wearable>
     <!--
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       <StatusEffect type="OnWearing" target="Contained">
@@ -804,10 +804,10 @@
       <Containable items="none" />
       <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="1,93,120,29" origin="0.5,0.45" />
       <SlotIcon slotindex="1" texture="Content/UI/ContainerIndicators.png" sourcerect="2,155,120,29" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="2">
         <Containable items="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="2">
         <Containable items="chem,medical" />
       </SubContainer>
     </ItemContainer>
@@ -818,11 +818,11 @@
 	"Heavy duty pressure suit with additional ballistic armor, provides substantial protection at the cost of mobility."
 	-->
     <Price baseprice="800" soldeverywhere="false" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.7" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="ek_armored_hardsuit" />
@@ -852,7 +852,7 @@
     <Holdable slots="RightHand+LeftHand" msg="ItemMsgPickUpUse" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect">
       <sprite texture="%ModDir%/Items/Jobgear/armored_diving_suit_mk2_paintbandit.png" limb="Head" inheritlimbdepth="true" hidelimb="true" hideotherwearables="true" inheritorigin="false" inherittexturescale="false" sourcerect="296,8,112,120" origin="0.5,0.5" scale="0.4">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true" comparison="Or">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -860,7 +860,7 @@
         </LightComponent>
       </sprite>
       <sprite texture="%ModDir%/Items/Jobgear/armored_diving_suit_mk2_paintbandit.png" limb="Torso" inheritlimbdepth="true" hidelimb="true" hideotherwearables="false" inheritorigin="false" inherittexturescale="false" origin="0.51,0.46" sourcerect="0,0,144,256" scale="0.4">
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="400.0" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="1600" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -1013,7 +1013,7 @@
       </ItemComponent>
     </Wearable>
     <!--
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       <StatusEffect type="OnWearing" target="Contained">
@@ -1032,10 +1032,10 @@
       <Containable items="none" />
       <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="1,93,120,29" origin="0.5,0.45" />
       <SlotIcon slotindex="1" texture="Content/UI/ContainerIndicators.png" sourcerect="2,155,120,29" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="2">
         <Containable items="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="2">
         <Containable items="chem,medical" />
       </SubContainer>
     </ItemContainer>
@@ -1046,11 +1046,11 @@
 	"Heavy duty pressure suit with additional ballistic armor, provides substantial protection at the cost of mobility."
 	-->
     <Price baseprice="800" soldeverywhere="false" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.7" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="ek_armored_hardsuit" />
@@ -1080,7 +1080,7 @@
     <Holdable slots="RightHand+LeftHand" msg="ItemMsgPickUpUse" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect">
       <sprite texture="%ModDir%/Items/Jobgear/armored_diving_suit_mk2_paintmercenary.png" limb="Head" inheritlimbdepth="true" hidelimb="true" hideotherwearables="true" inheritorigin="false" inherittexturescale="false" sourcerect="296,8,112,120" origin="0.5,0.5" scale="0.4">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true" comparison="Or">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -1088,7 +1088,7 @@
         </LightComponent>
       </sprite>
       <sprite texture="%ModDir%/Items/Jobgear/armored_diving_suit_mk2_paintmercenary.png" limb="Torso" inheritlimbdepth="true" hidelimb="true" hideotherwearables="false" inheritorigin="false" inherittexturescale="false" origin="0.51,0.46" sourcerect="0,0,144,256" scale="0.4">
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="400.0" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="1600" lightcolor="250,224,165,40" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -1242,7 +1242,7 @@
       </ItemComponent>
     </Wearable>
     <!--
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       <StatusEffect type="OnWearing" target="Contained">
@@ -1261,10 +1261,10 @@
       <Containable items="none" />
       <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="1,93,120,29" origin="0.5,0.45" />
       <SlotIcon slotindex="1" texture="Content/UI/ContainerIndicators.png" sourcerect="2,155,120,29" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="2">
         <Containable items="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="2">
         <Containable items="chem,medical" />
       </SubContainer>
     </ItemContainer>
@@ -1274,11 +1274,11 @@
   description="Experimental wetsuit fabricated from shearclaw scale with unparalleled underwater mobility. Internal armor weave provides a light amount of puncture and burn resistance. [ Rated 4000m ]" scale="0.5" impactsoundtag="impact_soft">
 	
     <Price baseprice="350" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-	  <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+	  <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
 	
     <Deconstruct time="40">
@@ -1354,11 +1354,11 @@
   <Item name="" identifier="ek_shearclaw_outfit" category="Equipment,Diving" tags="smallitem,provocative,diving" fireproof="true" cargocontaineridentifier="metalcrate" hideinmenus="false" HideConditionBar="true" scale="0.5" impactsoundtag="impact_soft">
     <!--<Price storeidentifier="merchantResearch" buyprice="350" />-->
     <Price baseprice="350" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="40">
       <Item identifier="ballisticfiber" />
@@ -1408,11 +1408,11 @@
   <Item name="" identifier="ek_shearclaw_helmet" scale="0.5" category="Equipment,Diving" Tags="smallitem,provocative,diving" cargocontaineridentifier="metalcrate" hideinmenus="false" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantResearch" buyprice="125" />-->
     <Price baseprice="125" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -1431,13 +1431,13 @@
     <Body width="40" height="40" density="15" />
     <Wearable limbtype="Head" slots="Any,Head" msg="ItemMsgPickUpSelect">
       <sprite texture="%ModDir%/Items/Jobgear/armor_helmets.png" limb="Head" inheritlimbdepth="true" hidelimb="true" hideotherwearables="true" inherittexturescale="false" inheritorigin="false" sourcerect="96,88,96,88" origin="0.55,0.55" scale="0.37">
-        <!-- <LightComponent range="50.0" lightcolor="235,255,47,255" IsOn="true">
+        <!-- <LightComponent range="200" lightcolor="235,255,47,255" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" setvalue="true" comparison="Or">
             <Conditional IsDead="false" />
           </StatusEffect>
           <LightTexture texture="Mods/EK Armory/Lights/shearclaw_helmet_light.png" origin="0.5, 0.5" size="0.5,0.5" />
         </LightComponent> -->
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="200.0" lightcolor="200,255,95,150" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="800" lightcolor="200,255,95,150" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -1445,7 +1445,7 @@
         </LightComponent>
       </sprite>
       <sprite texture="%ModDir%/Items/Jobgear/ek_armor_clothes.png" limb="Torso" inheritlimbdepth="true" hidelimb="false" hideotherwearables="false" inherittexturescale="false" inheritorigin="false" sourcerect="0,0,1,1">
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="400.0" lightcolor="200,255,95,40" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="1600" lightcolor="200,255,95,40" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -1470,7 +1470,7 @@
       <damagemodifier armorsector="0.0,360.0" afflictiontypes="concussion" damagemultiplier="0.0" damagesound="" deflectprojectiles="true" />
       <StatusEffect type="OnWearing" target="Character" HideFace="true" LowPassMultiplier="0.5" setvalue="true" disabledeltatime="true" /> "
       <StatusEffect type="OnWearing" target="Character"><Affliction identifier="ek_pressure_threshold_4000" strength="100" /></StatusEffect><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" Condition="-0.5" comparison="And"><Conditional IsDead="false" /><Conditional HullOxygenPercentage="lt 50" /><Conditional InWater="false" /><RequiredItem identifier="oxygentank" type="Contained" /></StatusEffect><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" Condition="-0.5" comparison="And"><Conditional IsDead="false" /><Conditional InWater="true" /><RequiredItem identifier="oxygentank" type="Contained" /></StatusEffect><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="-100.0" Oxygen="-20.0" Condition="-0.37"><Conditional IsDead="false" /><RequiredItem identifier="weldingfueltank" type="Contained" /></StatusEffect><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="-100.0" Oxygen="-20.0" Condition="-0.37"><RequiredItem identifier="incendiumfueltank" type="Contained" /><Affliction identifier="burn" amount="0.1" /></StatusEffect><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" Condition="-0.22" comparison="And"><Conditional IsDead="false" /><Conditional HullOxygenPercentage="lt 50" /><Conditional InWater="false" /><RequiredItem identifier="oxygeniteshard" type="Contained" /></StatusEffect><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" Condition="-0.22" comparison="And"><Conditional IsDead="false" /><Conditional InWater="true" /><RequiredItem identifier="oxygeniteshard" type="Contained" /></StatusEffect><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" Condition="-0.07" comparison="And"><Conditional IsDead="false" /><Conditional HullOxygenPercentage="lt 50" /><Conditional InWater="false" /><RequiredItem identifier="oxygenitetank" type="Contained" /></StatusEffect><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" Condition="-0.07" comparison="And"><Conditional IsDead="false" /><Conditional InWater="true" /><RequiredItem identifier="oxygenitetank" type="Contained" /></StatusEffect><!-- We get to define item-side effects for once so might aswell make use of it --><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" Condition="-0.1" comparison="And"><Conditional IsDead="false" /><Conditional HullOxygenPercentage="lt 50" /><Conditional InWater="false" /><RequiredItem identifier="tag_oxygencell1" type="Contained" /></StatusEffect><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" Condition="-0.1" comparison="And"><Conditional IsDead="false" /><Conditional InWater="true" /><RequiredItem identifier="tag_oxygencell1" type="Contained" /></StatusEffect><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" Condition="-0.07" comparison="And"><Conditional IsDead="false" /><Conditional HullOxygenPercentage="lt 50" /><Conditional InWater="false" /><RequiredItem identifier="tag_oxygencell2" type="Contained" /></StatusEffect><StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" Condition="-0.07" comparison="And"><Conditional IsDead="false" /><Conditional InWater="true" /><RequiredItem identifier="tag_oxygencell2" type="Contained" /></StatusEffect><StatusEffect type="OnWearing" target="Character" OxygenAvailable="0.0" UseHullOxygen="true" /></Wearable>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       <StatusEffect type="OnWearing" target="Contained">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Jobgear/ek_jobgear.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Jobgear/ek_jobgear.xml
index 799e8cbe..83c6f230 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Jobgear/ek_jobgear.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Jobgear/ek_jobgear.xml	
@@ -3,11 +3,11 @@
   <Item name="" identifier="ek_marine_armor" category="Equipment" tags="smallitem" fireproof="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_soft">
     <Price baseprice="350" soldeverywhere="false">
       <!--minleveldifficulty="25"-->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -44,20 +44,20 @@
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.88" />
       <StatValue stattype="RangedAttackSpeed" value="0.15" />
     </Wearable>
-    <!--<Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-	<ItemContainer capacity="4" slotsperrow="4" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem,weapon" excludeditems="toolbox" />
+    <!--<Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+	<ItemContainer capacity="9" slotsperrow="3" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,weapon,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
 	-->
   </Item>
   <Item name="" identifier="ek_marine_armor_uniform" category="Equipment" tags="smallitem,uniform,toolbelt,toolbox,cargoscooter,mobilecontainer" fireproof="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <Price baseprice="180" soldeverywhere="false">
       <!--minleveldifficulty="25"-->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -86,18 +86,18 @@
       <SkillModifier skillidentifier="helm" skillvalue="10" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.88" />
     </Wearable>
-    <ItemContainer capacity="8" slotsperrow="4" keepopenwhenequipped="false" movableframe="true">
-      <Containable items="smallitem" excludeditems="toolbelt,bandolier,toolbox,metalcrate,mobilecontainer,rucksack,backpack,waistbelt" />
+    <ItemContainer capacity="18" slotsperrow="5" keepopenwhenequipped="false" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ek_marine_helmet" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_heavy">
     <Price baseprice="200" soldeverywhere="false">
       <!--minleveldifficulty="25"-->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -121,11 +121,11 @@
   <Item name="" identifier="ek_renegade_armor" category="Equipment" tags="smallitem" fireproof="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_soft">
     <Price baseprice="350" soldeverywhere="false">
       <!--minleveldifficulty="25"-->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -163,19 +163,19 @@
       <StatValue stattype="RangedAttackSpeed" value="0.1" />
     </Wearable>
     <!--
-	<ItemContainer capacity="4" slotsperrow="4" keepopenwhenequipped="false" movableframe="true">
-      <Containable items="smallitem,weapon" excludeditems="toolbox" />
+	<ItemContainer capacity="9" slotsperrow="3" keepopenwhenequipped="false" movableframe="true">
+      <Containable items="smallitem,weapon,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
 	-->
   </Item>
   <Item name="" identifier="ek_renegade_armor_uniform" category="Equipment" tags="smallitem,uniform,toolbelt,toolbox,cargoscooter,mobilecontainer" fireproof="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <Price baseprice="180" soldeverywhere="false">
       <!--minleveldifficulty="25"-->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -205,8 +205,8 @@
       <SkillModifier skillidentifier="electrical" skillvalue="10" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.88" />
     </Wearable>
-    <ItemContainer capacity="8" slotsperrow="4" keepopenwhenequipped="false" movableframe="true">
-      <Containable items="smallitem" excludeditems="toolbelt,bandolier,toolbox,cargoscooter,mobilecontainer,rucksack,backpack,waistbelt" />
+    <ItemContainer capacity="18" slotsperrow="5" keepopenwhenequipped="false" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ek_renegade_helmet" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_heavy">
@@ -214,11 +214,11 @@
     <!--<Price storeidentifier="merchantCity" buyprice="300" />-->
     <Price baseprice="200" soldeverywhere="false">
       <!--minleveldifficulty="25"-->
-      <Price storeidentifier="merchantoutpost" multiplier="1.35" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.05" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -248,11 +248,11 @@
     <!--<Price storeidentifier="merchantCity" buyprice="500" />-->
     <Price baseprice="400" soldeverywhere="false">
       <!--minleveldifficulty="25"-->
-      <Price storeidentifier="merchantoutpost" multiplier="1.35" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.05" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="40">
       <Item identifier="ballisticfiber" />
@@ -293,11 +293,11 @@
   <Item name="" identifier="ek_merc_armor_uniform" category="Equipment" tags="smallitem,uniform,toolbelt,toolbox,cargoscooter,mobilecontainer" fireproof="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <Price baseprice="180" soldeverywhere="false">
       <!--minleveldifficulty="25"-->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -329,8 +329,8 @@
       <SkillModifier skillidentifier="mechanical" skillvalue="10" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.88" />
     </Wearable>
-    <ItemContainer capacity="8" slotsperrow="4" keepopenwhenequipped="false" movableframe="true">
-      <Containable items="smallitem" excludeditems="toolbelt,bandolier,toolbox,cargoscooter,mobilecontainer,rucksack,backpack,waistbelt" />
+    <ItemContainer capacity="18" slotsperrow="5" keepopenwhenequipped="false" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <!--
@@ -357,11 +357,11 @@
     <!--<Price storeidentifier="merchantCity" buyprice="300" />-->
     <Price baseprice="200" soldeverywhere="false">
       <!--minleveldifficulty="25"-->
-      <Price storeidentifier="merchantoutpost" multiplier="1.35" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.05" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -389,11 +389,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="250" />
     <Price storeidentifier="merchantCity" buyprice="300" />-->
     <Price baseprice="250" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.35" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.05" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="40">
       <Item identifier="ballisticfiber" />
@@ -450,11 +450,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="140" />
     <Price storeidentifier="merchantCity" buyprice="205" />-->
     <Price baseprice="150" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.35" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.05" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -541,7 +541,7 @@
       <SkillModifier skillidentifier="weapons" skillvalue="-5" />
       <SkillModifier skillidentifier="helm" skillvalue="-5" />
     </Wearable>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
     </ItemContainer>
@@ -550,11 +550,11 @@
     <!--<Price storeidentifier="merchantOutpost" buyprice="550" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="500" />-->
     <Price baseprice="500" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.7" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.1" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="ballisticfiber" />
@@ -605,20 +605,20 @@
       <SkillModifier skillidentifier="electrical" skillvalue="10" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.85" />
     </Wearable>
-    <ItemContainer capacity="4" slotsperrow="2" keepopenwhenequipped="false" movableframe="true">
-      <Containable items="smallitem" excludeditems="toolbelt,bandolier,toolbox,uniform,mobilecontainer,rucksack,backpack,waistbelt" />
+    <ItemContainer capacity="9" slotsperrow="3" keepopenwhenequipped="false" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ek_security_radio" scale="0.35" category="Equipment" tags="smallitem,headset" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
-    <!--<PreferredContainer primary="divingcab,crewcab" minamount="0" maxamount="2" spawnprobability="0.75"/>
+    <!--<PreferredContainer primary="divingcab,crewcab" minamount="0" maxamount="4" spawnprobability="1"/>
     <PreferredContainer primary="storagecab"/>-->
     <Price baseprice="200">
       <!--minleveldifficulty="25"-->
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="3" />
     </Price>
     <InventoryIcon texture="ek_jobgear.png" sourcerect="0,0,64,64" origin="0.5,0.5" />
     <Sprite texture="ek_jobgear.png" depth="0.6" sourcerect="0,64,48,96" origin="0.5,0.5" />
@@ -639,9 +639,9 @@
 	  -->
     </WifiComponent>
     <!--
-	<ItemContainer capacity="1" maxstacksize="1" hideitems="true">
+	<ItemContainer capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
-      <Containable items="mobilebattery" />
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
 	-->
     <Wearable limbtype="Head" slots="Any,Headset" msg="ItemMsgPickUpSelect" displaycontainedstatus="true">
@@ -667,15 +667,15 @@
   </Item>
   <Item name="" identifier="ek_ammobandolier" scale="0.366" category="Equipment" tags="mediumitem,toolbelt,toolbox,cargoscooter,mobilecontainer" aliases="ek_ammobandoiler,bandoiler" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="armcab" />
-    <PreferredContainer primary="armcab" minamount="0" maxamount="1" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.06" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.06" />
+    <PreferredContainer primary="armcab" minamount="0" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="4" spawnprobability="0.12" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.12" />
     <Price baseprice="60">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="8" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="24" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -690,8 +690,8 @@
     <InventoryIcon texture="%ModDir%/Items/Jobgear/ek_armor_accessories.png" sourcerect="0,0,64,64" origin="0.5,0.5" />
     <Sprite texture="%ModDir%/Items/Jobgear/ek_armor_accessories.png" depth="0.6" sourcerect="0,272,96,48" origin="0.5,0.5" />
     <Body width="80" height="40" density="12" />
-    <ItemContainer capacity="9" depth="0.5">
-      <Containable items="smallitem,smallarmsammo,ek_microtorpedo,ek_rocketammo" excludeditems="toolbelt,bandolier,toolbox,uniform,mobilecontainer,rucksack,backpack,waistbelt" />
+    <ItemContainer capacity="20" depth="0.5">
+      <Containable items="smallitem,smallarmsammo,ek_microtorpedo,ek_rocketammo,ammobox,deepdiving,mediumitem,largeitem" />
       <!-- ammo,round,smallarmsammo,magazine,shotgunammo,shotgunshell,ek_microtorpedo,ek_rocketammo -->
     </ItemContainer>
     <Holdable slots="RightHand+LeftHand" holdpos="0,-70" handle1="-5,0" handle2="10,-20" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Select" allowswappingwhenpicked="false" />
@@ -702,16 +702,16 @@
   </Item>
   <Item name="" identifier="ek_tacticalbackpack" scale="0.32" category="Equipment" tags="smallitem,toolbelt,toolbox,mobilecontainer" waterproof="true" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="armcab" />
-    <PreferredContainer primary="armcab" minamount="0" maxamount="1" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.06" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.06" />
+    <PreferredContainer primary="armcab" minamount="0" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="4" spawnprobability="0.12" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.12" />
     <Price baseprice="90" soldeverywhere="false">
       <!--minleveldifficulty="25"-->
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="6" />
     </Price>
     <InventoryIcon texture="%ModDir%/Items/Jobgear/ek_armor_accessories.png" sourcerect="64,0,64,64" origin="0.5,0.5" />
     <Sprite texture="%ModDir%/Items/Jobgear/ek_armor_accessories.png" depth="0.6" sourcerect="128,128,160,176" origin="0.5,0.5" />
@@ -729,8 +729,8 @@
       <RequiredItem identifier="plastic" />
       <RequiredItem identifier="organicfiber" />
     </Fabricate>
-    <ItemContainer capacity="20" depth="0.5">
-      <Containable items="smallitem,smallarmsammo,ek_microtorpedo,ek_rocketammo,explosive" excludeditems="toolbelt,bandolier,toolbox,cargoscooter,mobilecontainer,rucksack,backpack,waistbelt" />
+    <ItemContainer capacity="44" depth="0.5">
+      <Containable items="smallitem,smallarmsammo,ek_microtorpedo,ek_rocketammo,explosive,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Holdable slots="RightHand+LeftHand" holdpos="0,-70" handle1="-5,0" handle2="10,-20" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Select" allowswappingwhenpicked="false" />
     <Wearable limbtype="Torso" slots="Bag" msg="ItemMsgEquipSelect" canbeselected="false" canbepicked="true" pickkey="Select" displaycontainedstatus="true">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Materials/ek_materials.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Materials/ek_materials.xml
index 9eb13f6b..cad9907a 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Materials/ek_materials.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Materials/ek_materials.xml	
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="ek_weapontritium" category="Material" tags="mediumitem,ek_fabricator_parts" cargocontaineridentifier="metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_weapontritium" category="Material" tags="mediumitem,ek_fabricator_parts" cargocontaineridentifier="metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
     <!--<Price storeidentifier="merchantResearch" buyprice="450" />-->
     <Price baseprice="450">
-      <Price storeidentifier="merchantoutpost" multiplier="0.6" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.0" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.0" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="1.8" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="30" />
     <Fabricate suitablefabricators="fabricator" requiredtime="120" outcondition="0.25">
@@ -21,14 +21,14 @@
     <Body width="50" height="79" density="13" />
     <Holdable slots="Any,RightHand,LeftHand" controlpose="false" holdangle="-50" holdpos="-15,-60" handle1="-20,-10" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" removeOnCombined="true" />
   </Item>
-  <Item name="" identifier="ek_gaussparts" category="Material" tags="mediumitem,ek_fabricator_parts,crate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_gaussparts" category="Material" tags="mediumitem,ek_fabricator_parts,crate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
     <!--<Price storeidentifier="merchantResearch" buyprice="500" />-->
     <Price baseprice="500">
-      <Price storeidentifier="merchantoutpost" multiplier="0.6" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.0" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="1.8" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="plastic" mincondition="0.25" />
@@ -61,14 +61,14 @@
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
   </Item>
-  <Item name="" identifier="ek_laserparts" category="Material" tags="mediumitem,ek_fabricator_parts,crate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_laserparts" category="Material" tags="mediumitem,ek_fabricator_parts,crate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
     <!--<Price storeidentifier="merchantResearch" buyprice="450" />-->
     <Price baseprice="450">
-      <Price storeidentifier="merchantoutpost" multiplier="0.6" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.0" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="1.8" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" outcondition="0.5" mincondition="0.24" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_attachments.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_attachments.xml
index 29545305..a3efacd5 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_attachments.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_attachments.xml	
@@ -3,11 +3,11 @@
   <Item name="" identifier="ek_suppressor" aliases="suppressor,silencer,ekcompatibility_suppressor" category="Equipment" Tags="smallitem,ekcompatibility_suppressor" canbepicked="true" cargocontaineridentifier="ek_weapons_case" scale="0.32" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantMilitary" buyprice="80" />-->
     <Price baseprice="80" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="10">
       <RequiredItem identifier="steel" />
@@ -25,11 +25,11 @@
   </Item>
   <Item name="" identifier="ek_lightattachment" aliases="taclight,light attachment,flashlight attachment,ekcompatibility_taclight" category="Equipment" Tags="smallitem,ekcompatibility_taclight" canbepicked="true" cargocontaineridentifier="ek_weapons_case" scale="0.32" impactsoundtag="impact_metal_light">
     <Price baseprice="120" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="15">
       <RequiredItem identifier="aluminium" />
@@ -46,11 +46,11 @@
   <Item name="" identifier="ek_laserattachment" aliases="laser attachment, laser sight attachment,ekcompatibility_lasersight" category="Equipment" Tags="smallitem,ekcompatibility_lasersight" canbepicked="true" cargocontaineridentifier="ek_weapons_case" scale="0.32" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantMilitary" buyprice="150" />-->
     <Price baseprice="150" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="15">
       <RequiredItem identifier="aluminium" />
@@ -70,11 +70,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="200" />
     <Price storeidentifier="merchantResearch" buyprice="180" />-->
     <Price baseprice="180" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="0" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="0" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="30">
       <RequiredSkill identifier="electrical" level="60" />
@@ -119,11 +119,11 @@
       <RequiredItems identifiers="revolverround,revolverammo,ek_piperound" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="45" />
     </RangedWeapon>
-    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="4" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="9" maxstacksize="2" hideitems="true">
       <Containable identifiers="revolverround,revolverammo,ek_piperound" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.003, 0.487" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -164,11 +164,11 @@
       <RequiredItems identifiers="revolverround,revolverammo,ek_piperound" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="45" />
     </RangedWeapon>
-    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="4" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="9" maxstacksize="2" hideitems="true">
       <Containable identifiers="revolverround,revolverammo,ek_piperound" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.002, 0.475" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -212,7 +212,7 @@
       <RequiredItems identifiers="revolverround,revolverammo,ek_piperound" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="45" />
     </RangedWeapon>
-    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="4" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="9" maxstacksize="2" hideitems="true">
       <Containable identifiers="revolverround,revolverammo,ek_piperound" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
     </ItemContainer>
@@ -249,11 +249,11 @@
       <RequiredItems identifiers="revolverround,revolverammo,ek_piperound" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="45" />
     </RangedWeapon>
-    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="4" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="9" maxstacksize="2" hideitems="true">
       <Containable identifiers="revolverround,revolverammo,ek_piperound" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.003, 0.487" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -296,11 +296,11 @@
       <RequiredItems identifiers="revolverround,revolverammo,ek_piperound" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="45" />
     </RangedWeapon>
-    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="4" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="9" maxstacksize="2" hideitems="true">
       <Containable identifiers="revolverround,revolverammo,ek_piperound" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.002, 0.475" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -345,7 +345,7 @@
       <RequiredItems identifier="ek_handgun_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-40,-20">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-40,-20">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_handgun_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -353,10 +353,10 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_handgun_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -401,7 +401,7 @@
       <RequiredItems identifier="ek_handgun_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-40,-20">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-40,-20">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_handgun_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -409,10 +409,10 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_handgun_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.001, 0.5" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -459,7 +459,7 @@
       <RequiredItems identifier="ek_handgun_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-40,-20">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-40,-20">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_handgun_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -467,7 +467,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_handgun_skin" />
     </ItemContainer>
     <Quality>
@@ -509,7 +509,7 @@
       <RequiredItems identifier="ek_handgun_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-40,-20">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-40,-20">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_handgun_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -517,10 +517,10 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_handgun_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -569,7 +569,7 @@
       <RequiredItems identifier="ek_handgun_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-40,-20">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-40,-20">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_handgun_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -577,10 +577,10 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_handgun_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.001, 0.5" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -625,7 +625,7 @@
       <RequiredItems identifier="ek_mini_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-20">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-20">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_mini_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -633,7 +633,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.001, 0.495" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -678,7 +678,7 @@
       <RequiredItems identifier="ek_mini_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-20">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-20">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_mini_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -686,7 +686,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.001, 0.495" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -731,7 +731,7 @@
       <RequiredItems identifier="ek_mini_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-20">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-20">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_mini_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -776,7 +776,7 @@
       <RequiredItems identifier="ek_mini_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-20">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-20">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_mini_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -784,7 +784,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.001, 0.495" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -831,7 +831,7 @@
       <RequiredItems identifier="ek_mini_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-20">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-20">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_mini_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -839,7 +839,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.001, 0.495" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -884,7 +884,7 @@
       <RequiredItems identifier="ek_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-60,-16">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-60,-16">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -892,10 +892,10 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_smg_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.014, 0.487" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -940,7 +940,7 @@
       <RequiredItems identifier="ek_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-60,-16">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-60,-16">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -948,10 +948,10 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_smg_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.010, 0.475" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -996,7 +996,7 @@
       <RequiredItems identifier="ek_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-60,-16">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-60,-16">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1004,7 +1004,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_smg_skin" />
     </ItemContainer>
     <Quality>
@@ -1044,7 +1044,7 @@
       <RequiredItems identifier="ek_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-60,-16">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-60,-16">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1052,10 +1052,10 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_smg_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.014, 0.487" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1102,7 +1102,7 @@
       <RequiredItems identifier="ek_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-60,-16">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-60,-16">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1110,10 +1110,10 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_smg_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.010, 0.475" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1154,7 +1154,7 @@
       <RequiredItems identifier="ek_shotgun_shells,shotgunshell,shotgunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="5" maxstacksize="1" hideitems="true" itempos="-60,-16">
+    <ItemContainer autofill="False" capacity="11" maxstacksize="2" hideitems="true" itempos="-60,-16">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_shotgun_shells,shotgunshell,shotgunammo" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1162,7 +1162,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.026, 0.495" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1203,7 +1203,7 @@
       <RequiredItems identifier="ek_shotgun_shells,shotgunshell,shotgunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="5" maxstacksize="1" hideitems="true" itempos="-60,-16">
+    <ItemContainer autofill="False" capacity="11" maxstacksize="2" hideitems="true" itempos="-60,-16">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_shotgun_shells,shotgunshell,shotgunammo" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1211,7 +1211,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.018, 0.485" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1256,7 +1256,7 @@
       <RequiredItems identifier="ek_tazer_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="ek_tazer_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1264,7 +1264,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.503" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1306,7 +1306,7 @@
       <RequiredItems identifier="ek_drumlmg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="65" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="28,-28">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="28,-28">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_drumlmg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1314,7 +1314,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.040, 0.5" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1353,11 +1353,11 @@
       <RequiredItems identifiers="ek_dart" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="45" />
     </RangedWeapon>
-    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="4" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="9" maxstacksize="2" hideitems="true">
       <Containable identifiers="ek_dart" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="1,29,120,35" />
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.020, 0.497" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1400,7 +1400,7 @@
       <RequiredItems identifier="ek_gausspistol_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_gausspistol_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1408,7 +1408,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.009, 0.497" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1454,7 +1454,7 @@
       <RequiredItems identifier="ek_gausspistol_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_gausspistol_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1462,7 +1462,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.007, 0.495" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1508,7 +1508,7 @@
       <RequiredItems identifier="ek_gaussrifle_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-82,-28">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-82,-28">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_gaussrifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1516,7 +1516,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.023, 0.505" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1562,7 +1562,7 @@
       <RequiredItems identifier="ek_gaussrifle_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-82,-28">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-82,-28">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_gaussrifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1570,7 +1570,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.013, 0.509" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1611,7 +1611,7 @@
       <RequiredItems identifier="ek_microtorpedo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="2" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="4" maxstacksize="2" hideitems="true">
       <Containable identifiers="ek_microtorpedo" />
       <ContainedStateIndicator texture="%ModDir%/UI/ek_containerindicators.png" sourcerect="0,0,128,32" />
     </ItemContainer>
@@ -1680,7 +1680,7 @@
       <RequiredItems identifier="ek_rocketammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true">
       <Containable identifiers="ek_rocketammo" />
       <ContainedStateIndicator texture="%ModDir%/UI/ek_containerindicators.png" sourcerect="0,32,128,32" />
     </ItemContainer>
@@ -1752,7 +1752,7 @@
       <RequiredItems identifier="ek_ssl_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_ssl_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1760,7 +1760,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.011, 0.502" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1805,7 +1805,7 @@
       <RequiredItems identifier="ek_battlerifle_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-33">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-33">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_battlerifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1816,7 +1816,7 @@
     <ItemContainer autofill="False" capacity="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_battlerifle_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.023, 0.503" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1861,7 +1861,7 @@
       <RequiredItems identifier="ek_battlerifle_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-33">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-33">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_battlerifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1872,7 +1872,7 @@
     <ItemContainer autofill="False" capacity="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_battlerifle_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="0.003, 0.477" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -1914,7 +1914,7 @@
       <RequiredItems identifier="ek_battlerifle_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-33">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-33">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_battlerifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1962,7 +1962,7 @@
       <RequiredItems identifier="ek_battlerifle_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-33">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-33">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_battlerifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1970,10 +1970,10 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_battlerifle_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.023, 0.503" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -2020,7 +2020,7 @@
       <RequiredItems identifier="ek_battlerifle_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-33">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-33">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_battlerifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -2028,10 +2028,10 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="true" hideitems="false" hudpos="0.5, 0.4" itempos="0,0" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable identifiers="ek_battlerifle_skin" />
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="0.003, 0.477" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -2078,7 +2078,7 @@
       <RequiredSkill identifier="weapons" level="30" />
       <StatusEffect type="Always" target="This" condition="100" setvalue="true" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="ek_laserpistol_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -2086,7 +2086,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.004, 0.501" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -2133,7 +2133,7 @@
       <RequiredSkill identifier="weapons" level="30" />
       <StatusEffect type="Always" target="This" condition="100" setvalue="true" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="ek_laserpistol_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -2141,7 +2141,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="0.0, 0.501" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -2188,7 +2188,7 @@
       <RequiredSkill identifier="weapons" level="45" />
       <StatusEffect type="Always" target="This" condition="100" setvalue="true" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="46,-28">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="46,-28">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="ek_laserrifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -2196,7 +2196,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.023, 0.502" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -2243,7 +2243,7 @@
       <RequiredSkill identifier="weapons" level="45" />
       <StatusEffect type="Always" target="This" condition="100" setvalue="true" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="46,-28">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="46,-28">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="ek_laserrifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -2251,7 +2251,7 @@
         <Use />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.013, 0.504" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -2323,11 +2323,11 @@
         <SpawnItem identifiers="ek_revolverammo_riot" spawnposition="ThisInventory" />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="6" maxstacksize="1" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="13" maxstacksize="2" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_revolverammo,ek_revolverloader,ek_ammotag357,revolverammo" />
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.003, 0.497" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -2399,11 +2399,11 @@
         <SpawnItem identifiers="ek_revolverammo_riot" spawnposition="ThisInventory" />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="6" maxstacksize="1" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="13" maxstacksize="2" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_revolverammo,ek_revolverloader,ek_ammotag357,revolverammo" />
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.002, 0.495" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -2475,7 +2475,7 @@
         <SpawnItem identifiers="ek_revolverammo_riot" spawnposition="ThisInventory" />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="6" maxstacksize="1" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="13" maxstacksize="2" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_revolverammo,ek_revolverloader,ek_ammotag357,revolverammo" />
     </ItemContainer>
@@ -2543,11 +2543,11 @@
         <SpawnItem identifiers="ek_revolverammo_riot" spawnposition="ThisInventory" />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="6" maxstacksize="1" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="13" maxstacksize="2" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_revolverammo,ek_revolverloader,ek_ammotag357,revolverammo" />
     </ItemContainer>
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="450" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="-0.003, 0.497" size="1.0,1.0" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
@@ -2621,11 +2621,11 @@
         <SpawnItem identifiers="ek_revolverammo_riot" spawnposition="ThisInventory" />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="6" maxstacksize="1" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="13" maxstacksize="2" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_revolverammo,ek_revolverloader,ek_ammotag357,revolverammo" />
     </ItemContainer>
-    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="700" powerconsumption="0" IsOn="false" canbeselected="true">
+    <LightComponent LightColor="0.7,0.0,0.0,0.5" Flicker="0.02" range="2800" powerconsumption="0" IsOn="false" canbeselected="true">
       <LightTexture texture="%ModDir%/Lights/laser_light.png" origin="-0.002, 0.495" size="1.0,0.3" />
     </LightComponent>
     <CustomInterface canbeselected="true" drawhudwhenequipped="true">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_chaingunammo.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_chaingunammo.xml
index bbee36f9..1f7f14d8 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_chaingunammo.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_chaingunammo.xml	
@@ -3,11 +3,11 @@
   <Item name="" identifier="ek_chaingunammo_large" aliases="Extended Chaingun Ammunition" scale="0.5" tags="chaingunequipment,chaingunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
     <Price baseprice="500">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="lead" mincondition="0.1" copycondition="true" />
@@ -39,7 +39,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.25" disabledeltatime="true">
         <SpawnItem identifiers="chaingunbolt" spawnposition="ThisInventory" />
@@ -50,11 +50,11 @@
   <Item name="" identifier="ek_chaingunammophysicorium_large" aliases="Extended Chaingun Physicorium Ammunition" scale="0.5" tags="chaingunequipment,chaingunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
     <Price baseprice="800" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="physicorium" mincondition="0.1" copycondition="true" />
@@ -87,7 +87,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.25" disabledeltatime="true">
         <SpawnItem identifiers="chaingunboltphysicorium" spawnposition="ThisInventory" />
@@ -100,11 +100,11 @@
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
     <Price baseprice="500" soldeverywhere="false">
       <!-- 479 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	18
@@ -137,7 +137,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.5" disabledeltatime="true">
         <SpawnItem identifiers="ek_chaingunboltexplosive" spawnposition="ThisInventory" />
@@ -148,11 +148,11 @@
   <Item name="" identifier="ek_chaingunammoexplosive_large" aliases="Extended Chaingun Explosive Ammunition" scale="0.5" tags="chaingunequipment,chaingunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
     <Price baseprice="1000" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="lead" mincondition="0.1" copycondition="true" />
@@ -184,7 +184,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.25" disabledeltatime="true">
         <SpawnItem identifiers="ek_chaingunboltexplosive" spawnposition="ThisInventory" />
@@ -235,11 +235,11 @@
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
     <Price baseprice="450" soldeverywhere="false">
       <!-- 324 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	150
@@ -272,7 +272,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.5" disabledeltatime="true">
         <SpawnItem identifiers="ek_chaingunboltheavy" spawnposition="ThisInventory" />
@@ -283,11 +283,11 @@
   <Item name="" identifier="ek_chaingunammoheavy_large" aliases="Extended Chaingun HEFC Ammunition" scale="0.5" tags="chaingunequipment,chaingunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
     <Price baseprice="900" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="titaniumaluminiumalloy" mincondition="0.1" copycondition="true" />
@@ -322,7 +322,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.25" disabledeltatime="true">
         <SpawnItem identifiers="ek_chaingunboltheavy" spawnposition="ThisInventory" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_coilgunammo.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_coilgunammo.xml
index fef4b1df..de6651e2 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_coilgunammo.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_coilgunammo.xml	
@@ -2,16 +2,16 @@
 <Items>
   <Item name="" identifier="ek_coilgunammo_large" aliases="Extended Coilgun Ammunition" scale="0.5" tags="coilgunequipment,coilgunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckcoilgun" minamount="0" maxamount="4" spawnprobability="0.2" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="420" />-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="280" />
     <Price storeidentifier="merchantCity" buyprice="380" />-->
     <Price baseprice="225">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="lead" mincondition="0.1" copycondition="true" />
@@ -43,7 +43,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.25" disabledeltatime="true">
         <SpawnItem identifiers="coilgunbolt" spawnposition="ThisInventory" />
@@ -53,16 +53,16 @@
   </Item>
   <Item name="" identifier="ek_coilgunammoexplosive_large" aliases="Extended Exploding Ammunition,Extended Explosive Ammunition Box,Extended Explosive Ammunition" scale="0.5" tags="coilgunequipment,coilgunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.05" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.1" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="750" />-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="600" />
     <Price storeidentifier="merchantCity" buyprice="700" />-->
     <Price baseprice="650" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" mincondition="0.1" copycondition="true" />
@@ -91,7 +91,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.25" disabledeltatime="true">
         <SpawnItem identifiers="coilgunboltexplosive" spawnposition="ThisInventory" />
@@ -101,16 +101,16 @@
   </Item>
   <Item name="" identifier="ek_coilgunammopiercing_large" aliases="Extended Piercing Ammunition" scale="0.5" tags="coilgunequipment,coilgunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.05" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.1" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="580" />-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="420" />
     <Price storeidentifier="merchantCity" buyprice="520" />-->
     <Price baseprice="500" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="titaniumaluminiumalloy" mincondition="0.1" copycondition="true" />
@@ -139,7 +139,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.25" disabledeltatime="true">
         <SpawnItem identifiers="coilgunboltpiercing" spawnposition="ThisInventory" />
@@ -149,13 +149,13 @@
   </Item>
   <Item name="" identifier="ek_coilgunammophysicorium_large" aliases="Extended Physicorium Ammunition" scale="0.5" tags="coilgunequipment,coilgunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.05" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.1" />
     <Price baseprice="600" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" mincondition="0.1" copycondition="true" />
@@ -184,7 +184,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.25" disabledeltatime="true">
         <SpawnItem identifiers="physicoriumbolt" spawnposition="ThisInventory" />
@@ -193,17 +193,17 @@
     </ItemContainer>
   </Item>
   <Item name="" identifier="ek_coilgunammoboxheavy" scale="0.5" tags="coilgunequipment,coilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="coilgunammocontainer" minamount="1" maxamount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="coilgunammocontainer" minamount="2" maxamount="2" spawnprobability="0.1" />
     <PreferredContainer primary="ammocontainer" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="450" />-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="300" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="450" />-->
     <Price baseprice="330" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="titaniumaluminiumalloy" mincondition="0.1" copycondition="true" />
@@ -229,7 +229,7 @@
     <Sprite texture="%ModDir%/Items/Containers/containers_ek.png" depth="0.54" sourcerect="704,304,112,80" origin="0.5,0.5" />
     <Body width="115" height="88" density="50" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-40,30" handle2="40,30" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.5" disabledeltatime="true">
         <SpawnItem identifiers="ek_coilgunboltheavy" spawnposition="ThisInventory" />
@@ -239,16 +239,16 @@
   </Item>
   <Item name="" identifier="ek_coilgunammoheavy_large" aliases="Extended HEFC Ammunition" scale="0.5" tags="coilgunequipment,coilgunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.05" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.1" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="800" />-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="650" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="800" />-->
     <Price baseprice="660" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="titaniumaluminiumalloy" mincondition="0.1" copycondition="true" />
@@ -279,7 +279,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.25" disabledeltatime="true">
         <SpawnItem identifiers="ek_coilgunboltheavy" spawnposition="ThisInventory" />
@@ -338,7 +338,7 @@
     <Sprite texture="Content/Items/Containers/crates.png" depth="0.54" sourcerect="344,197,117,89" origin="0.5,0.5" />
     <Body width="115" height="88" density="50" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-40,30" handle2="40,30" aimable="false" msg="ItemMsgPickUpSelect"/>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
 
       <StatusEffect type="Always" target="This" condition="-0.5" disabledeltatime="true" comparison="Not">
@@ -346,21 +346,21 @@
         <SpawnItem identifiers="coilgunbolt" spawnposition="ThisInventory" />
       </StatusEffect>
 
-      <Containable items="coilgunbolt" />
+      <Containable items="coilgunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>-->
   <Item name="" identifier="ek_coilgunammohybrid" scale="0.5" tags="coilgunequipment,coilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="coilgunammocontainer" minamount="1" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="coilgunammocontainer" minamount="2" maxamount="4" spawnprobability="0.2" />
     <PreferredContainer primary="ammocontainer" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="300" />
     <Price storeidentifier="merchantMilitary" buyprice="250" />
     <Price storeidentifier="merchantCity" buyprice="300" />-->
     <Price baseprice="275" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" mincondition="0.1" copycondition="true" />
@@ -390,7 +390,7 @@
     <ContainedSprite allowedcontainertags="coilgunammocontainer,ammoboxcontainer,crateshelf,ammocontainer" allowedcontaineridentifiers="coilgunammoshelf,crateshelf,ammocontainer" texture="%ModDir%/Items/Weapons/hybrid_coilgunammo.png" depth="0.54" sourcerect="0,64,112,88" origin="0.5,0.5" />
     <Body width="115" height="88" density="50" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-40,30" handle2="40,30" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-2.5" disabledeltatime="true" stackable="false">
         <RequiredItem items="ek_coilgunbolt_hybrid" type="Contained" />
@@ -407,16 +407,16 @@
   </Item>
   <Item name="" identifier="ek_coilgunammohybrid_large" aliases="Extended Hybrid Ammunition" scale="0.5" tags="coilgunequipment,coilgunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.05" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.1" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="420" />-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="280" />
     <Price storeidentifier="merchantCity" buyprice="380" />-->
     <Price baseprice="325" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" mincondition="0.1" copycondition="true" />
@@ -460,7 +460,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-30" handle1="-15,43" handle2="-15,43" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-1.25" disabledeltatime="true" stackable="false">
         <RequiredItem items="ek_coilgunbolt_hybrid" type="Contained" />
@@ -515,17 +515,17 @@
     </Projectile>
   </Item>
   <Item name="" identifier="ek_coilgunammohybridflak" scale="0.5" tags="coilgunequipment,coilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="coilgunammocontainer" spawnprobability="0.1" />
+    <PreferredContainer primary="coilgunammocontainer" spawnprobability="0.2" />
     <PreferredContainer primary="ammocontainer" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="325" />
     <Price storeidentifier="merchantMilitary" buyprice="275" />
     <Price storeidentifier="merchantCity" buyprice="325" />-->
     <Price baseprice="325" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	42 + 65 (150)
@@ -566,7 +566,7 @@
     <ContainedSprite allowedcontainertags="coilgunammocontainer,ammoboxcontainer,crateshelf,ammocontainer" allowedcontaineridentifiers="coilgunammoshelf,crateshelf,ammocontainer" texture="%ModDir%/Items/Weapons/hybrid_coilgunammo.png" depth="0.54" sourcerect="672,64,112,88" origin="0.5,0.5" />
     <Body width="115" height="88" density="50" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-40,30" handle2="40,30" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-2.5" disabledeltatime="true" stackable="false">
         <RequiredItem items="ek_coilgunbolt_hybridflak" type="Contained" />
@@ -583,16 +583,16 @@
   </Item>
   <Item name="" identifier="ek_coilgunammohybridflak_large" scale="0.5" tags="coilgunequipment,coilgunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.035" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.07" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="420" />-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="325" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="400" />-->
     <Price baseprice="400" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	42 + 65 (150)
@@ -645,7 +645,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-30" handle1="-15,43" handle2="-15,43" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-1.25" disabledeltatime="true" stackable="false">
         <RequiredItem items="ek_coilgunbolt_hybridflak" type="Contained" />
@@ -722,11 +722,11 @@
     <Price storeidentifier="merchantMilitary" buyprice="275" />
     <Price storeidentifier="merchantCity" buyprice="325" />-->
     <Price baseprice="375" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	42 + 65 (150)
@@ -784,7 +784,7 @@
     <ContainedSprite allowedcontainertags="coilgunammocontainer,ammoboxcontainer,crateshelf,ammocontainer" allowedcontaineridentifiers="coilgunammoshelf,crateshelf,ammocontainer" texture="%ModDir%/Items/Weapons/hybrid_coilgunammo.png" depth="0.54" sourcerect="1344,64,112,88" origin="0.5,0.5" />
     <Body width="115" height="88" density="50" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-40,30" handle2="40,30" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-2.5" disabledeltatime="true" stackable="false">
         <RequiredItem items="ek_coilgunbolt_hybridflak_smartfuse" type="Contained" />
@@ -805,11 +805,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="325" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="400" />-->
     <Price baseprice="475" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	42 + 65 (150)
@@ -881,7 +881,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-30" handle1="-15,43" handle2="-15,43" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-1.25" disabledeltatime="true" stackable="false">
         <RequiredItem items="ek_coilgunbolt_hybridflak_smartfuse" type="Contained" />
@@ -965,7 +965,7 @@
   </Item>
   <Item name="" identifier="ek_coilgunammohybridap" scale="0.5" tags="coilgunequipment,coilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.035" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.07" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="375" />
     <Price storeidentifier="merchantMilitary" buyprice="300" />
     <Price storeidentifier="merchantCity" buyprice="375" />-->
@@ -976,11 +976,11 @@
 	42
 	-->
     <Price baseprice="375" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" mincondition="0.1" copycondition="true" />
@@ -1013,7 +1013,7 @@
     <ContainedSprite allowedcontainertags="coilgunammocontainer,ammoboxcontainer,crateshelf,ammocontainer" allowedcontaineridentifiers="coilgunammoshelf,crateshelf,ammocontainer" texture="%ModDir%/Items/Weapons/hybrid_coilgunammo.png" depth="0.54" sourcerect="0,704,112,88" origin="0.5,0.5" />
     <Body width="115" height="88" density="50" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-40,30" handle2="40,30" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-2.5" disabledeltatime="true" stackable="false">
         <RequiredItem items="ek_coilgunbolt_hybridap" type="Contained" />
@@ -1030,16 +1030,16 @@
   </Item>
   <Item name="" identifier="ek_coilgunammohybridap_large" scale="0.5" tags="coilgunequipment,coilgunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.035" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.07" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="500" />-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="450" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="500" />-->
     <Price baseprice="540" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" mincondition="0.1" copycondition="true" />
@@ -1086,7 +1086,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-30" handle1="-15,43" handle2="-15,43" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-1.25" disabledeltatime="true" stackable="false">
         <RequiredItem items="ek_coilgunbolt_hybridap" type="Contained" />
@@ -1161,15 +1161,15 @@
   </Item>
   <Item name="" identifier="ek_coilgunammo_laser" aliases="Coilgun Laser Ammunition" scale="0.5" tags="coilgunequipment,coilgunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.04" />
     <!--<Price storeidentifier="merchantResearch" buyprice="800" />
     <Price storeidentifier="merchantMilitary" buyprice="1000" />-->
     <Price baseprice="880" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ek_laserparts" />
@@ -1193,13 +1193,13 @@
       <!--<StatusEffect type="OnContained" target="This" targetitemcomponent="LightComponent" IsOn="true" setvalue="true" />
 	  <StatusEffect type="OnNotContained" target="This" targetitemcomponent="LightComponent" IsOn="false" setvalue="true" />-->
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false">
       <StatusEffect type="Always" target="This" disabledeltatime="true">
         <SpawnItem identifiers="ek_coilgunbolt_laser" spawnposition="ThisInventory" />
       </StatusEffect>
       <Containable identifiers="ek_coilgunbolt_laser" />
     </ItemContainer>
-    <!--<LightComponent LightColor="255,255,255,2" range="20" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
+    <!--<LightComponent LightColor="255,255,255,2" range="80" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
       <sprite texture="Mods/EK Armory/Lights/laser_coilgun_emitter_light.png" sourcerect="0,0,112,176" alpha="1" Flicker="0.5" Range="1" castshadows="false" />
     </LightComponent>-->
   </Item>
@@ -1263,13 +1263,13 @@
   </Item>
   <Item name="" identifier="ek_coilgunammohybridtoxin" scale="0.5" tags="coilgunequipment,coilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.04" />
     <Price baseprice="480" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" mincondition="0.1" copycondition="true" />
@@ -1307,7 +1307,7 @@
     <ContainedSprite allowedcontainertags="coilgunammocontainer,ammoboxcontainer,crateshelf,ammocontainer" allowedcontaineridentifiers="coilgunammoshelf,crateshelf,ammocontainer" texture="%ModDir%/Items/Weapons/hybrid_coilgunammo.png" depth="0.54" sourcerect="672,704,112,88" origin="0.5,0.5" />
     <Body width="115" height="88" density="50" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-40,30" handle2="40,30" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-2.5" disabledeltatime="true" stackable="false">
         <RequiredItem items="ek_coilgunbolt_hybridtoxin" type="Contained" />
@@ -1360,13 +1360,13 @@
   </Item>
   <Item name="" identifier="ek_coilgunammohybridflare" scale="0.5" tags="coilgunequipment,coilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.05" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.1" />
     <Price baseprice="85">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" mincondition="0.1" copycondition="true" />
@@ -1395,7 +1395,7 @@
     <!--<ContainedSprite allowedcontainertags="coilgunammocontainer" texture="Mods/EK Armory/Items/Weapons/hybrid_coilgunammo.png" depth="0.54" sourcerect="672,704,112,88" origin="0.5,0.5" />-->
     <Body width="115" height="88" density="50" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-40,30" handle2="40,30" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-20" disabledeltatime="true" stackable="false">
         <RequiredItem items="ek_coilgunbolt_hybridflare" type="Contained" />
@@ -1443,16 +1443,16 @@
   </Item>
   <Item name="" identifier="ek_coilgunammohighvelocity" scale="0.5" tags="coilgunequipment,coilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckcoilgun" minamount="0" maxamount="4" spawnprobability="0.2" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="450" />-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="300" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="450" />-->
     <Price baseprice="120" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="copper" mincondition="0.9" outcondition="0.5" />
@@ -1476,7 +1476,7 @@
     <Sprite texture="%ModDir%/Items/Containers/containers_ek.png" depth="0.54" sourcerect="704,464,112,80" origin="0.5,0.5" />
     <Body width="115" height="88" density="50" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-40,30" handle2="40,30" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.5" disabledeltatime="true">
         <SpawnItem identifiers="ek_coilgunbolthighvelocity" spawnposition="ThisInventory" />
@@ -1486,16 +1486,16 @@
   </Item>
   <Item name="" identifier="ek_coilgunammohighvelocity_large" aliases="Extended High-Velocity Ammunition" scale="0.5" tags="coilgunequipment,coilgunammo,extendedcoilgunammo,crate,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="coilgunammocontainer,ammocontainer" />
-    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.05" />
+    <PreferredContainer primary="wreckcoilgun" spawnprobability="0.1" />
     <!--<Price storeidentifier="merchantOutpost" buyprice="800" />-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="650" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="800" />-->
     <Price baseprice="260" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="copper" mincondition="0.1" copycondition="true" />
@@ -1523,7 +1523,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="50,-20" handle1="-15,33" handle2="-15,33" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-0.25" disabledeltatime="true">
         <SpawnItem identifiers="ek_coilgunbolthighvelocity" spawnposition="ThisInventory" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_drones.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_drones.xml
index 7922c886..b78aec15 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_drones.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_drones.xml	
@@ -3,11 +3,11 @@
   <!-- Todo: Wait for this to work -->
   <Item name="" identifier="ek_drone_beacon" aliases="drone rally beacon,drone beacon" category="Equipment" hideinmenus="false" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_drone_follow_beacon" impactsoundtag="impact_metal_light" scale="0.32">
     <Price baseprice="210" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	45
@@ -29,7 +29,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/drone_items.png" sourcerect="0,0,32,96" depth="0.55" origin="0.5,0.5" />
     <Body width="30" height="94" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,-15" holdangle="10" throwforce="3.0" msg="ItemMsgPickUpSelect">
-      <LightComponent LightColor="0.4,1.0,0.3,0.7" range="20" powerconsumption="0" Flicker="0.35" IsOn="false" canbeselected="false">
+      <LightComponent LightColor="0.4,1.0,0.3,0.7" range="80" powerconsumption="0" Flicker="0.35" IsOn="false" canbeselected="false">
         <StatusEffect type="OnActive" targettype="This" disabledeltatime="true" stackable="false" delay="4.5" checkconditionalalways="true">
           <Conditional IsOn="eq true" targetitemcomponent="LightComponent" />
           <SpawnCharacter speciesname="Ekdronerallybeacon" />
@@ -51,11 +51,11 @@
   </Item>
   <Item name="" identifier="ek_drone_beaconattack" aliases="drone attack beacon" category="Equipment" hideinmenus="false" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_drone_attack_beacon" impactsoundtag="impact_metal_light" scale="0.32">
     <Price baseprice="210" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	45
@@ -77,7 +77,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/drone_items.png" sourcerect="0,96,32,96" depth="0.55" origin="0.5,0.5" />
     <Body width="30" height="94" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,-15" holdangle="10" throwforce="3.0" msg="ItemMsgPickUpSelect">
-      <LightComponent LightColor="1.0,0.25,0.2,0.7" range="35" powerconsumption="0" Flicker="0.35" IsOn="false" canbeselected="false">
+      <LightComponent LightColor="1.0,0.25,0.2,0.7" range="140" powerconsumption="0" Flicker="0.35" IsOn="false" canbeselected="false">
         <StatusEffect type="OnActive" targettype="This" disabledeltatime="true" stackable="false" delay="4.5" checkconditionalalways="true">
           <Conditional IsOn="eq true" targetitemcomponent="LightComponent" />
           <SpawnCharacter speciesname="Ekdroneattackbeacon" />
@@ -100,11 +100,11 @@
   <Item name="" identifier="ek_gundrone" aliases="gun drone" tags="crate,ek_deployable_drone" waterproof="true" fireproof="true" category="Misc" sonarsize="3" scale="0.55" impactsoundtag="impact_metal_heavy">
     <!--<Price storeidentifier="merchantMilitary" buyprice="500" />-->
     <Price baseprice="500" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
@@ -160,11 +160,11 @@
   </Item>
   <Item name="" identifier="ek_gundrone_wreck" aliases="gun drone wreck" tags="crate" waterproof="true" fireproof="true" category="Misc" hideinmenus="true" sonarsize="3" scale="0.55" impactsoundtag="impact_metal_heavy" HideConditionBar="true">
     <Price baseprice="150" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.7" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.1" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="steel" amount="2" />
@@ -190,11 +190,11 @@
   <Item name="" identifier="ek_walkerdrone" aliases="walker drone" tags="crate,ek_deployable_drone" waterproof="true" fireproof="true" category="Misc" sonarsize="3" scale="0.55" impactsoundtag="impact_metal_heavy">
     <!--<Price storeidentifier="merchantMilitary" buyprice="500" />-->
     <Price baseprice="500" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
@@ -268,17 +268,17 @@
         <SpawnItem identifier="ek_drumlmg_round" spawnposition="ThisInventory" />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" containedstateindicatorstyle="spear">
-      <Containable items="ek_drumlmg_round" />
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="2" containedstateindicatorstyle="spear">
+      <Containable items="ek_drumlmg_round,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ek_walkerdrone_wreck" aliases="walker drone wreck" tags="crate" waterproof="true" fireproof="true" category="Misc" hideinmenus="true" sonarsize="3" scale="0.55" impactsoundtag="impact_metal_heavy" HideConditionBar="true">
     <Price baseprice="150" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.7" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.1" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="steel" amount="2" />
@@ -319,7 +319,7 @@
     <Sprite texture="Mods/EK Armory/Items/Weapons/drone_items.png" sourcerect="0,0,32,96" depth="0.55" origin="0.5,0.5" />
     <Body width="30" height="94" density="10" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="50,0" handle1="-85,-35" handle2="0,-27" msg="ItemMsgPickUpSelect" />
-    <RepairTool structurefixamount="0" range="150" barrelpos="35,13" repairmultiple="true" repairthroughwalls="false" combatpriority="1">
+    <RepairTool structurefixamount="0" range="600" barrelpos="35,13" repairmultiple="true" repairthroughwalls="true" combatpriority="1">
       <ParticleEmitter particle="weld" particlespersecond="50" copyentityangle="true"/>
       <StatusEffect type="OnUse" targettype="Limb" tag="ek_drone_disarm_tag" >
         <Affliction identifier="ek_drone_disarm" amount="3.5" />
@@ -337,11 +337,11 @@
   -->
   <Item name="" identifier="ek_drone_multitool" aliases="drone disarmer,drone maintenance tool" category="Equipment" hideinmenus="fale" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,tool,weapon" impactsoundtag="impact_metal_light" scale="0.32">
     <Price baseprice="180" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="3" />
     </Price>
     <!--
 	20
@@ -362,22 +362,22 @@
     <Sprite texture="%ModDir%/Items/Weapons/drone_items.png" sourcerect="32,0,112,112" depth="0.55" origin="0.5,0.5" />
     <Body width="30" height="94" density="10" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="50,10" handle1="-24,-25" handle2="0,-25" msg="ItemMsgPickUpSelect" />
-    <RepairTool structurefixamount="0" range="300" barrelpos="35,13" repairmultiple="true" repairthroughwalls="false" combatpriority="1">
+    <RepairTool structurefixamount="0" range="1200" barrelpos="35,13" repairmultiple="true" repairthroughwalls="true" combatpriority="1">
       <StatusEffect type="OnUse" targettype="Limb">
         <Affliction identifier="ek_drone_disarm" amount="3.5" />
       </StatusEffect>
       <sound file="%ModDir%/Items/Weapons/ek_dronemultitool_hum_mono.ogg" type="OnUse" range="500.0" loop="true" />
       <!--
-	  <LightComponent LightColor="0.2,0.7,0.5,0.5" Flicker="0.75" range="150" powerconsumption="0" >
+	  <LightComponent LightColor="0.2,0.7,0.5,0.5" Flicker="0.75" range="600" powerconsumption="0" >
         <LightTexture texture="Mods/EK Armory/Lights/laser_light_wide.png" origin="-0.027, 0.4" size="1.0,0.3" />
       </LightComponent>
 	  -->
       <!--
-	  <LightComponent LightColor="0.2,0.7,0.5,0.5" Flicker="0.75" range="150" powerconsumption="0" >
+	  <LightComponent LightColor="0.2,0.7,0.5,0.5" Flicker="0.75" range="600" powerconsumption="0" >
         <LightTexture texture="Mods/EK Utilities/Lights/laserbore_beam.png" origin="-0.027, 0.4" size="1.0,0.3" />
       </LightComponent>
 	  -->
-      <LightComponent LightColor="0.2,0.7,0.5,0.5" range="145" Flicker="0.3">
+      <LightComponent LightColor="0.2,0.7,0.5,0.5" range="580" Flicker="0.3">
         <LightTexture texture="%ModDir%/Lights/laser_light_wide.png" origin="-0.027, 0.5" size="1.0,0.3" />
       </LightComponent>
     </RepairTool>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_pulselaserammo.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_pulselaserammo.xml
index ad5b6313..1ca3860b 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_pulselaserammo.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_pulselaserammo.xml	
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <Item name="" identifier="ek_pulselaserplasmaammobox" scale="0.5" tags="pulselaserequipment,pulselaserammo,ammobox" category="Equipment,Weapon" linkable="true" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="ammocontainer" spawnprobability="0.0" />
+    <PreferredContainer primary="ammocontainer" spawnprobability="0" />
     <Price baseprice="325" soldeverywhere="false">
       <!-- 290 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	88
@@ -45,7 +45,7 @@
       <StatusEffect type="OnUse" target="This" condition="-2.5" disabledeltatime="true">
         <RequiredItem items="ek_pulselaserplasmabolt" type="Contained" />
       </StatusEffect>
-      <Containable items="ek_pulselaserplasmabolt" />
+      <Containable items="ek_pulselaserplasmabolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ek_pulselaserplasmabolt" category="Misc" scale="1" sonarsize="2" hideinmenus="true">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_shells.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_shells.xml
index c6b9f3d7..86d3e68b 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_shells.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_shells.xml	
@@ -5,11 +5,11 @@
     <Price storeidentifier="merchantCity" buyprice="40" />
     <Price storeidentifier="merchantOutpost" buyprice="60" />-->
     <Price baseprice="45">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -27,23 +27,23 @@
     <Projectile characterusable="false" launchimpulse="5.0">
       <Attack structuredamage="0" damagetype="Blunt" />
     </Projectile>
-    <ItemContainer autofill="False" hideitems="true" capacity="20" canbeselected="false">
+    <ItemContainer autofill="False" hideitems="true" capacity="44" canbeselected="false">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
-      <Containable identifiers="smallitem,mediumitem,weapon,ek_ammocrate_small,ammobox" excludeditems="toolbelt,toolbox" />
+      <Containable identifiers="smallitem,mediumitem,weapon,ek_ammocrate_small,ammobox"ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ek_railshell_decoy" aliases="railgun sonar shell, railgun decoy shell, railgun decoy" tags="railgunequipment,railgunammo,decoy" category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="railgunammocontainer" minamount="1" maxamount="4" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="2" spawnprobability="0.08" />
+    <PreferredContainer primary="railgunammocontainer" minamount="2" maxamount="8" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="4" spawnprobability="0.16" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="175" />
     <Price storeidentifier="merchantCity" buyprice="190" />
     <Price storeidentifier="merchantOutpost" buyprice="220" />-->
     <Price baseprice="200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -82,11 +82,11 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" canbeselected="false">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" canbeselected="false">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,explosive" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="125,255,160,30" range="100" blinkfrequency="1.5" IsOn="false">
+    <LightComponent characterusable="false" LightColor="125,255,160,30" range="400" blinkfrequency="1.5" IsOn="false">
       <!--<sprite texture="Mods/EK Armory/Lights/sonarshell_lights.png" sourcerect="0,0,224,48" alpha="0.5" />-->
       <sound file="%ModDir%/Items/Weapons/ek_shellsonarbeacon.ogg" type="OnActive" range="7500.0" loop="true" />
       <StatusEffect type="OnActive" target="This" condition="-2" />
@@ -96,11 +96,11 @@
     <PreferredContainer primary="railgunammocontainer" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="275" />-->
     <Price baseprice="525" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -158,11 +158,11 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" canbeselected="false">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" canbeselected="false">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,explosive" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="125,255,160,30" range="100" blinkfrequency="1.5" IsOn="false">
+    <LightComponent characterusable="false" LightColor="125,255,160,30" range="400" blinkfrequency="1.5" IsOn="false">
       <!--<sprite texture="Mods/EK Armory/Lights/sonarshell_lights.png" sourcerect="0,0,224,48" alpha="0.5" />-->
       <sound file="%ModDir%/Items/Weapons/ek_shellsonarbeacon.ogg" type="OnActive" range="7500.0" loop="true" />
       <StatusEffect type="OnActive" target="This" condition="-2" />
@@ -174,11 +174,11 @@
   category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy" >
 	
     <Price baseprice="90" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
 	
     <Deconstruct time="10">
@@ -209,14 +209,14 @@
   </Item>
 -->
   <Item name="" identifier="ek_railshell_flechette" aliases="railgun flechette" tags="railgunequipment,railgunammo" category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="railgunammocontainer" minamount="2" maxamount="4" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="3" spawnprobability="0.08" />
+    <PreferredContainer primary="railgunammocontainer" minamount="4" maxamount="8" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="6" spawnprobability="0.16" />
     <Price baseprice="90" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -253,7 +253,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer autofill="False" hideitems="true" capacity="2" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="4" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_railgun_flechette_pellet" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,0,1,1" />
     </ItemContainer>
@@ -301,11 +301,11 @@
     <PreferredContainer primary="railgunammocontainer" />
 	
     <Price baseprice="20" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
 	
     <Deconstruct time="10">
@@ -319,7 +319,7 @@
     <Sprite texture="Mods/EK Armory/Items/Weapons/shells_ek.png" sourcerect="0,184,224,48" depth="0.54" origin="0.5,0.5" />
     <Body width="215" height="30" density="10" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-50" handle1="-10,0" handle2="10,0" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" hideitems="true" drawinventory="true" capacity="2" maxstacksize="1" itempos="52,0" iteminterval="-108,0" canbeselected="false">
+    <ItemContainer autofill="False" hideitems="true" drawinventory="true" capacity="4" maxstacksize="2" itempos="52,0" iteminterval="-108,0" canbeselected="false">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="ek_railgun_halfshells" />
       <ContainedStateIndicator texture="Mods/EK Armory/UI/ek_containerindicators.png" sourcerect="0,64,120,32" />
@@ -329,11 +329,11 @@
   <Item name="" identifier="ek_railgun_halfshells" aliases="railgun halfshell holder,ek_halfshell_case" tags="railgunequipment,railgunammo,ek_railgun_halfshellcontainer" category="Misc,Weapon" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="railgunammocontainer" />
     <Price baseprice="75" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" mincondition="0.1" copycondition="true" />
@@ -348,7 +348,7 @@
     <BrokenSprite texture="%ModDir%/Items/Weapons/halfshells_new.png" sourcerect="0,48,224,48" depth="0.54" maxcondition="51" origin="0.5,0.5" />
     <Body width="215" height="30" density="20" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-50" handle1="-10,0" handle2="10,0" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" removeOnCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" removecontaineditemsondeconstruct="true" drawinventory="false" capacity="1" maxstacksize="1" itempos="0,0" canbeselected="true" ShowConditionInContainedStateIndicator="true" SpawnWithId="ek_railgun_halfshell">
+    <ItemContainer autofill="False" hideitems="true" removecontaineditemsondeconstruct="true" drawinventory="false" capacity="1" maxstacksize="2" itempos="0,0" canbeselected="true" ShowConditionInContainedStateIndicator="true" SpawnWithId="ek_railgun_halfshell">
       <Containable identifiers="ek_railgun_halfshell" />
       <ContainedStateIndicator texture="%ModDir%/UI/ek_containerindicators.png" sourcerect="0,64,120,32" />
       <StatusEffect type="OnUse" target="This" condition="-50" disabledeltatime="true" />
@@ -365,11 +365,11 @@
     <PreferredContainer primary="ek_railgun_halfshellcontainer" />
     <!--
 	<Price baseprice="40" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="16" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="48" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
 	-->
     <Deconstruct time="10">
@@ -420,7 +420,7 @@
       </StatusEffect>
     </Projectile>
     <!--
-	<ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" canbeselected="false">
+	<ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" canbeselected="false">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem" />
     </ItemContainer>
@@ -429,11 +429,11 @@
   <Item name="" identifier="ek_railgun_halfshells_piercingslug" tags="railgunequipment,railgunammo,ek_railgun_halfshellcontainer" category="Misc,Weapon" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="railgunammocontainer" />
     <Price baseprice="95" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" mincondition="0.1" copycondition="true" />
@@ -450,7 +450,7 @@
     <BrokenSprite texture="%ModDir%/Items/Weapons/halfshells_new.png" sourcerect="0,144,224,48" depth="0.54" maxcondition="51" origin="0.5,0.5" />
     <Body width="215" height="30" density="20" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-50" handle1="-10,0" handle2="10,0" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" removeOnCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" removecontaineditemsondeconstruct="true" drawinventory="false" capacity="1" maxstacksize="1" itempos="0,0" canbeselected="true" ShowConditionInContainedStateIndicator="true" SpawnWithId="ek_railgun_halfshell_piercingslug">
+    <ItemContainer autofill="False" hideitems="true" removecontaineditemsondeconstruct="true" drawinventory="false" capacity="1" maxstacksize="2" itempos="0,0" canbeselected="true" ShowConditionInContainedStateIndicator="true" SpawnWithId="ek_railgun_halfshell_piercingslug">
       <Containable identifiers="ek_railgun_halfshell_piercingslug" />
       <ContainedStateIndicator texture="%ModDir%/UI/ek_containerindicators.png" sourcerect="0,64,120,32" />
       <StatusEffect type="OnUse" target="This" condition="-50" disabledeltatime="true" />
@@ -467,11 +467,11 @@
     <PreferredContainer primary="ek_railgun_halfshellcontainer" />
     <!--
     <Price baseprice="60" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8"/>
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false"/>
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24"/>
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false"/>
     </Price>
 	-->
     <Deconstruct time="15">
@@ -534,7 +534,7 @@
       </StatusEffect>
     </Projectile>
     <!--
-	<ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" canbeselected="false">
+	<ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" canbeselected="false">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem" />
     </ItemContainer>
@@ -543,11 +543,11 @@
   <Item name="" identifier="ek_railgun_halfshells_alien" tags="railgunequipment,railgunammo,ek_railgun_halfshellcontainer" category="Misc,Weapon" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="railgunammocontainer" />
     <Price baseprice="250" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.0" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.75" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="5.25" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="physicorium" mincondition="0.1" copycondition="true" />
@@ -562,7 +562,7 @@
     <BrokenSprite texture="%ModDir%/Items/Weapons/halfshells_new.png" sourcerect="0,240,224,48" depth="0.54" maxcondition="51" origin="0.5,0.5" />
     <Body width="215" height="30" density="20" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-50" handle1="-10,0" handle2="10,0" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" removeOnCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" removecontaineditemsondeconstruct="true" drawinventory="false" capacity="1" maxstacksize="1" itempos="0,0" canbeselected="true" ShowConditionInContainedStateIndicator="true" SpawnWithId="ek_railgun_halfshell_alien">
+    <ItemContainer autofill="False" hideitems="true" removecontaineditemsondeconstruct="true" drawinventory="false" capacity="1" maxstacksize="2" itempos="0,0" canbeselected="true" ShowConditionInContainedStateIndicator="true" SpawnWithId="ek_railgun_halfshell_alien">
       <Containable identifiers="ek_railgun_halfshell_alien" />
       <ContainedStateIndicator texture="%ModDir%/UI/ek_containerindicators.png" sourcerect="0,64,120,32" />
       <StatusEffect type="OnUse" target="This" condition="-50" disabledeltatime="true"></StatusEffect>
@@ -580,11 +580,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="220" />-->
     <!--
 	<Price baseprice="125" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="4"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4"/>
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false"/>
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="12"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12"/>
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false"/>
     </Price>
 	-->
     <Deconstruct time="10">
@@ -637,7 +637,7 @@
       </StatusEffect>
     </Projectile>
     <!--
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" canbeselected="false">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" canbeselected="false">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem" />
     </ItemContainer>
@@ -647,11 +647,11 @@
     <PreferredContainer primary="railgunammocontainer" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="250" />-->
     <Price baseprice="275" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -705,11 +705,11 @@
     <PreferredContainer primary="railgunammocontainer" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="420" />-->
     <Price baseprice="620" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -766,15 +766,15 @@
     </Projectile>
   </Item>
   <Item name="" identifier="ek_railshell_flak" aliases="flak railgun shell" tags="railgunequipment,railgunammo" category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="railgunammocontainer" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="2" spawnprobability="0.08" />
+    <PreferredContainer primary="railgunammocontainer" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="4" spawnprobability="0.16" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="225" />-->
     <Price baseprice="250" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
@@ -915,7 +915,7 @@
 
     </Projectile>
 
-    <LightComponent characterusable="false" LightColor="255,255,255,255" range="100" blinkfrequency="0.5" IsOn="false" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,255,255,255" range="400" blinkfrequency="0.5" IsOn="false" shadows="false" drawbehindsubs="true">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" checkconditionalalways="true" Condition="-200.0" delay="0.1">
         <Conditional MotionDetected="true" />
 
@@ -981,7 +981,7 @@
 
     </Projectile>
 
-    <LightComponent characterusable="false" LightColor="255,255,255,255" range="200" blinkfrequency="0.5" IsOn="false" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,255,255,255" range="800" blinkfrequency="0.5" IsOn="false" shadows="false" drawbehindsubs="true">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" checkconditionalalways="true" Condition="-200.0" delay="0.1" Comparison="and">
         <Conditional MotionDetected="eq true" />
 
@@ -997,11 +997,11 @@
   <Item name="" identifier="ek_railshell_flak_smartfuse" tags="railgunequipment,railgunammo" category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="railgunammocontainer" />
     <Price baseprice="300" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
@@ -1101,15 +1101,15 @@
     </MotionSensor>
   </Item>
   <Item name="" identifier="ek_railshell_piercingslug" aliases="piercing railgun shell" tags="railgunequipment,railgunammo" category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="railgunammocontainer" minamount="2" maxamount="4" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="2" spawnprobability="0.08" />
+    <PreferredContainer primary="railgunammocontainer" minamount="4" maxamount="8" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="4" spawnprobability="0.16" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="250" />-->
     <Price baseprice="95" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -1196,14 +1196,14 @@
   </Item>
   <Item name="" identifier="ek_railshell_armorpiercing" aliases="railgun armor piercing shell, armor piercing railgun shell" tags="railgunequipment,railgunammo" category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="railgunammocontainer" />
-    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="2" spawnprobability="0.06" />
+    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="4" spawnprobability="0.12" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="250" />-->
     <Price baseprice="300" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -1337,11 +1337,11 @@
     <PreferredContainer primary="railgunammocontainer" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="600" />-->
     <Price baseprice="900" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="physicorium" />
@@ -1414,11 +1414,11 @@
   <Item name="" identifier="ek_railshell_fusion_smartfuse" tags="railgunequipment,railgunammo" category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="railgunammocontainer" />
     <Price baseprice="980" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ek_railshell_fusion" />
@@ -1509,11 +1509,11 @@
     <Price storeidentifier="merchantCity" buyprice="80" />
     <Price storeidentifier="merchantOutpost" buyprice="120" />-->
     <Price baseprice="140" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1561,7 +1561,7 @@
     <Sprite texture="weapons_ek.png" sourcerect="0,0,1,1" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="50" density="10.5" />
 	<AiTarget sightrange="6000.0" maxsoundrange="8000" minsoundrange="0" fadeouttime="15" sonardisruption="5"/>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="2048" IsOn="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="8192" IsOn="true">
       <LightTexture texture="Mods/EK Armory/Lights/pointlight_bright_hires.png" origin="0.5, 0.5" size="1.2,1.2" />
       <sound file="Content/Items/Tools/FlareLoop.ogg" type="OnActive" range="2048.0" loop="true" />
       <StatusEffect type="OnActive" target="This" Condition="-1">
@@ -1579,7 +1579,7 @@
         <Conditional Condition="lt 100" />
       </StatusEffect>
     </LightComponent>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="2048" IsOn="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="8192" IsOn="true">
       <LightTexture texture="Mods/EK Armory/Lights/pointlight_ultrabright_hires.png" origin="0.5, 0.5" size="1.2,1.2" />
     </LightComponent>
     <ItemComponent>
@@ -1593,7 +1593,7 @@
     <Sprite texture="weapons_ek.png" sourcerect="0,0,1,1" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="50" density="10.5" />
     <AiTarget sightrange="6000.0" maxsoundrange="8000" minsoundrange="0" fadeouttime="15" sonardisruption="0.4" />
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q4.png" origin="0.0,0.0" size="1.1,1.1" />
       <sound file="Content/Items/Tools/FlareLoop.ogg" type="OnActive" range="2048.0" loop="true" />
       <StatusEffect type="OnActive" target="This" Condition="-1">
@@ -1611,13 +1611,13 @@
         <Conditional Condition="lt 100" />
       </StatusEffect>-->
     </LightComponent>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q3.png" origin="1.0,0.0" size="1.1,1.1" />
     </LightComponent>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q2.png" origin="0.0,1.0" size="1.1,1.1" />
     </LightComponent>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q1.png" origin="1.0,1.0" size="1.1,1.1" />
     </LightComponent>
     <ItemComponent>
@@ -1628,17 +1628,17 @@
   </Item>
   <Item name="" identifier="ek_railshell_flare" aliases="flare railgun shell" tags="railgunequipment,railgunammo" category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="railgunammocontainer" />
-    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="2" spawnprobability="0.06" />
+    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="4" spawnprobability="0.12" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="70" />
     <Price storeidentifier="merchantResearch" buyprice="90" />
     <Price storeidentifier="merchantCity" buyprice="70" />
     <Price storeidentifier="merchantOutpost" buyprice="80" />-->
     <Price baseprice="85">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -1706,13 +1706,13 @@
   </Item>
   <Item name="" identifier="ek_railshell_incendiary" aliases="incendiary railgun shell" tags="railgunequipment,railgunammo" category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="railgunammocontainer" />
-    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="2" spawnprobability="0.08" />
+    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="4" spawnprobability="0.16" />
     <Price baseprice="250" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -1768,15 +1768,15 @@
     </Projectile>
   </Item>
   <Item name="" identifier="ek_railshell_highvelocity" aliases="high-velocity railgun shell" tags="railgunequipment,railgunammo" category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="railgunammocontainer" minamount="2" maxamount="4" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="2" spawnprobability="0.06" />
+    <PreferredContainer primary="railgunammocontainer" minamount="4" maxamount="8" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="4" spawnprobability="0.12" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="250" />-->
     <Price baseprice="95" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" outcondition="0.5" />
@@ -1851,9 +1851,9 @@
         <Use />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="2" canbeselected="false">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem" />
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="ek_depthcharge_cyanide_cloud" identifier="ek_depthcharge_cyanide_cloud" tags="provocative" hideinmenus="true" noninteractable="true">
@@ -1874,11 +1874,11 @@
   </Item>
   <Item name="" identifier="ek_depthcharge_cyanide" tags="depthchargeammo,decoy,provocative" category="Misc,Weapon" sonarsize="3" scale="0.4" impactsoundtag="impact_metal_heavy">
     <Price baseprice="250" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1932,11 +1932,11 @@
   </Item>
   <Item name="" identifier="ek_depthcharge_paralyzant" tags="depthchargeammo,decoy,provocative" category="Misc,Weapon" sonarsize="3" scale="0.4" impactsoundtag="impact_metal_heavy">
     <Price baseprice="400" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1990,11 +1990,11 @@
   </Item>
   <Item name="" identifier="ek_depthcharge_radiotoxin" tags="depthchargeammo,decoy,provocative" category="Misc,Weapon" sonarsize="3" scale="0.4" impactsoundtag="impact_metal_heavy">
     <Price baseprice="250" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -2036,11 +2036,11 @@
     <Price storeidentifier="merchantCity" buyprice="70" />
     <Price storeidentifier="merchantOutpost" buyprice="80" />-->
     <Price baseprice="85">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -2124,11 +2124,11 @@
   <Item name="" identifier="ek_depthcharge_chaff" tags="depthchargeammo" category="Misc,Weapon" sonarsize="3" scale="0.4" impactsoundtag="impact_metal_heavy">
     <Price baseprice="150">
       <!-- 126 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
@@ -2174,14 +2174,14 @@
   </Item>
   <Item name="" identifier="ek_railshell_chaff" aliases="chaff railgun shell" tags="railgunequipment,railgunammo" category="Misc,Weapon" sonarsize="7" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="railgunammocontainer" />
-    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="2" spawnprobability="0.06" />
+    <PreferredContainer primary="wreckrailgun" minamount="0" maxamount="4" spawnprobability="0.12" />
     <Price baseprice="150">
       <!-- 126 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_weapons.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_weapons.xml
index 42846c5d..4a7a7b1c 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_weapons.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_weapons.xml	
@@ -31,7 +31,7 @@
       <RequiredItems identifiers="revolverround,revolverammo,ek_piperound" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="45" />
     </RangedWeapon>
-    <ItemContainer autofill="True" itempos="27,10" iteminterval="0,-4" capacity="4" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="True" itempos="27,10" iteminterval="0,-4" capacity="9" maxstacksize="2" hideitems="true">
       <Containable identifiers="revolverround,revolverammo,ek_piperound" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
     </ItemContainer>
@@ -39,7 +39,7 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.15" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_piperound" aliases="pipe_rifle_round, pipe round, pipe_round, piperound" spritecolor="175,155,135,255" inventoryiconcolor="175,155,135,255" scale="0.32" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,round,ammo,smallarmsammo,revolverround,revolverammo,ek_piperound" impactsoundtag="impact_metal_light" maxstacksize="12">
+  <Item name="" identifier="ek_piperound" aliases="pipe_rifle_round, pipe round, pipe_round, piperound" spritecolor="175,155,135,255" inventoryiconcolor="175,155,135,255" scale="0.32" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,round,ammo,smallarmsammo,revolverround,revolverammo,ek_piperound" impactsoundtag="impact_metal_light" maxstacksize="24">
     <PreferredContainer primary="ek_ammotag_piperound" />
     <Deconstruct time="6">
       <Item identifier="lead" outcondition="0.2" />
@@ -75,7 +75,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_piperound_alien" aliases="pipe_rifle_alien_round, pipe rifle alien round, pipe alien round, pipe_alien_round, alien pipe round, alien piperound, pipe round alien, piperound alien" spritecolor="255,210,125,255" inventoryiconcolor="255,210,125,255" scale="0.32" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,round,ammo,smallarmsammo,revolverround,revolverammo,ek_piperound" impactsoundtag="impact_metal_light" maxstacksize="12">
+  <Item name="" identifier="ek_piperound_alien" aliases="pipe_rifle_alien_round, pipe rifle alien round, pipe alien round, pipe_alien_round, alien pipe round, alien piperound, pipe round alien, piperound alien" spritecolor="255,210,125,255" inventoryiconcolor="255,210,125,255" scale="0.32" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,round,ammo,smallarmsammo,revolverround,revolverammo,ek_piperound" impactsoundtag="impact_metal_light" maxstacksize="24">
     <Deconstruct time="6">
       <Item identifier="physicorium" outcondition="0.2" />
       <Item identifier="potassium" outcondition="0.2" />
@@ -115,18 +115,18 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_revolver_flare" aliases="revolver flare round" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,revolverround,ammo,smallarmsammo,revolverammo,light,decoy,provocative,ek_flare,pistolammoitem" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_revolver_flare" aliases="revolver flare round" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,revolverround,ammo,smallarmsammo,revolverammo,light,decoy,provocative,ek_flare,pistolammoitem" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="revolver" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="50" />
     <Price storeidentifier="merchantResearch" buyprice="60" />
     <Price storeidentifier="merchantCity" buyprice="55" />
     <Price storeidentifier="merchantOutpost" buyprice="65" />-->
     <Price baseprice="50" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="36" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="18" />
     </Price>
     <Deconstruct time="8">
       <Item identifier="flashpowder" mincondition="0.9" outcondition="0.25" />
@@ -161,7 +161,7 @@
       <StatusEffect type="onActive" target="This" targetitemcomponent="LightComponent" IsOn="true" />
       <AiTarget sightrange="6000.0" maxsoundrange="8000" minsoundrange="0" fadeouttime="15" />
     </Projectile>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="850" IsOn="false">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="3400" IsOn="false">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright.png" origin="0.5, 0.5" size="1.0,1.0" />
       <sound file="Content/Items/Tools/FlareLoop.ogg" type="OnActive" range="1000.0" loop="true" />
       <StatusEffect type="OnActive" target="This" Condition="-11">
@@ -184,16 +184,16 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="80" />
     <Price storeidentifier="merchantCity" buyprice="140" />
     <Price storeidentifier="merchantOutpost" buyprice="160" />-->
-    <PreferredContainer primary="weaponholder" spawnprobability="0.1" />
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="weaponholder" spawnprobability="0.2" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="4" spawnprobability="0.2" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="2" spawnprobability="0.2" />
     <Price baseprice="90" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="ek_weaponparts" outcondition="0.125" />
@@ -228,9 +228,9 @@
       <RequiredItems items="ek_handgun_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-40,-20" allowuioverlap="true">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-40,-20" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
-      <Containable items="ek_handgun_mags" />
+      <Containable items="ek_handgun_mags,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!--
 	  <StatusEffect type="OnUse" target="Contained">
         <RequiredItem identifiers="ek_handgun_mags" type="Contained" />
@@ -252,7 +252,7 @@
       </Containable>
     </ItemContainer>
 
-    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="1000" IsOn="true">
+    <LightComponent LightColor="0.5,0.5,0.5,1.0" Flicker="0.02" range="4000" IsOn="true">
       <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       <StatusEffect type="OnActive" target="This" IsOn="false" disabledeltatime="true" delay="0.1" />
     </LightComponent> -->
@@ -260,20 +260,20 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_handgun_mag" aliases="handgun mag, handgun_mag, 9mm_magazine" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_9mm" tags="smallitem, ek_handgun_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_handgun_mag" aliases="handgun mag, handgun_mag, 9mm_magazine" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_9mm" tags="smallitem, ek_handgun_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="6">
     <PreferredContainer primary="ek_ammotag_9mm" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="25" />
     <Price storeidentifier="merchantCity" buyprice="50" />
     <Price storeidentifier="merchantOutpost" buyprice="60" />-->
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="4" spawnprobability="0.25" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.33" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="8" spawnprobability="0.5" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.66" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="4" spawnprobability="0.2" />
     <Price baseprice="40" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="16" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="48" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" minavailable="12" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="lead" mincondition="0.7" outcondition="0.25" />
@@ -297,7 +297,7 @@
     <ContainedSprite allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="48,48,32,32" />
     <Body width="21" height="47" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_handgun_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_handgun_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_handgun_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-12.5" disabledeltatime="true" />
@@ -306,20 +306,20 @@
       </StatusEffect>
     </ItemContainer>
   </Item>
-  <Item name="" identifier="ek_handgun_magextended" aliases="handgun high-capacity mag, handgun_mag_extended, handgun mag extended, 9mm_magazine_extended, 9mm_magazine_high_capacity" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_9mm" tags="smallitem, ek_handgun_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_handgun_magextended" aliases="handgun high-capacity mag, handgun_mag_extended, handgun mag extended, 9mm_magazine_extended, 9mm_magazine_high_capacity" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_9mm" tags="smallitem, ek_handgun_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="6">
     <PreferredContainer primary="ek_ammotag_9mm" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="40" />
     <Price storeidentifier="merchantCity" buyprice="80" />
     <Price storeidentifier="merchantOutpost" buyprice="100" />-->
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="4" spawnprobability="0.25" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.33" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="8" spawnprobability="0.5" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.66" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="4" spawnprobability="0.2" />
     <Price baseprice="70" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="lead" mincondition="0.85" outcondition="0.5" />
@@ -343,7 +343,7 @@
     <ContainedSprite allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="384,800,48,80" />
     <Body width="21" height="60" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_handgun_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_handgun_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_handgun_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-7.14" disabledeltatime="true" />
@@ -376,16 +376,16 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_handgun_alienmag" aliases="handgun alien mag, handgun physicorium mag, handgun_alien_mag, Physicorium_9mm_magazine" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem, ek_handgun_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_handgun_alienmag" aliases="handgun alien mag, handgun physicorium mag, handgun_alien_mag, Physicorium_9mm_magazine" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem, ek_handgun_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="6">
     <PreferredContainer primary="ek_ammotag_9mm" />
     <!--<Price storeidentifier="merchantResearch" buyprice="160" />-->
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="160" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="tin" />
@@ -408,7 +408,7 @@
     <ContainedSprite allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="48,48,32,32" />
     <Body width="21" height="47" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_handgun_alienround" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_handgun_alienround" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_handgun_alienround" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-12.5" disabledeltatime="true" />
@@ -446,18 +446,18 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_handgun_riot_mag" aliases="handgun riot mag, handgun_riot_mag, 9mm_magazine_riot" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_9mm" tags="smallitem, ek_handgun_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_handgun_riot_mag" aliases="handgun riot mag, handgun_riot_mag, 9mm_magazine_riot" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_9mm" tags="smallitem, ek_handgun_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="6">
     <PreferredContainer primary="ek_ammotag_9mm" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="20" />
     <Price storeidentifier="merchantCity" buyprice="40" />
     <Price storeidentifier="merchantOutpost" buyprice="50" />-->
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="20" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="rubber" mincondition="0.7" outcondition="0.5" />
@@ -481,7 +481,7 @@
     <ContainedSprite allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="48,48,32,32" />
     <Body width="21" height="47" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_handgun_riot_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_handgun_riot_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_handgun_riot_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-12.5" disabledeltatime="true" />
@@ -569,16 +569,16 @@
   <Item name="" identifier="ek_smg" aliases="marine_smg,ek marine smg,ek smg" category="Equipment,Weapon" cargocontaineridentifier="ek_weapons_case" tags="mediumitem,weapon,gun,ek_ammotag_57mm,gunsmith,mountableweapon" Scale="0.32" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantMilitary" buyprice="400" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="600" /> -->
-    <PreferredContainer primary="weaponholder" spawnprobability="0.05" />
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="weaponholder" spawnprobability="0.1" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="4" spawnprobability="0.2" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.2" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="4" spawnprobability="0.2" />
     <Price baseprice="400" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="ek_weaponparts" outcondition="0.25" />
@@ -615,7 +615,7 @@
       <RequiredItems identifier="ek_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-60,-16">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-60,-16">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -630,19 +630,19 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_smg_mag" aliases="smg mag,smg_mag,5.7x28mm_magazine,marine smg mag" maxstacksize="2" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_smg" tags="smallitem, ek_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_smg_mag" aliases="smg mag,smg_mag,5.7x28mm_magazine,marine smg mag" maxstacksize="4" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_smg" tags="smallitem, ek_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="ek_ammotag_57mm" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="80" />
     <Price storeidentifier="merchantCity" buyprice="120" />-->
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="5" spawnprobability="0.25" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.25" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="2" spawnprobability="0.25" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="10" spawnprobability="0.5" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.5" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="4" spawnprobability="0.5" />
     <Price baseprice="80" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="lead" mincondition="0.8" outcondition="0.75" />
@@ -668,7 +668,7 @@
     <ContainedSprite name="Marine Smg Magazine" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="144,0,48,64" />
     <Body width="32" height="64" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_smg_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_smg_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_smg_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-3.3333" disabledeltatime="true" />
@@ -701,16 +701,16 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_smg_alienmag" aliases="smg alien mag, smg physicorium mag,smg_alien_mag, Physicorium_5.7x28mm_magazine" maxstacksize="2" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem, ek_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_smg_alienmag" aliases="smg alien mag, smg physicorium mag,smg_alien_mag, Physicorium_5.7x28mm_magazine" maxstacksize="4" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem, ek_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="ek_ammotag_57mm" />
     <!--<Price storeidentifier="merchantResearch" buyprice="240" />-->
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="240" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -734,7 +734,7 @@
     <ContainedSprite name="Marine Smg Magazine" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="224,0,48,64" />
     <Body width="32" height="64" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_smg_alienround" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_smg_alienround" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_smg_alienround" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-3.3333" disabledeltatime="true" />
@@ -770,16 +770,16 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_smg_riot_mag" aliases="smg riot mag, handgun_smg_mag, 5.7x28mm_magazine_riot" maxstacksize="2" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_smg" tags="smallitem, ek_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_smg_riot_mag" aliases="smg riot mag, handgun_smg_mag, 5.7x28mm_magazine_riot" maxstacksize="4" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_smg" tags="smallitem, ek_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="ek_ammotag_57mm" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="60" />
     <Price storeidentifier="merchantCity" buyprice="100" />-->
     <Price baseprice="60" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="rubber" />
@@ -805,7 +805,7 @@
     <ContainedSprite name="Marine Smg Magazine" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="400,512,48,64" />
     <Body width="21" height="47" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_smg_riot_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_smg_riot_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_smg_riot_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-3.3333" disabledeltatime="true" />
@@ -840,11 +840,11 @@
     <Price storeidentifier="merchantCity" buyprice="200" />
     <Price storeidentifier="merchantOutpost" buyprice="220" />-->
     <Price baseprice="225" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	150
@@ -895,11 +895,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="450" />-->
     <!-- <Price storeidentifier="merchantCity" buyprice="800" /> -->
     <Price baseprice="450" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="18">
       <Item identifier="ek_weaponparts" outcondition="0.25" />
@@ -934,7 +934,7 @@
       <RequiredItems identifier="ek_microtorpedo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="2" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="4" maxstacksize="2" hideitems="true">
       <Containable identifiers="ek_microtorpedo" />
       <ContainedStateIndicator texture="%ModDir%/UI/ek_containerindicators.png" sourcerect="0,0,128,32" />
     </ItemContainer>
@@ -942,16 +942,16 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_torpedorifle_round_slug" aliases="microtorpedo slug, torpedo rifle round slug, torpedo_rifle_round_slug" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_microtorpedo" tags="smallitem, ek_microtorpedo" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="4">
+  <Item name="" identifier="ek_torpedorifle_round_slug" aliases="microtorpedo slug, torpedo rifle round slug, torpedo_rifle_round_slug" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_microtorpedo" tags="smallitem, ek_microtorpedo" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="8">
     <PreferredContainer primary="ek_ammotag_microtorpedo" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="120" />-->
     <!-- <Price storeidentifier="merchantCity" buyprice="250" /> -->
     <Price baseprice="35" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!-- 
 	20
@@ -999,14 +999,14 @@
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-200.0" delay="2.0" />
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_torpedorifle_round" aliases="torpedo rifle round, torpedo_rifle_round" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_microtorpedo" tags="smallitem,ek_microtorpedo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="4">
+  <Item name="" identifier="ek_torpedorifle_round" aliases="torpedo rifle round, torpedo_rifle_round" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_microtorpedo" tags="smallitem,ek_microtorpedo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="8">
     <PreferredContainer primary="ek_ammotag_microtorpedo" />
     <Price baseprice="105" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!-- 
 	20
@@ -1069,14 +1069,14 @@
       <QualityStat stattype="ExplosionDamage" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_torpedorifle_round_shortfuse" aliases="microtorpedo shortfuse, torpedo rifle round short fuse, torpedo_rifle_round_short_fuse" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_microtorpedo" tags="smallitem,ek_microtorpedo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="4">
+  <Item name="" identifier="ek_torpedorifle_round_shortfuse" aliases="microtorpedo shortfuse, torpedo rifle round short fuse, torpedo_rifle_round_short_fuse" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_microtorpedo" tags="smallitem,ek_microtorpedo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="8">
     <PreferredContainer primary="ek_ammotag_microtorpedo" />
     <Price baseprice="145" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!-- 
 	20
@@ -1141,16 +1141,16 @@
       <QualityStat stattype="ExplosionDamage" value="0.1" />
     </Quality>
   </Item>
-  <Item name="Microtorpedo (Shock Pulse)" identifier="ek_torpedorifle_round_tazer" aliases="microtorpedo shockpulse, torpedo rifle round tazer, torpedo_rifle_round_tazer" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_microtorpedo" tags="smallitem,ek_microtorpedo" Scale="0.36" impactsoundtag="impact_metal_light" description="Miniaturized stun probe, launched from a torpedo rifle." maxstacksize="4">
+  <Item name="Microtorpedo (Shock Pulse)" identifier="ek_torpedorifle_round_tazer" aliases="microtorpedo shockpulse, torpedo rifle round tazer, torpedo_rifle_round_tazer" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_microtorpedo" tags="smallitem,ek_microtorpedo" Scale="0.36" impactsoundtag="impact_metal_light" description="Miniaturized stun probe, launched from a torpedo rifle." maxstacksize="8">
     <PreferredContainer primary="ek_ammotag_microtorpedo" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="200" />-->
     <!-- <Price storeidentifier="merchantCity" buyprice="250" /> -->
     <Price baseprice="200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!-- 
 	20
@@ -1256,16 +1256,16 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="Microtorpedo (Physicorium)" identifier="ek_torpedorifle_round_alien" aliases="microtorpedo physicorium, torpedo rifle round physicorium, torpedo_rifle_round_physicorium, microtorpedo alien, microtorpedo_alien" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem,ek_microtorpedo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" description="Experimental high-yeild warhead, launched from a torpedo rifle." maxstacksize="4">
+  <Item name="Microtorpedo (Physicorium)" identifier="ek_torpedorifle_round_alien" aliases="microtorpedo physicorium, torpedo rifle round physicorium, torpedo_rifle_round_physicorium, microtorpedo alien, microtorpedo_alien" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem,ek_microtorpedo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" description="Experimental high-yeild warhead, launched from a torpedo rifle." maxstacksize="8">
     <PreferredContainer primary="ek_ammotag_microtorpedo" />
     <!--<Price storeidentifier="merchantResearch" buyprice="250" />-->
     <!-- <Price storeidentifier="merchantCity" buyprice="250" /> -->
     <Price baseprice="250" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!-- 
 	20
@@ -1290,7 +1290,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/weapons_ek.png" sourcerect="0,448,128,32" depth="0.55" />
     <Body width="98" height="28" density="20" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="70" aimable="false" msg="ItemMsgPickUpSelect" />
-    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,100" canbeselected="false" range="250.0" IsOn="true" castshadows="true" />
+    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,100" canbeselected="false" range="1000" IsOn="true" castshadows="true" />
     <Projectile characterusable="false" launchimpulse="22.0" sticktocharacters="false">
       <Attack structuredamage="150" itemdamage="50" stun="0.2" targetforce="22">
         <Affliction identifier="blunttrauma" strength="20" />
@@ -1338,11 +1338,11 @@
     <Price storeidentifier="merchantOutpost" buyprice="200" />
     <Price storeidentifier="merchantResearch" buyprice="220" />-->
     <Price baseprice="160" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="12">
       <Item identifier="ek_weaponparts" outcondition="0.125" />
@@ -1377,12 +1377,12 @@
       <RequiredItems identifier="ek_flare_rounds" type="Contained" mincondition="0.98" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_flare_rounds" />
     </ItemContainer>
   </Item>
-  <Item name="Flare Cartridge" identifier="ek_flare_round" aliases="flare_cartridge, flare shot, flare_shot, flare round, flare_round" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_flare_rounds,light,decoy,provocative,ek_flare,ek_shotgun_shells,shotgunshell,shotgunammo,ammo,smallarmsammo,pistolammoitem" Scale="0.36" impactsoundtag="impact_soft" description="Waterproof signal flare that illuminates a large area. Fired from a flare gun." maxstacksize="4">
+  <Item name="Flare Cartridge" identifier="ek_flare_round" aliases="flare_cartridge, flare shot, flare_shot, flare round, flare_round" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_flare_rounds,light,decoy,provocative,ek_flare,ek_shotgun_shells,shotgunshell,shotgunammo,ammo,smallarmsammo,pistolammoitem" Scale="0.36" impactsoundtag="impact_soft" description="Waterproof signal flare that illuminates a large area. Fired from a flare gun." maxstacksize="8">
     <PreferredContainer primary="ek_ammotag_flareshell" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="50" />
     <Price storeidentifier="merchantResearch" buyprice="90" />
@@ -1390,11 +1390,11 @@
     <Price storeidentifier="merchantOutpost" buyprice="80" />
     <Price storeidentifier="merchantMine" buyprice="90" />-->
     <Price baseprice="50" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="12" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="12" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="36" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="36" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" minavailable="18" />
     </Price>
     <Deconstruct time="8">
       <Item identifier="flashpowder" mincondition="0.9" outcondition="0.5" />
@@ -1439,7 +1439,7 @@
         <SpawnItem identifier="ek_flareshell_effect" spawnposition="This" />
       </StatusEffect>
     </Projectile>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="2048" IsOn="false">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="8192" IsOn="false">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_hires.png" origin="0.5, 0.5" size="1.0,1.0" />
       <sound file="Content/Items/Tools/FlareLoop.ogg" type="OnActive" range="2000.0" loop="true" />
       <StatusEffect type="OnActive" target="This" Condition="-1">
@@ -1460,7 +1460,7 @@
         <Conditional Condition="lt 100" />
       </StatusEffect>
     </LightComponent>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="2048" IsOn="false">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="8192" IsOn="false">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_hires.png" origin="0.5, 0.5" size="1.0,1.0" />
     </LightComponent>
   </Item>
@@ -1473,15 +1473,15 @@
       </StatusEffect>
     </ItemComponent>
   </Item>
-  <Item name="" identifier="ek_impact_mine" aliases="impact_mine, impact mine" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" impacttolerance="0.5" maxstacksize="4">
+  <Item name="" identifier="ek_impact_mine" aliases="impact_mine, impact mine" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" impacttolerance="0.5" maxstacksize="8">
     <!--<Price storeidentifier="merchantMilitary" buyprice="250" />
     <Price storeidentifier="merchantCity" buyprice="400" />-->
     <Price baseprice="250" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -1520,7 +1520,7 @@
       </StatusEffect>
     </Throwable>
     <!-- <MotionSensor range="150" onlyhumans="false" /> -->
-    <LightComponent characterusable="false" LightColor="255,0,0,60" range="100" blinkfrequency="0.5" IsOn="false">
+    <LightComponent characterusable="false" LightColor="255,0,0,60" range="400" blinkfrequency="0.5" IsOn="false">
       <sprite texture="%ModDir%/Lights/impact_mine_light.png" sourcerect="0,0,64,64" alpha="0.3" />
       <StatusEffect type="OnActive" target="This" Condition="-0.5">
         <Conditional Condition="lt 95" />
@@ -1562,15 +1562,15 @@
       <QualityStat stattype="ExplosionDamage" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_proximity_mine" aliases="proximity_mine,proximity mine" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="4">
+  <Item name="" identifier="ek_proximity_mine" aliases="proximity_mine,proximity mine" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="8">
     <!--<Price storeidentifier="merchantMilitary" buyprice="300" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="450" />-->
     <Price baseprice="300" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="9" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -1605,7 +1605,7 @@
       <StatusEffect type="OnContained" target="This" Condition="100" disabledeltatime="true" />
     </Throwable>
     <!-- <MotionSensor range="150" onlyhumans="false" /> -->
-    <LightComponent characterusable="false" LightColor="255,200,45,60" range="100" blinkfrequency="0.5" IsOn="false">
+    <LightComponent characterusable="false" LightColor="255,200,45,60" range="400" blinkfrequency="0.5" IsOn="false">
       <sprite texture="%ModDir%/Lights/impact_mine_light.png" sourcerect="0,0,64,64" alpha="0.3" />
       <StatusEffect type="OnActive" target="This" Condition="-0.5">
         <Conditional Condition="lt 95" />
@@ -1651,11 +1651,11 @@
     <Sprite texture="Mods/EK Armory/Items/Weapons/weapons_ek.png" sourcerect="448,0,240,64" depth="0.55" />
     <Body width="90" height="78" density="50" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="50,0" handle1="-85,-35" handle2="0,-27" msg="ItemMsgPickUpSelect" >
-      <LightComponent LightColor="50,255,75,150" Flicker="0.05" range="300" IsOn="true" >
+      <LightComponent LightColor="50,255,75,150" Flicker="0.05" range="1200" IsOn="true" >
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,0.5" />
       </LightComponent>
 	</Holdable>
-    <RepairTool structurefixamount="0" range="300" barrelpos="35,13" repairthroughwalls="false" combatpriority="0">
+    <RepairTool structurefixamount="0" range="1200" barrelpos="35,13" repairthroughwalls="true" combatpriority="0">
       <RequiredItems identifier="batterycell,fulguriumbatterycell" type="Contained" msg="ItemMsgBatteryCellRequired" />
       <ParticleEmitter particle="weld" particlespersecond="40" />
       <ParticleEmitterHitStructure particle="plasmaspark" particlespersecond="100" anglemin="-40" anglemax="40" velocitymin="100" velocitymax="800" />
@@ -1673,11 +1673,11 @@
     <Price storeidentifier="merchantCity" buyprice="450" />
     <Price storeidentifier="merchantOutpost" buyprice="450" />-->
     <Price baseprice="350" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="17">
       <Item identifier="ek_weaponparts" outcondition="0.125" />
@@ -1708,7 +1708,7 @@
       <RequiredItems identifier="ek_shotgun_shells,shotgunshell,shotgunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="2" maxstacksize="1" hideitems="true" itempos="-60,-16">
+    <ItemContainer autofill="False" capacity="4" maxstacksize="2" hideitems="true" itempos="-60,-16">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_shotgun_shells,shotgunshell,shotgunammo" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1724,11 +1724,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="500" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="700" />-->
     <Price baseprice="500" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="ek_weaponparts" outcondition="0.25" />
@@ -1761,7 +1761,7 @@
       <RequiredItems identifier="ek_shotgun_shells,shotgunshell,shotgunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="5" maxstacksize="1" hideitems="true" itempos="-60,-16">
+    <ItemContainer autofill="False" capacity="11" maxstacksize="2" hideitems="true" itempos="-60,-16">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_shotgun_shells,shotgunshell,shotgunammo" />
       <StatusEffect type="OnUse" target="Contained">
@@ -1773,19 +1773,19 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_shotgun_shell" aliases="12gauge_shell, shotgun shell, shotgun_shell" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ek_shotgun_shell" aliases="12gauge_shell, shotgun shell, shotgun_shell" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_shotgunshell" />
     <!-- <Price storeidentifier="merchantMilitary" buyprice="25" />
     <Price storeidentifier="merchantCity" buyprice="35" />
     <Price storeidentifier="merchantOutpost" buyprice="40" /> -->
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="3" spawnprobability="0.33" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="3" spawnprobability="0.33" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="6" spawnprobability="0.66" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="6" spawnprobability="0.66" />
     <Price baseprice="40" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="7">
       <Item identifier="lead" outcondition="0.25" />
@@ -1869,17 +1869,17 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_shotgun_beanbag" aliases="beanbag_shell,shotgun beanbag,shotgun_beanbag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ek_shotgun_beanbag" aliases="beanbag_shell,shotgun beanbag,shotgun_beanbag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_shotgunshell" />
     <!-- <Price storeidentifier="merchantMilitary" buyprice="18" />
     <Price storeidentifier="merchantCity" buyprice="25" />
     <Price storeidentifier="merchantOutpost" buyprice="30" /> -->
     <Price baseprice="30" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="7">
       <Item identifier="rubber" outcondition="0.25" />
@@ -1914,19 +1914,19 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_shotgun_slug" aliases="shotgun_slug" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ek_shotgun_slug" aliases="shotgun_slug" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_shotgunshell" />
     <!-- <Price storeidentifier="merchantMilitary" buyprice="45" />
     <Price storeidentifier="merchantCity" buyprice="60" />
     <Price storeidentifier="merchantOutpost" buyprice="70" /> -->
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="3" spawnprobability="0.25" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="3" spawnprobability="0.25" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="6" spawnprobability="0.5" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="6" spawnprobability="0.5" />
     <Price baseprice="60" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="7">
       <Item identifier="titaniumaluminiumalloy" outcondition="0.25" />
@@ -1970,19 +1970,19 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_shotgun_hollowpoint" aliases="shotgun_hollowpoint" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ek_shotgun_hollowpoint" aliases="shotgun_hollowpoint" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_shotgunshell" />
     <!-- <Price storeidentifier="merchantMilitary" buyprice="45" />
     <Price storeidentifier="merchantCity" buyprice="60" />
     <Price storeidentifier="merchantOutpost" buyprice="70" /> -->
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="3" spawnprobability="0.25" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="3" spawnprobability="0.25" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="6" spawnprobability="0.5" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="6" spawnprobability="0.5" />
     <Price baseprice="50" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="7">
       <Item identifier="copper" outcondition="0.25" />
@@ -2021,15 +2021,15 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_shotgun_alien_slug" aliases="physicorium_slug, shotgun_alien_slug, shotgun alien slug" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ek_shotgun_alien_slug" aliases="physicorium_slug, shotgun_alien_slug, shotgun alien slug" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_shotgunshell" />
     <!-- <Price storeidentifier="merchantResearch" buyprice="90" /> -->
     <Price baseprice="70" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="plastic" outcondition="0.25" />
@@ -2074,18 +2074,18 @@
   </Item>
   <!--
   <Item name="Shotgun Grenade" identifier="ek_shotgun_grenade" aliases="shotgun_grenade" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" 
-  description="Grenade ammunition for a shotgun. Direct-fire grenade which detonates on impact." tags="smallitem, ek_shotgun_shells,round,shell,shotgunshell,shotgunammo,ammo,smallarmsammo,demolitionsexpert" impactsoundtag="impact_metal_light" maxstacksize="8" >
+  description="Grenade ammunition for a shotgun. Direct-fire grenade which detonates on impact." tags="smallitem, ek_shotgun_shells,round,shell,shotgunshell,shotgunammo,ammo,smallarmsammo,demolitionsexpert" impactsoundtag="impact_metal_light" maxstacksize="16" >
     <PreferredContainer primary="ek_ammotag_shotgunshell"/>
 
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.1"/>
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="2" spawnprobability="0.1"/>
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.2"/>
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="4" spawnprobability="0.2"/>
 
     <Price baseprice="65" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false"/>
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false"/>
     </Price>
 
     <Deconstruct time="7">
@@ -2143,16 +2143,16 @@
     </Quality>
   </Item>
   -->
-  <Item name="" identifier="ek_shotgun_grenade" aliases="shotgun_grenade" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells,round,shell,shotgunshell,shotgunammo,ammo,smallarmsammo,demolitionsexpert" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ek_shotgun_grenade" aliases="shotgun_grenade" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells,round,shell,shotgunshell,shotgunammo,ammo,smallarmsammo,demolitionsexpert" impactsoundtag="impact_metal_light" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_shotgunshell" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.2" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="4" spawnprobability="0.2" />
     <Price baseprice="65" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="7">
       <Item identifier="plastic" outcondition="0.25" />/&gt;
@@ -2210,16 +2210,16 @@
       <QualityStat stattype="ExplosionDamage" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_shotgun_flechette" aliases="shotgun_flechette" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ek_shotgun_flechette" aliases="shotgun_flechette" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_shotgun_shells, round, shell,shotgunshell,shotgunammo,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_shotgunshell" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="3" spawnprobability="0.25" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="3" spawnprobability="0.25" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="6" spawnprobability="0.5" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="6" spawnprobability="0.5" />
     <Price baseprice="45" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!-- <Price storeidentifier="merchantMilitary" buyprice="45" />
     <Price storeidentifier="merchantCity" buyprice="60" />
@@ -2267,11 +2267,11 @@
     <Price storeidentifier="merchantCity" buyprice="240" />
     <Price storeidentifier="merchantOutpost" buyprice="280" />-->
     <Price baseprice="280" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="ek_weaponparts" outcondition="0.125" />
@@ -2308,7 +2308,7 @@
       <RequiredItems identifier="ek_tazer_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="ek_tazer_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -2317,17 +2317,17 @@
       </StatusEffect>
     </ItemContainer>
   </Item>
-  <Item name="" identifier="ek_tazer_mag" aliases="tazer_cartridge, tazer mag, tazer_mag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_tazer_mags, loadable" impactsoundtag="impact_metal_light" maxstacksize="2">
+  <Item name="" identifier="ek_tazer_mag" aliases="tazer_cartridge, tazer mag, tazer_mag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_tazer_mags, loadable" impactsoundtag="impact_metal_light" maxstacksize="4">
     <PreferredContainer primary="ek_ammotag_tazer" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="120" />
     <Price storeidentifier="merchantCity" buyprice="140" />
     <Price storeidentifier="merchantOutpost" buyprice="180" />-->
     <Price baseprice="180" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="15">
       <RequiredSkill identifier="electrical" level="40" />
@@ -2342,7 +2342,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="189,416,24,37" origin="0.5,0.5" />
     <Body width="24" height="37" density="30" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-90" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_tazer_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_tazer_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_tazer_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <StatusEffect type="OnUse" target="This" condition="-50" disabledeltatime="true" />
@@ -2383,11 +2383,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="250" />
     <Price storeidentifier="merchantCity" buyprice="400" />-->
     <Price baseprice="200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="ek_weaponparts" outcondition="0.125" />
@@ -2423,7 +2423,7 @@
       <!--<StatusEffect type="InWater" target="This" Condition="-100" disabledeltatime="true"/>
 	  <StatusEffect type="OnBroken" target="This" Condition="100" disabledeltatime="true" delay="0.1"/>-->
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="10,-10" itemrotation="-90">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="10,-10" itemrotation="-90">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,157,92,27" />
       <Containable identifier="ek_flamer_tank" />
       <StatusEffect type="OnUse" target="Contained">
@@ -2432,17 +2432,17 @@
       </StatusEffect>
     </ItemContainer>
   </Item>
-  <Item name="" identifier="ek_flamer_fuel" aliases="flamer fuel, flamer_fuel, flamethrower fuel, flamethrower_fuel" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem, ek_flamer_tank,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="4" waterproof="true">
+  <Item name="" identifier="ek_flamer_fuel" aliases="flamer fuel, flamer_fuel, flamethrower fuel, flamethrower_fuel" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem, ek_flamer_tank,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="8" waterproof="true">
     <PreferredContainer primary="ek_ammotag_flamerfuel" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="80" />
     <Price storeidentifier="merchantMine" buyprice="100" />
     <Price storeidentifier="merchantCity" buyprice="100" />-->
     <Price baseprice="80" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="5" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="15" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="8">
       <RequiredSkill identifier="mechanical" level="25" />
@@ -2491,7 +2491,7 @@
         </Explosion>
       </StatusEffect>
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_flame_fuel" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_flame_fuel" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_flame_fuel" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,157,92,27" />
       <StatusEffect type="OnUse" target="This" condition="-1" disabledeltatime="true" />
@@ -2507,7 +2507,7 @@
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,384,64,64" />
     <Sprite texture="Content/Items/Weapons/weapons_new.png" sourcerect="0,0,1,1" depth="0.55" />
     <Body width="16" height="16" density="40" />
-    <LightComponent AllowInGameEditing="false" LightColor="1.0,0.8,0.6,0.5" canbeselected="false" range="300.0" Flicker="0.5" IsOn="false" castshadows="true" />
+    <LightComponent AllowInGameEditing="false" LightColor="1.0,0.8,0.6,0.5" canbeselected="false" range="1200" Flicker="0.5" IsOn="false" castshadows="true" />
     <Projectile characterusable="false" launchimpulse="10.0" removeonhit="false" maxtargetstohit="5">
       <Attack firedamage="10.0" structuredamage="0" itemdamage="15" stun="0" targetforce="0">
         <Affliction identifier="burn" strength="1" />
@@ -2541,15 +2541,15 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_flamer_incendium" aliases="flamer fuel incendium, flamer_fuel_incendium, flamethrower fuel incendium, flamethrower_fuel_incendium" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem, ek_flamer_tank,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="4" waterproof="true">
+  <Item name="" identifier="ek_flamer_incendium" aliases="flamer fuel incendium, flamer_fuel_incendium, flamethrower fuel incendium, flamethrower_fuel_incendium" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem, ek_flamer_tank,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="8" waterproof="true">
     <PreferredContainer primary="ek_ammotag_flamerfuel" />
     <!--<Price storeidentifier="merchantResearch" buyprice="120" />-->
     <Price baseprice="100" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="5" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="15" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="12">
       <RequiredSkill identifier="mechanical" level="25" />
@@ -2598,7 +2598,7 @@
         </Explosion>
       </StatusEffect>
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_flame_incendium" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_flame_incendium" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_flame_incendium" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,157,92,27" />
       <StatusEffect type="OnUse" target="This" condition="-1" disabledeltatime="true" />
@@ -2614,7 +2614,7 @@
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,384,64,64" />
     <Sprite texture="Content/Items/Weapons/weapons_new.png" sourcerect="0,0,1,1" depth="0.55" />
     <Body width="16" height="16" density="40" />
-    <LightComponent AllowInGameEditing="false" LightColor="1.0,0.8,0.6,0.5" canbeselected="false" range="300.0" Flicker="0.5" IsOn="false" castshadows="true" />
+    <LightComponent AllowInGameEditing="false" LightColor="1.0,0.8,0.6,0.5" canbeselected="false" range="1200" Flicker="0.5" IsOn="false" castshadows="true" />
     <Projectile characterusable="false" launchimpulse="10.0" removeonhit="false" maxtargetstohit="5">
       <Attack firedamage="15.0" structuredamage="0" itemdamage="20" stun="0" targetforce="0">
         <Affliction identifier="burn" strength="1.5" />
@@ -2649,12 +2649,12 @@
     </Projectile>
   </Item>
   <Item name="" identifier="ek_alienrifle" aliases="alien_rifle, alien rifle" category="Alien" tags="mediumitem,weapon,gun,alien,ek_ammotag_alienmag" Scale="0.35" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="aliencontainer" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wrecksecurearmcab,wreckarmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="aliencontainer" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wrecksecurearmcab,wreckarmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
     <Price baseprice="1000" soldeverywhere="false">
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="40">
       <Item identifier="physicorium" />
@@ -2683,20 +2683,20 @@
       <RequiredItems identifier="ek_alienrifle_mag" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="0,-48" itemrotation="-45">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="0,-48" itemrotation="-45">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifier="ek_alienrifle_mag" />
     </ItemContainer>
   </Item>
-  <Item name="" identifier="ek_alienrifle_mag" aliases="alien rifle mag, alien_rifle_mag, Physicorium_5.7x28mm_magazine" scale="0.35" maxstacksize="2" category="Alien" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem,ek_smg_mags,magazine,alien" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_alienrifle_mag" aliases="alien rifle mag, alien_rifle_mag, Physicorium_5.7x28mm_magazine" scale="0.35" maxstacksize="4" category="Alien" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem,ek_smg_mags,magazine,alien" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantResearch" buyprice="240" />-->
     <PreferredContainer primary="ek_ammotag_alienmag" />
-    <PreferredContainer primary="aliencontainer" minamount="0" maxamount="2" spawnprobability="0.1" />
-    <PreferredContainer primary="wrecksecurearmcab,wreckarmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer primary="aliencontainer" minamount="0" maxamount="4" spawnprobability="0.2" />
+    <PreferredContainer primary="wrecksecurearmcab,wreckarmcab,wreckshuttlecrate" minamount="0" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="200" soldeverywhere="false">
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -2707,8 +2707,8 @@
     <BrokenSprite texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.7" sourcerect="832,64,32,64" origin="0.5,0.5" maxcondition="0" />
     <Body radius="15" height="40" density="20" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-90" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <!--<LightComponent AllowInGameEditing="false" lightcolor="112,146,190,30" canbeselected="false" range="30.0" IsOn="true" castshadows="false" />-->
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_alienrifle_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <!--<LightComponent AllowInGameEditing="false" lightcolor="112,146,190,30" canbeselected="false" range="120" IsOn="true" castshadows="false" />-->
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_alienrifle_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_alienrifle_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <StatusEffect type="OnUse" target="This" condition="-2.5" disabledeltatime="true" />
@@ -2750,15 +2750,15 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_petrobomb" aliases="molotov,petrobomb" impacttolerance="8" maxstacksize="8" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,weapon,explosive,demolitionsexpert" Scale="0.35" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_petrobomb" aliases="molotov,petrobomb" impacttolerance="8" maxstacksize="16" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,weapon,explosive,demolitionsexpert" Scale="0.35" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantOutpost" buyprice="80" />
     <Price storeidentifier="merchantMine" buyprice="100" />-->
     <Price baseprice="100" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="18" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="6">
       <RequiredItem identifier="antibleeding1" />
@@ -2812,11 +2812,11 @@
   </Item>
   <Item name="" identifier="ek_micro_dartgun" aliases="mini dart gun, dart pistol" category="Equipment,Weapon" cargocontaineridentifier="ek_weapons_case" tags="smallitem,weapon,gun,ek_ammotag_dart" Scale="0.32" impactsoundtag="impact_metal_light">
     <Price baseprice="150" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="3">
       <Item identifier="aluminium" />
@@ -2837,7 +2837,7 @@
       <RequiredItems identifiers="ek_dart" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true">
       <Containable identifiers="ek_dart" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,152,120,32" />
     </ItemContainer>
@@ -2847,11 +2847,11 @@
     <Price storeidentifier="merchantCity" buyprice="300" />
     <Price storeidentifier="merchantResearch" buyprice="200" />-->
     <Price baseprice="200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.5" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="4.5" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="ek_weaponparts" outcondition="0.125" />
@@ -2882,7 +2882,7 @@
       <RequiredItems identifiers="ek_dart" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="45" />
     </RangedWeapon>
-    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="4" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" itempos="27,10" iteminterval="0,-4" capacity="9" maxstacksize="2" hideitems="true">
       <Containable identifiers="ek_dart" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,152,120,32" />
     </ItemContainer>
@@ -2909,7 +2909,7 @@
       <Containable identifiers="chem,medical,syringe" />
     </ItemContainer>
   </Item>-->
-  <Item name="" identifier="ek_dart_hemostat" aliases="dart hemostat" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_hemostat" aliases="dart hemostat" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -2931,7 +2931,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_stabilozine" aliases="dart stabilozine" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_stabilozine" aliases="dart stabilozine" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -2955,7 +2955,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_morphine" aliases="dart morphine" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_morphine" aliases="dart morphine" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -2981,7 +2981,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_fentanyl" aliases="dart fentanyl" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_fentanyl" aliases="dart fentanyl" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3007,7 +3007,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_deusizine" aliases="dart deusizine" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_deusizine" aliases="dart deusizine" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3031,7 +3031,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_calyxanide" aliases="dart calyxanide" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_calyxanide" aliases="dart calyxanide" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3071,7 +3071,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_haloperidol" aliases="dart haloperidol" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_haloperidol" aliases="dart haloperidol" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3092,7 +3092,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_oxygenite" aliases="dart oxygenite" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_oxygenite" aliases="dart oxygenite" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3114,7 +3114,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_steroids" aliases="dart steroids,dart steroid" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_steroids" aliases="dart steroids,dart steroid" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3136,7 +3136,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_antiparalysis" aliases="dart antiparalysis,dart paralysis antidote" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_antiparalysis" aliases="dart antiparalysis,dart paralysis antidote" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3158,7 +3158,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_ethanol" aliases="dart ethanol" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_ethanol" aliases="dart ethanol" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3182,7 +3182,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_chloralhydrate" aliases="dart sedative,dart chloralhydrate" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_chloralhydrate" aliases="dart sedative,dart chloralhydrate" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3208,7 +3208,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_deliriumine" aliases="dart psycosis,dart deliriumine" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_deliriumine" aliases="dart psycosis,dart deliriumine" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3229,7 +3229,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_acid" aliases="dart acid,dart sulphuricacid" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_acid" aliases="dart acid,dart sulphuricacid" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3255,7 +3255,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_cyanide" aliases="dart cyanide" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_cyanide" aliases="dart cyanide" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3276,7 +3276,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_radiotoxin" aliases="dart radiotoxin" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_radiotoxin" aliases="dart radiotoxin" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3297,7 +3297,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_morbusine" aliases="dart morbusine" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_morbusine" aliases="dart morbusine" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3318,7 +3318,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_sufforin" aliases="dart sufforin" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_sufforin" aliases="dart sufforin" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3339,7 +3339,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_paralyzant" aliases="dart paralyzant,dart paralysis" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_paralyzant" aliases="dart paralyzant,dart paralysis" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3360,7 +3360,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_raptorbane" aliases="dart raptorbane,raptorbane dart" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_raptorbane" aliases="dart raptorbane,raptorbane dart" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3385,7 +3385,7 @@
       </StatusEffect>|
       <StatusEffect tags="poison" type="OnImpact" target="Character" duration="20"><Conditional speciesgroup="mudraptor" /><Affliction identifier="organdamage" amount="10" /></StatusEffect><StatusEffect tags="poison" type="OnImpact" target="Character" duration="20"><Conditional group="mudraptor" /><Affliction identifier="organdamage" amount="10" /></StatusEffect></Projectile>
   </Item>
-  <Item name="" identifier="ek_dart_explosive" aliases="dart explosive,dart grenade" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ek_dart_explosive" aliases="dart explosive,dart grenade" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,ek_dart" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <PreferredContainer primary="ek_ammotag_dart" />
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.5" />
@@ -3412,16 +3412,16 @@
   <Item name="" identifier="ek_mini_smg" aliases="mini smg" category="Equipment,Weapon" cargocontaineridentifier="ek_weapons_case" tags="mediumitem,weapon,gun,ek_ammotag_10mm,gunsmith,mountableweapon" Scale="0.35" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantMilitary" buyprice="250" />
     <Price storeidentifier="merchantCity" buyprice="450" />-->
-    <PreferredContainer primary="weaponholder" spawnprobability="0.05" />
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="0.1" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="weaponholder" spawnprobability="0.1" />
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="0.2" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="4" spawnprobability="0.2" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="4" spawnprobability="0.2" />
     <Price baseprice="250" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.5" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="4.5" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="ek_weaponparts" outcondition="0.25" />
@@ -3456,7 +3456,7 @@
       <RequiredItems identifier="ek_mini_smg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-20">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-20">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_mini_smg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -3468,20 +3468,20 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_mini_smg_mag" aliases="compact smg mag, mini smg mag, mini_smg_mag, 10mm mag, 10mm_magazine" scale="0.27" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_9mm" tags="smallitem, ek_mini_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_mini_smg_mag" aliases="compact smg mag, mini smg mag, mini_smg_mag, 10mm mag, 10mm_magazine" scale="0.27" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_9mm" tags="smallitem, ek_mini_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="6">
     <PreferredContainer primary="ek_ammotag_10mm" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="60" />
     <Price storeidentifier="merchantCity" buyprice="100" />
     <Price storeidentifier="merchantOutpost" buyprice="120" />-->
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="5" spawnprobability="0.25" />
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="3" spawnprobability="0.33" />
-    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="3" spawnprobability="0.33" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="10" spawnprobability="0.5" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="6" spawnprobability="0.66" />
+    <PreferredContainer primary="abandonedsecarmcab" minamount="0" maxamount="6" spawnprobability="0.66" />
     <Price baseprice="100" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="lead" mincondition="0.9" />
@@ -3505,7 +3505,7 @@
     <ContainedSprite name="Compact Smg Magazine" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="464,576,64,96" />
     <Body width="48" height="80" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-10" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_mini_smg_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_mini_smg_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_mini_smg_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-4" disabledeltatime="true" />
@@ -3538,16 +3538,16 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_mini_smg_alienmag" aliases="compact smg alien mag, mini smg alien mag, mini_smg_alien_mag, 10mm alien mag, 10mm_magazine_physicorium" scale="0.27" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem, ek_mini_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_mini_smg_alienmag" aliases="compact smg alien mag, mini smg alien mag, mini_smg_alien_mag, 10mm alien mag, 10mm_magazine_physicorium" scale="0.27" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem, ek_mini_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="6">
     <PreferredContainer primary="ek_ammotag_10mm" />
     <!--<Price storeidentifier="merchantResearch" buyprice="200" />-->
-    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="3" spawnprobability="0.05" />
+    <PreferredContainer primary="wrecksecarmcab" minamount="0" maxamount="6" spawnprobability="0.1" />
     <Price baseprice="180" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -3570,7 +3570,7 @@
     <ContainedSprite name="Compact Smg Magazine" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="800,464,64,96" />
     <Body width="48" height="80" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-10" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_mini_smg_alienround" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_mini_smg_alienround" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_mini_smg_alienround" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-4" disabledeltatime="true" />
@@ -3606,17 +3606,17 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_mini_smg_riot_mag" aliases="compact smg riot mag, mini smg riot mag, mini_smg_riot_mag, 10mm mag riot, 10mm_magazine_riot" scale="0.27" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_9mm" tags="smallitem, ek_mini_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_mini_smg_riot_mag" aliases="compact smg riot mag, mini smg riot mag, mini_smg_riot_mag, 10mm mag riot, 10mm_magazine_riot" scale="0.27" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_9mm" tags="smallitem, ek_mini_smg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="6">
     <PreferredContainer primary="ek_ammotag_10mm" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="50" />
     <Price storeidentifier="merchantCity" buyprice="70" />
     <Price storeidentifier="merchantOutpost" buyprice="100" />-->
     <Price baseprice="75" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="rubber" copycondition="true" />
@@ -3640,7 +3640,7 @@
     <ContainedSprite name="Compact Smg Magazine" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="800,368,64,96" />
     <Body width="48" height="80" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-10" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_mini_smg_riot_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_mini_smg_riot_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_mini_smg_riot_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-4" disabledeltatime="true" />
@@ -3707,11 +3707,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="750" />-->
     <!-- <Price storeidentifier="merchantCity" buyprice="800" /> -->
     <Price baseprice="750" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="ek_weaponparts" outcondition="0.25" />
@@ -3746,19 +3746,19 @@
       <RequiredItems identifier="ek_rocketammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true">
       <Containable identifiers="ek_rocketammo" />
       <ContainedStateIndicator texture="%ModDir%/UI/ek_containerindicators.png" sourcerect="0,32,128,32" />
     </ItemContainer>
   </Item>
-  <Item name="" identifier="ek_rocketammo_explosive" aliases="rocket,he rocket,rocket he,he_rocket,rocket_he,rocket high explosive,rocket explosive,rocket_explosive" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_rockets" tags="smallitem,ek_rocketammo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="2">
+  <Item name="" identifier="ek_rocketammo_explosive" aliases="rocket,he rocket,rocket he,he_rocket,rocket_he,rocket high explosive,rocket explosive,rocket_explosive" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_rockets" tags="smallitem,ek_rocketammo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="4">
     <PreferredContainer primary="ek_ammotag_rocket" />
     <Price baseprice="225" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
@@ -3835,16 +3835,16 @@
       <QualityStat stattype="ExplosionDamage" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_rocketammo_shortfuse" aliases="shortfuse rocket,rocket shortfuse,shortfuse_rocket,rocket_shortfuse" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_rockets" tags="smallitem,ek_rocketammo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="2">
+  <Item name="" identifier="ek_rocketammo_shortfuse" aliases="shortfuse rocket,rocket shortfuse,shortfuse_rocket,rocket_shortfuse" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_rockets" tags="smallitem,ek_rocketammo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="4">
     <PreferredContainer primary="ek_ammotag_rocket" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="250" />-->
     <!-- <Price storeidentifier="merchantCity" buyprice="250" /> -->
     <Price baseprice="275" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
@@ -3922,16 +3922,16 @@
       <QualityStat stattype="ExplosionDamage" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_rocketammo_armorpiercing" aliases="ap rocket,rocket ap,ap_rocket,rocket_ap,rocket armor piercing,rocket_armor_piercing" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_rockets" tags="smallitem,ek_rocketammo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="2">
+  <Item name="" identifier="ek_rocketammo_armorpiercing" aliases="ap rocket,rocket ap,ap_rocket,rocket_ap,rocket armor piercing,rocket_armor_piercing" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_rockets" tags="smallitem,ek_rocketammo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="4">
     <PreferredContainer primary="ek_ammotag_rocket" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="300" />-->
     <!-- <Price storeidentifier="merchantCity" buyprice="250" /> -->
     <Price baseprice="300" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
@@ -4035,16 +4035,16 @@
       <QualityStat stattype="ExplosionDamage" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_rocketammo_alien" aliases="alien rocket,rocket alien,rocket physicorium,physicorium rocket" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_rockets" tags="smallitem,ek_rocketammo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="2">
+  <Item name="" identifier="ek_rocketammo_alien" aliases="alien rocket,rocket alien,rocket physicorium,physicorium rocket" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="ek_ammocrate_rockets" tags="smallitem,ek_rocketammo,demolitionsexpert" Scale="0.36" impactsoundtag="impact_metal_light" maxstacksize="4">
     <PreferredContainer primary="ek_ammotag_rocket" />
     <!--<Price storeidentifier="merchantResearch" buyprice="500" />-->
     <!-- <Price storeidentifier="merchantCity" buyprice="250" /> -->
     <Price baseprice="500" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="false" />
     </Price>
     <Deconstruct time="8">
       <Item identifier="steel" />
@@ -4065,7 +4065,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/weapons_ek.png" sourcerect="288,704,176,48" depth="0.55" />
     <Body width="160" height="32" density="12" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="70" aimable="false" msg="ItemMsgPickUpSelect" />
-    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,175" canbeselected="false" range="400.0" IsOn="true" castshadows="true" />
+    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,175" canbeselected="false" range="1600" IsOn="true" castshadows="true" />
     <Projectile characterusable="false" launchimpulse="22.0" sticktocharacters="false">
       <Attack structuredamage="200" itemdamage="200" stun="0.2" structuresoundtype="StructureSlash">
         <Affliction identifier="blunttrauma" strength="20" />
@@ -4114,11 +4114,11 @@
   <Item name="" identifier="ek_gausspistol" aliases="coil pistol" category="Equipment,Weapon" cargocontaineridentifier="ek_weapons_case" tags="smallitem,weapon,loadable,gun,ek_ammotag_gausspistol,gunsmith,pistolitem" Scale="0.30" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantResearch" buyprice="80" />-->
     <Price baseprice="800" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="ek_weaponparts" outcondition="0.125" />
@@ -4158,7 +4158,7 @@
       <RequiredItems identifier="ek_gausspistol_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_gausspistol_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -4170,17 +4170,17 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_gausspistol_mag" aliases="gauss pistol mag,coil pistol mag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_gausspistol_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_gausspistol_mag" aliases="gauss pistol mag,coil pistol mag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_gausspistol_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="6">
     <PreferredContainer primary="ek_ammotag_gausspistol" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="25" />
     <Price storeidentifier="merchantCity" buyprice="50" />
     <Price storeidentifier="merchantOutpost" buyprice="60" />-->
     <Price baseprice="200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="physicorium" mincondition="0.7" outcondition="0.25" />
@@ -4199,7 +4199,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="656,704,31,64" origin="0.5,0.5" />
     <Body width="22" height="48" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_gausspistol_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_gausspistol_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_gausspistol_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-6.67" disabledeltatime="true" />
@@ -4247,11 +4247,11 @@
   <Item name="" identifier="ek_gaussrifle" aliases="coil rifle" category="Equipment,Weapon" cargocontaineridentifier="ek_weapons_case" tags="mediumitem,weapon,loadable,gun,ek_ammotag_gaussrifle,gunsmith,mountableweapon" Scale="0.30" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantResearch" buyprice="80" />-->
     <Price baseprice="1200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="ek_weaponparts" outcondition="0.25" />
@@ -4291,7 +4291,7 @@
       <RequiredItems identifier="ek_gaussrifle_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="-82,-28">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="-82,-28">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_gaussrifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -4303,17 +4303,17 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_gaussrifle_mag" aliases="gauss rifle mag,coil rifle mag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_gaussrifle_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="2">
+  <Item name="" identifier="ek_gaussrifle_mag" aliases="gauss rifle mag,coil rifle mag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem, ek_gaussrifle_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="4">
     <PreferredContainer primary="ek_ammotag_gaussrifle" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="25" />
     <Price storeidentifier="merchantCity" buyprice="50" />
     <Price storeidentifier="merchantOutpost" buyprice="60" />-->
     <Price baseprice="300" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="physicorium" mincondition="0.7" outcondition="0.5" />
@@ -4333,7 +4333,7 @@
     <ContainedSprite name="Gauss Rifle Mag" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="736,704,48,80" />
     <Body width="36" height="70" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_gaussrifle_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_gaussrifle_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_gaussrifle_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-5" disabledeltatime="true" />
@@ -4382,11 +4382,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="450" />-->
     <!--<Price storeidentifier="merchantCity" buyprice="600" />-->
     <Price baseprice="450" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="ek_weaponparts" outcondition="0.25" />
@@ -4425,7 +4425,7 @@
       <RequiredItems identifier="ek_drumlmg_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="65" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="28,-28">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="28,-28">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_drumlmg_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -4437,16 +4437,16 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_drumlmg_mag" aliases="drum lmg mag,lmg mag,lmg drum" maxstacksize="2" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_rifle" tags="smallitem, ek_drumlmg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_drumlmg_mag" aliases="drum lmg mag,lmg mag,lmg drum" maxstacksize="4" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_rifle" tags="smallitem, ek_drumlmg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="ek_ammotag_556drum" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="210" />
     <Price storeidentifier="merchantCity" buyprice="250" />-->
     <Price baseprice="210" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="lead" mincondition="0.4" />
@@ -4473,7 +4473,7 @@
     <ContainedSprite name="Drum LMG Mag" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.54" sourcerect="320,944,48,80" />
     <Body width="32" height="64" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_drumlmg_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_drumlmg_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_drumlmg_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-1.1" disabledeltatime="true" />
@@ -4506,15 +4506,15 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_drumlmg_alienmag" aliases="drum lmg alien mag,lmg alien mag,lmg alien drum,lmg drum alien" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem, ek_drumlmg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="2">
+  <Item name="" identifier="ek_drumlmg_alienmag" aliases="drum lmg alien mag,lmg alien mag,lmg alien drum,lmg drum alien" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem, ek_drumlmg_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="4">
     <PreferredContainer primary="ek_ammotag_556drum" />
     <!--<Price storeidentifier="merchantResearch" buyprice="280" />-->
     <Price baseprice="300" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -4539,7 +4539,7 @@
     <ContainedSprite name="Drum LMG Mag" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.54" sourcerect="368,944,48,80" />
     <Body width="32" height="64" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_drumlmg_alienround" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_drumlmg_alienround" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_drumlmg_alienround" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-1.1" disabledeltatime="true" />
@@ -4572,14 +4572,14 @@
   </Item>
   <!--
   <Item name="Smoke Grenade" identifier="ek_smokegrenade"
-  category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive" scale="0.5" impactsoundtag="impact_metal_light" maxstacksize="8">
+  category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive" scale="0.5" impactsoundtag="impact_metal_light" maxstacksize="16">
 
     <Price baseprice="110" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false"/>
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false"/>
     </Price>
 
     <Deconstruct time="10">
@@ -4616,13 +4616,13 @@
     </Throwable>
   </Item>
   -->
-  <Item name="" identifier="ek_smokegrenade" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive" scale="0.5" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ek_smokegrenade" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive" scale="0.5" impactsoundtag="impact_metal_light" maxstacksize="16">
     <Price baseprice="110" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -4675,11 +4675,11 @@
   <Item name="" identifier="ek_battlerifle" aliases="marine assault rifle" category="Equipment,Weapon" cargocontaineridentifier="ek_weapons_case" tags="mediumitem,weapon,gun,ek_ammotag_556,gunsmith,mountableweapon" Scale="0.32" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantMilitary" buyprice="550" />-->
     <Price baseprice="550" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="ek_weaponparts" outcondition="0.25" />
@@ -4721,7 +4721,7 @@
         <Explosion range="140.0" force="0.5" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="4.0" />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="8,-33">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="8,-33">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_battlerifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -4736,16 +4736,16 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_battlerifle_mag" aliases="battle rifle mag,assault rifle mag,marine battle rifle mag,marine assault rifle mag" maxstacksize="2" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_rifle" tags="smallitem, ek_battlerifle_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_battlerifle_mag" aliases="battle rifle mag,assault rifle mag,marine battle rifle mag,marine assault rifle mag" maxstacksize="4" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_rifle" tags="smallitem, ek_battlerifle_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="ek_ammotag_556" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="95" />
     <Price storeidentifier="merchantCity" buyprice="150" />-->
     <Price baseprice="95" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="lead" mincondition="0.8" />
@@ -4769,7 +4769,7 @@
     <ContainedSprite name="Marine Battle Rifle Magazine" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="416,944,48,80" />
     <Body width="32" height="64" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_drumlmg_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_drumlmg_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_drumlmg_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-3.3333" disabledeltatime="true" />
@@ -4778,15 +4778,15 @@
       </StatusEffect>
     </ItemContainer>
   </Item>
-  <Item name="" identifier="ek_battlerifle_alien_mag" aliases="battle rifle alien mag,assault rifle alien mag,marine battle rifle alien mag,marine assault rifle alien mag" maxstacksize="2" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem, ek_battlerifle_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_battlerifle_alien_mag" aliases="battle rifle alien mag,assault rifle alien mag,marine battle rifle alien mag,marine assault rifle alien mag" maxstacksize="4" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_physicorium" tags="smallitem, ek_battlerifle_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="ek_ammotag_556" />
     <!--<Price storeidentifier="merchantResearch" buyprice="280" />-->
     <Price baseprice="280" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="physicorium" mincondition="0.8" />
@@ -4810,7 +4810,7 @@
     <ContainedSprite name="Marine Battle Rifle Magazine" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="336,1024,48,80" />
     <Body width="32" height="64" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_drumlmg_alienround" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_drumlmg_alienround" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_drumlmg_alienround" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-3.3333" disabledeltatime="true" />
@@ -4819,16 +4819,16 @@
       </StatusEffect>
     </ItemContainer>
   </Item>
-  <Item name="" identifier="ek_battlerifle_riot_mag" aliases="battle rifle riot mag,assault rifle riot mag,marine battle rifle riot mag,marine assault rifle riot mag" maxstacksize="2" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_rifle" tags="smallitem, ek_battlerifle_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_battlerifle_riot_mag" aliases="battle rifle riot mag,assault rifle riot mag,marine battle rifle riot mag,marine assault rifle riot mag" maxstacksize="4" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_rifle" tags="smallitem, ek_battlerifle_mags, magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="ek_ammotag_556" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="75" />
     <Price storeidentifier="merchantCity" buyprice="125" />-->
     <Price baseprice="75" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="rubber" mincondition="0.8" />
@@ -4852,7 +4852,7 @@
     <ContainedSprite name="Marine Battle Rifle Magazine" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="384,1024,48,80" />
     <Body width="32" height="64" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_smg_riot_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_smg_riot_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_smg_riot_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-3.3333" disabledeltatime="true" />
@@ -4865,11 +4865,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="450" />
     <Price storeidentifier="merchantCity" buyprice="600" />-->
     <Price baseprice="500" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="ek_weaponparts" outcondition="0.25" />
@@ -4907,7 +4907,7 @@
       <RequiredItems identifier="ek_ssl_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifier="ek_ssl_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -4916,16 +4916,16 @@
       </StatusEffect>
     </ItemContainer>
   </Item>
-  <Item name="" identifier="ek_ssl_magazine" aliases="30mm fc clip,ssl mag,ssl clip,beast mag,beast clip" maxstacksize="2" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_rockets" tags="smallitem,ek_ssl_mags,magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_ssl_magazine" aliases="30mm fc clip,ssl mag,ssl clip,beast mag,beast clip" maxstacksize="4" scale="0.32" category="Equipment,Weapon" cargocontaineridentifier="ek_ammocrate_rockets" tags="smallitem,ek_ssl_mags,magazine,ammo,smallarmsammo" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="ek_ammotag_30mmfc" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="210" />
     <Price storeidentifier="merchantCity" buyprice="250" />-->
     <Price baseprice="200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" mincondition="0.85" outcondition="0.5" />
@@ -4952,7 +4952,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="768,832,112,64" origin="0.5,0.5" />
     <Body width="108" height="60" density="40" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_ssl_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_ssl_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_ssl_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <StatusEffect type="OnUse" target="This" condition="-7.15" disabledeltatime="true" />
@@ -5009,7 +5009,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_ied" aliases="fuel bomb,improvised bomb" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="3">
+  <Item name="" identifier="ek_ied" aliases="fuel bomb,improvised bomb" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="6">
     <Deconstruct time="15">
       <Item identifier="fpgacircuit" />
       <Item identifier="copper" />
@@ -5025,7 +5025,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/weapons_ek.png" sourcerect="782,560,112,80" depth="0.55" origin="0.5,0.5" />
     <Body width="92" height="66" density="18" />
     <Throwable slots="Any,RightHand+LeftHand" holdpos="40,-10" aimpos="30,-45" aimangle="90" handle1="0,-13" handle2="0,-13" throwforce="2.0" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,0,0,255" range="20" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
+    <LightComponent LightColor="255,0,0,255" range="80" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
       <sprite texture="%ModDir%/Lights/ied_light.png" sourcerect="0,0,80,80" alpha="1" />
       <StatusEffect type="OnActive" targettype="This" Condition="-1.667" />
       <StatusEffect type="OnActive" targettype="This">
@@ -5087,16 +5087,16 @@
       <QualityStat stattype="ExplosionDamage" value="0.15" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_breachingcharge" aliases="ek breaching charge" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,weapon,explosive" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" hideinmenus="false" maxstacksize="4">
+  <Item name="" identifier="ek_breachingcharge" aliases="ek breaching charge" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,weapon,explosive" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" hideinmenus="false" maxstacksize="8">
     <!--<Price storeidentifier="merchantMilitary" buyprice="150" />
     <Price storeidentifier="merchantCity" buyprice="175" />
     <Price storeidentifier="merchantResearch" buyprice="175" />-->
     <Price baseprice="75" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.75" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.25" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="fpgacircuit" outcondition="0.5" />
@@ -5117,7 +5117,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <LightComponent LightColor="150,0,0,255" range="15" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
+    <LightComponent LightColor="150,0,0,255" range="60" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
       <StatusEffect type="OnActive" targettype="This" Condition="-15">
         <Sound file="%ModDir%/Items/Weapons/ek_satchelbeep.ogg" loop="true" range="800" />
       </StatusEffect>
@@ -5209,18 +5209,18 @@
       </StatusEffect>
     </ItemComponent>
   </Item>
-  <Item name="" identifier="ek_explosivecharge_uex" aliases="satchel charge uex,uex bomb" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,ekshared_largeshellexplosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="2">
+  <Item name="" identifier="ek_explosivecharge_uex" aliases="satchel charge uex,uex bomb" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,ekshared_largeshellexplosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="4">
     <!--<Price storeidentifier="merchantMilitary" buyprice="200" />
     <Price storeidentifier="merchantCity" buyprice="250" />
     <Price storeidentifier="merchantOutpost" buyprice="300" />
     <Price storeidentifier="merchantResearch" buyprice="250" />
     <Price storeidentifier="merchantMine" buyprice="350" />-->
     <Price baseprice="200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="fpgacircuit" />
@@ -5245,7 +5245,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <LightComponent LightColor="255,0,0,255" range="20" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
+    <LightComponent LightColor="255,0,0,255" range="80" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
       <sprite texture="%ModDir%/Lights/satchelcharge_light.png" sourcerect="0,0,80,96" alpha="1" />
       <StatusEffect type="OnActive" targettype="This" Condition="-1.667">
         <Sound file="%ModDir%/Items/Weapons/ek_satchelbeep.ogg" loop="true" range="1000" />
@@ -5333,17 +5333,17 @@
       <QualityStat stattype="ExplosionDamage" value="0.15" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_explosivecharge_c4" aliases="satchel charge c4,c4 bomb" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,ekshared_largeshellexplosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="2">
+  <Item name="" identifier="ek_explosivecharge_c4" aliases="satchel charge c4,c4 bomb" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,ekshared_largeshellexplosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="4">
     <!--<Price storeidentifier="merchantMilitary" buyprice="300" />
     <Price storeidentifier="merchantCity" buyprice="350" />-->
     <!--<Price storeidentifier="merchantOutpost" buyprice="400" />-->
     <!--<Price storeidentifier="merchantResearch" buyprice="350" />-->
     <Price baseprice="200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="fpgacircuit" />
@@ -5368,7 +5368,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <LightComponent LightColor="255,0,0,255" range="20" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
+    <LightComponent LightColor="255,0,0,255" range="80" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
       <sprite texture="%ModDir%/Lights/satchelcharge_light.png" sourcerect="0,0,80,96" alpha="1" />
       <StatusEffect type="OnActive" targettype="This" Condition="-1.667">
         <Sound file="%ModDir%/Items/Weapons/ek_satchelbeep.ogg" loop="true" range="1000" />
@@ -5468,18 +5468,18 @@
       </StatusEffect>
     </ItemComponent>
   </Item> -->
-  <Item name="" identifier="ek_thermiteblock" category="Equipment,Weapon" Tags="smallitem,explosive,demolitionsexpert" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft" damagedbyexplosions="true" maxstacksize="8">
-    <!--<PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="0.25"/>-->
+  <Item name="" identifier="ek_thermiteblock" category="Equipment,Weapon" Tags="smallitem,explosive,demolitionsexpert" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft" damagedbyexplosions="true" maxstacksize="16">
+    <!--<PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="0.5"/>-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="50" />
     <Price storeidentifier="merchantCity" buyprice="100" />
     <Price storeidentifier="merchantOutpost" buyprice="125" />
     <Price storeidentifier="merchantResearch" buyprice="75" />-->
     <Price baseprice="60">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" minavailable="5" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" minavailable="15" />
     </Price>
     <!--
 	5
@@ -5524,7 +5524,7 @@
   <Item name="ek_thermite_effect" identifier="ek_thermite_effect" Scale="0.5" impactsoundtag="impact_soft" hideinmenus="true">
     <Sprite texture="%ModDir%/Items/Weapons/weapons_ek.png" sourcerect="0,0,1,1" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="50" density="13" />
-    <LightComponent characterusable="false" LightColor="200,100,50,150" Flicker="0.5" range="400" IsOn="true">
+    <LightComponent characterusable="false" LightColor="200,100,50,150" Flicker="0.5" range="1600" IsOn="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright.png" origin="0.5, 0.5" size="1.0,1.0" />
     </LightComponent>
     <ItemComponent characterusable="false">
@@ -5550,17 +5550,17 @@
     </ItemComponent>
   </Item>
   <!--
-  <Item name="Thermite Grenade" identifier="ek_thermitegrenade" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive" scale="0.5" impactsoundtag="impact_metal_heavy" maxstacksize="8" >
+  <Item name="Thermite Grenade" identifier="ek_thermitegrenade" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive" scale="0.5" impactsoundtag="impact_metal_heavy" maxstacksize="16" >
 
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="1"/>
-    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.25"/>
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="1"/>
+    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="4" spawnprobability="0.5"/>
 
     <Price baseprice="150" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false"/>
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false"/>
     </Price>
 
     <Deconstruct time="15">
@@ -5594,15 +5594,15 @@
 
   </Item>
   -->
-  <Item name="" identifier="ek_thermitegrenade" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert" scale="0.5" impactsoundtag="impact_metal_heavy" maxstacksize="8">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="1" />
-    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.25" />
+  <Item name="" identifier="ek_thermitegrenade" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert" scale="0.5" impactsoundtag="impact_metal_heavy" maxstacksize="16">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="4" spawnprobability="0.5" />
     <Price baseprice="150" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="iron" />
@@ -5648,17 +5648,17 @@
       <QualityStat stattype="ExplosionDamage" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_explosivecharge_thermite" aliases="satchel charge thermite,thermite bomb" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,ekshared_largeshellexplosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="2">
+  <Item name="" identifier="ek_explosivecharge_thermite" aliases="satchel charge thermite,thermite bomb" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,ekshared_largeshellexplosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="4">
     <!--<Price storeidentifier="merchantMilitary" buyprice="200" />
     <Price storeidentifier="merchantCity" buyprice="250" />-->
     <!--<Price storeidentifier="merchantOutpost" buyprice="400" />-->
     <!--<Price storeidentifier="merchantResearch" buyprice="350" />-->
     <Price baseprice="200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="fpgacircuit" />
@@ -5683,7 +5683,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <LightComponent LightColor="255,0,0,255" range="20" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
+    <LightComponent LightColor="255,0,0,255" range="80" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
       <sprite texture="%ModDir%/Lights/satchelcharge_light.png" sourcerect="0,0,80,96" alpha="1" />
       <StatusEffect type="OnActive" targettype="This" Condition="-1.667">
         <Sound file="%ModDir%/Items/Weapons/ek_satchelbeep.ogg" loop="true" range="1000" />
@@ -5747,7 +5747,7 @@
   <Item name="ek_thermite_effect_large" identifier="ek_thermite_effect_large" Scale="0.5" impactsoundtag="impact_soft" hideinmenus="true">
     <Sprite texture="%ModDir%/Items/Weapons/weapons_ek.png" sourcerect="0,0,1,1" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="50" density="13" />
-    <LightComponent characterusable="false" LightColor="200,100,50,200" Flicker="0.5" range="500" IsOn="true">
+    <LightComponent characterusable="false" LightColor="200,100,50,200" Flicker="0.5" range="2000" IsOn="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright.png" origin="0.5, 0.5" size="1.0,1.0" />
     </LightComponent>
     <ItemComponent characterusable="false">
@@ -5775,11 +5775,11 @@
   <Item name="" identifier="ek_laserpistol" aliases="laserpistol,ek laser pistol" category="Equipment,Weapon" cargocontaineridentifier="ek_weapons_case" tags="smallitem,weapon,gun,ek_ammotag_laserpistol,gunsmith,pistolitem" Scale="0.30" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantResearch" buyprice="80" />-->
     <Price baseprice="800" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="ek_weaponparts" outcondition="0.125" />
@@ -5819,7 +5819,7 @@
       <RequiredSkill identifier="weapons" level="30" />
       <StatusEffect type="Always" target="This" condition="100" setvalue="true" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="ek_laserpistol_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -5831,17 +5831,17 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.15" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_laserpistol_mag" aliases="laser pistol magazine,laser pistol mag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,ek_laserpistol_mags,magazine,loadable" impactsoundtag="impact_metal_light" maxstacksize="3">
+  <Item name="" identifier="ek_laserpistol_mag" aliases="laser pistol magazine,laser pistol mag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,ek_laserpistol_mags,magazine,loadable" impactsoundtag="impact_metal_light" maxstacksize="6">
     <PreferredContainer primary="ek_ammotag_laserpistol" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="25" />
     <Price storeidentifier="merchantCity" buyprice="50" />
     <Price storeidentifier="merchantOutpost" buyprice="60" />-->
     <Price baseprice="75" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="zinc" />
@@ -5857,7 +5857,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="640,1232,48,64" origin="0.5,0.5" />
     <Body width="34" height="50" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_laserpistol_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_laserpistol_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_laserpistol_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <StatusEffect type="OnUse" target="This" condition="-4.0" disabledeltatime="true" />
@@ -5901,11 +5901,11 @@
   <Item name="" identifier="ek_laserrifle" aliases="coil rifle" category="Equipment,Weapon" cargocontaineridentifier="ek_weapons_case" tags="mediumitem,weapon,gun,ek_ammotag_laserrifle,gunsmith,mountableweapon" Scale="0.30" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantResearch" buyprice="80" />-->
     <Price baseprice="1200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="ek_weaponparts" outcondition="0.25" />
@@ -5944,7 +5944,7 @@
       <RequiredItems identifier="ek_laserrifle_mags" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="45" />
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="false" itempos="46,-28">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="false" itempos="46,-28">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="ek_laserrifle_mags" />
       <StatusEffect type="OnUse" target="Contained">
@@ -5957,17 +5957,17 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.15" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_laserrifle_mag" aliases="laser rifle mag,laserrifle mag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,ek_laserrifle_mags,magazine,loadable" impactsoundtag="impact_metal_light" maxstacksize="2">
+  <Item name="" identifier="ek_laserrifle_mag" aliases="laser rifle mag,laserrifle mag" scale="0.35" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,ek_laserrifle_mags,magazine,loadable" impactsoundtag="impact_metal_light" maxstacksize="4">
     <PreferredContainer primary="ek_ammotag_laserrifle" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="25" />
     <Price storeidentifier="merchantCity" buyprice="50" />
     <Price storeidentifier="merchantOutpost" buyprice="60" />-->
     <Price baseprice="150" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -5984,7 +5984,7 @@
     <ContainedSprite name="Laser Rifle Mag" allowedcontainertags="weapon" texture="%ModDir%/Items/Weapons/weapons_ek.png" depth="0.56" sourcerect="688,1232,64,64" />
     <Body width="48" height="60" density="50" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="-5" aimable="false" msg="ItemMsgPickUpSelect" canBeCombined="true" />
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_laserrifle_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_laserrifle_round" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_laserrifle_round" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <StatusEffect type="OnUse" target="This" condition="-4" disabledeltatime="true" />
@@ -6028,16 +6028,16 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_hypergolic_fuel" aliases="hypergolic fuel,flamethrower hypergolic fuel" scale="0.35" maxstacksize="4" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem, ek_flamer_tank,ammo,smallarmsammo" impactsoundtag="impact_metal_light" waterproof="true">
+  <Item name="" identifier="ek_hypergolic_fuel" aliases="hypergolic fuel,flamethrower hypergolic fuel" scale="0.35" maxstacksize="8" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem, ek_flamer_tank,ammo,smallarmsammo" impactsoundtag="impact_metal_light" waterproof="true">
     <PreferredContainer primary="ek_ammotag_flamerfuel" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="125" />
     <Price storeidentifier="merchantResearch" buyprice="125" />-->
     <Price baseprice="125" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="5" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="15" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="12">
       <RequiredSkill identifier="mechanical" level="25" />
@@ -6094,7 +6094,7 @@
         </Explosion>
       </StatusEffect>
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="1" SpawnWithId="ek_flame_hypergolic" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="1" maxstacksize="2" SpawnWithId="ek_flame_hypergolic" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ek_flame_hypergolic" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,157,92,27" />
       <StatusEffect type="OnUse" target="This" condition="-1" disabledeltatime="true" />
@@ -6110,7 +6110,7 @@
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,384,64,64" />
     <Sprite texture="Content/Items/Weapons/weapons_new.png" sourcerect="0,0,1,1" depth="0.55" />
     <Body width="16" height="16" density="40" />
-    <LightComponent AllowInGameEditing="false" LightColor="50,255,150,150" canbeselected="false" range="300.0" Flicker="0.5" IsOn="false" castshadows="true" />
+    <LightComponent AllowInGameEditing="false" LightColor="50,255,150,150" canbeselected="false" range="1200" Flicker="0.5" IsOn="false" castshadows="true" />
     <Projectile characterusable="false" launchimpulse="10.0" removeonhit="false" maxtargetstohit="5">
       <Attack firedamage="15.0" structuredamage="0" itemdamage="32" stun="0" targetforce="0" penetration="0.4">
         <Affliction identifier="burn" strength="3" />
@@ -6140,19 +6140,19 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_dynamite" category="Equipment,Weapon" Tags="smallitem,explosive,demolitionsexpert" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft" damagedbyexplosions="true" maxstacksize="8">
-    <!--<PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="0.25"/>-->
+  <Item name="" identifier="ek_dynamite" category="Equipment,Weapon" Tags="smallitem,explosive,demolitionsexpert" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft" damagedbyexplosions="true" maxstacksize="16">
+    <!--<PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="0.5"/>-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="50" />
     <Price storeidentifier="merchantCity" buyprice="100" />
     <Price storeidentifier="merchantOutpost" buyprice="125" />
     <Price storeidentifier="merchantResearch" buyprice="75" />
     <Price storeidentifier="merchantMine" buyprice="125" />-->
     <Price baseprice="60">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" minavailable="18" />
     </Price>
     <!--<Deconstruct time="15">
       <Item identifier="sulphuricacid" outcondition="0.25"/>
@@ -6212,7 +6212,7 @@
         <Conditional Condition="lt 0.5" />
       </StatusEffect>
     </Throwable>
-    <LightComponent LightColor="0.0,0.0,0.0,0.0" range="1" IsOn="false" castshadows="false">
+    <LightComponent LightColor="0.0,0.0,0.0,0.0" range="4" IsOn="false" castshadows="false">
       <StatusEffect type="OnUse" targettype="This" IsOn="true">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
         <sound file="Content/Items/Tools/FlareIgnite.ogg" range="800.0" />
@@ -6237,18 +6237,18 @@
       <QualityStat stattype="ExplosionDamage" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_explosivecharge_dynamite" aliases="satchel charge dynamite,dynamite bomb" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,ekshared_largeshellexplosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="2">
+  <Item name="" identifier="ek_explosivecharge_dynamite" aliases="satchel charge dynamite,dynamite bomb" category="Equipment,Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,explosive,ekshared_largeshellexplosive,demolitionsexpert" scale="0.32" impactsoundtag="impact_metal_heavy" isshootable="true" maxstacksize="4">
     <!--<Price storeidentifier="merchantMilitary" buyprice="200" />
     <Price storeidentifier="merchantCity" buyprice="250" />
     <Price storeidentifier="merchantOutpost" buyprice="300" />
     <Price storeidentifier="merchantResearch" buyprice="250" />
     <Price storeidentifier="merchantMine" buyprice="350" />-->
     <Price baseprice="200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" minavailable="9" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="fpgacircuit" />
@@ -6274,7 +6274,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <LightComponent LightColor="255,0,0,255" range="20" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
+    <LightComponent LightColor="255,0,0,255" range="80" blinkfrequency="1" powerconsumption="0" IsOn="false" canbeselected="false" AllowInGameEditing="false">
       <sprite texture="%ModDir%/Lights/satchelcharge_light.png" sourcerect="0,0,80,96" alpha="1" />
       <StatusEffect type="OnActive" targettype="This" Condition="-1.667">
         <Sound file="%ModDir%/Items/Weapons/ek_satchelbeep.ogg" loop="true" range="1000" />
@@ -6367,11 +6367,11 @@
     <Price storeidentifier="merchantCity" buyprice="175" />
     <Price storeidentifier="merchantOutpost" buyprice="180" />-->
     <Price baseprice="100" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="ek_weaponparts" outcondition="0.125" />
@@ -6433,12 +6433,12 @@
         <SpawnItem identifiers="ek_revolverammo_riot" spawnposition="ThisInventory" />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer autofill="False" capacity="6" maxstacksize="1" hideitems="true" allowuioverlap="true">
+    <ItemContainer autofill="False" capacity="13" maxstacksize="2" hideitems="true" allowuioverlap="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="16,64,120,24" />
       <Containable identifiers="ek_revolverammo,ek_revolverloader,ek_ammotag357,revolverammo" />
     </ItemContainer>
     <!-- Todo: wait for this to work.
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" canbeselected="false" hideitems="true" itempos="0,0" allowuioverlap="true" >
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" canbeselected="false" hideitems="true" itempos="0,0" allowuioverlap="true" >
       <GuiFrame relativesize="0,0" anchor="TopCenter" style="ItemUI" />
       <Containable identifiers="ek_revolverloader" />
       <StatusEffect type="Always" target="Contained" targetidentifiers="ek_revolverloader" disabledeltatime="true" delay="0.02" stackable="false">
@@ -6451,17 +6451,17 @@
       <QualityStat stattype="FirepowerMultiplier" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_revolverammo" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverammo,ek_ammotag357,ammo,smallarmsammo,pistolammoitem" impactsoundtag="impact_metal_light" maxstacksize="12">
+  <Item name="" identifier="ek_revolverammo" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverammo,ek_ammotag357,ammo,smallarmsammo,pistolammoitem" impactsoundtag="impact_metal_light" maxstacksize="24">
     <PreferredContainer primary="ek_ammotag_357" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="20" />
     <Price storeidentifier="merchantCity" buyprice="30" />
     <Price storeidentifier="merchantOutpost" buyprice="35" />-->
     <Price baseprice="20" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="12" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="12" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="18" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="36" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="36" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="54" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="7">
       <Item identifier="lead" outcondition="0.125" />
@@ -6505,18 +6505,18 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_revolverspeedloader" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverloader,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="3" hideinmenus="true">
+  <Item name="" identifier="ek_revolverspeedloader" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverloader,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="6" hideinmenus="true">
     <PreferredContainer primary="ek_ammotag_357" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="120" />
     <Price storeidentifier="merchantCity" buyprice="180" />
     <Price storeidentifier="merchantOutpost" buyprice="210" />-->
     <!--
     <Price baseprice="120" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false"/>
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false"/>
     </Price>
 	-->
     <Deconstruct time="7">
@@ -6542,17 +6542,17 @@
       </StatusEffect>
     </Pickable>
   </Item>
-  <Item name="" identifier="ek_revolverammo_physicorium" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverammo,ek_ammotag357,ammo,smallarmsammo,pistolammoitem" impactsoundtag="impact_metal_light" maxstacksize="12">
+  <Item name="" identifier="ek_revolverammo_physicorium" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverammo,ek_ammotag357,ammo,smallarmsammo,pistolammoitem" impactsoundtag="impact_metal_light" maxstacksize="24">
     <PreferredContainer primary="ek_ammotag_357" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="20" />
     <Price storeidentifier="merchantCity" buyprice="30" />
     <Price storeidentifier="merchantOutpost" buyprice="35" />-->
     <Price baseprice="50" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="18" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="54" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="7">
       <Item identifier="physicorium" outcondition="0.125" />
@@ -6596,18 +6596,18 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_revolverspeedloader_physicorium" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverloader,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="3" hideinmenus="true">
+  <Item name="" identifier="ek_revolverspeedloader_physicorium" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverloader,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="6" hideinmenus="true">
     <PreferredContainer primary="ek_ammotag_357" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="120" />
     <Price storeidentifier="merchantCity" buyprice="180" />
     <Price storeidentifier="merchantOutpost" buyprice="210" />-->
     <!--
     <Price baseprice="300" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2"/>
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" sold="false"/>
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false"/>
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6"/>
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" sold="false"/>
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false"/>
     </Price>
 	-->
     <Deconstruct time="7">
@@ -6633,17 +6633,17 @@
       </StatusEffect>
     </Pickable>
   </Item>
-  <Item name="" identifier="ek_revolverammo_riot" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverammo,ek_ammotag357,ammo,smallarmsammo,pistolammoitem" impactsoundtag="impact_metal_light" maxstacksize="12">
+  <Item name="" identifier="ek_revolverammo_riot" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverammo,ek_ammotag357,ammo,smallarmsammo,pistolammoitem" impactsoundtag="impact_metal_light" maxstacksize="24">
     <PreferredContainer primary="ek_ammotag_357" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="17" />
     <Price storeidentifier="merchantCity" buyprice="25" />
     <Price storeidentifier="merchantOutpost" buyprice="30" />-->
     <Price baseprice="17" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="18" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="54" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="7">
       <Item identifier="rubber" outcondition="0.125" />
@@ -6678,18 +6678,18 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_revolverspeedloader_riot" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverloader,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="3" hideinmenus="true">
+  <Item name="" identifier="ek_revolverspeedloader_riot" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.32" tags="smallitem,ek_revolverloader,ammo,smallarmsammo" impactsoundtag="impact_metal_light" maxstacksize="6" hideinmenus="true">
     <PreferredContainer primary="ek_ammotag_357" />
     <!--<Price storeidentifier="merchantMilitary" buyprice="105" />
     <Price storeidentifier="merchantCity" buyprice="150" />
     <Price storeidentifier="merchantOutpost" buyprice="180" />-->
     <!--
     <Price baseprice="105" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false"/>
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false"/>
     </Price>
 	-->
     <Deconstruct time="7">
@@ -6713,13 +6713,13 @@
       </StatusEffect>
     </Pickable>
   </Item>
-  <Item name="" identifier="ek_flashgrenade" aliases="ek flashbang,flashbang ek" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert" scale="0.5" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ek_flashgrenade" aliases="ek flashbang,flashbang ek" category="Equipment,Weapon" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert" scale="0.5" impactsoundtag="impact_metal_light" maxstacksize="16">
     <Price baseprice="110" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -6769,7 +6769,7 @@
       <StatusEffect type="OnUse" target="This" DisplaySideBySideWhenLinked="true" />
     </RepairTool>
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" throwforce="4.0" msg="ItemMsgPickUpSelect"></Throwable>
-    <LightComponent characterusable="false" LightColor="255,255,255,255" range="1200" IsOn="false">
+    <LightComponent characterusable="false" LightColor="255,255,255,255" range="4800" IsOn="false">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_hires.png" origin="0.5, 0.5" size="1.0,1.0" />
     </LightComponent>
     <Quality>
@@ -6777,15 +6777,15 @@
       <QualityStat stattype="ExplosionDamage" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="ek_spear_rocket" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" maxstacksize="8">
-    <PreferredContainer primary="armcab" minamount="0" maxamount="5" spawnprobability="0.25" />
-    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="3" spawnprobability="0.25" />
+  <Item name="" identifier="ek_spear_rocket" category="Equipment,Weapon" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" maxstacksize="16">
+    <PreferredContainer primary="armcab" minamount="0" maxamount="10" spawnprobability="0.5" />
+    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="6" spawnprobability="0.5" />
     <Price baseprice="35" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="36" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="steel" />
@@ -6825,16 +6825,16 @@
     </Projectile>
   </Item>
   <!--
-  <Item name="" identifier="ek_divinggrenade" category="Equipment,Weapon" maxstacksize="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive" scale="0.5" 
+  <Item name="" identifier="ek_divinggrenade" category="Equipment,Weapon" maxstacksize="16" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive" scale="0.5" 
    impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="5" spawnprobability="1"/>
-    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.25"/>
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="10" spawnprobability="1"/>
+    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="4" spawnprobability="0.5"/>
     <Price baseprice="250" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false"/>
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="copper" />
@@ -6863,23 +6863,23 @@
         <Remove />
       </StatusEffect>
     </ItemComponent>
-    <LightComponent LightColor="255,25,25,255" range="20" IsOn="false" blinkfrequency="4" />
+    <LightComponent LightColor="255,25,25,255" range="80" IsOn="false" blinkfrequency="4" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" throwforce="6.0" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnSecondaryUse" target="This" Condition="-100.0" delay="1.6" disabledeltatime="true" />
       <StatusEffect type="OnSecondaryUse" target="This" setvalue="true" IsOn="true" disabledeltatime="true" />
     </Throwable>
   </Item>
   -->
-  <Item name="" identifier="ek_divinggrenade" category="Equipment,Weapon" maxstacksize="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert" scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="5" spawnprobability="1" />
-    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.25" />
+  <Item name="" identifier="ek_divinggrenade" category="Equipment,Weapon" maxstacksize="16" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert" scale="0.5" impactsoundtag="impact_metal_heavy">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="10" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="4" spawnprobability="0.5" />
     <Price baseprice="250" soldeverywhere="false">
       <!-- 145 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	22
@@ -6921,7 +6921,7 @@
         <RequiredItems items="detonator" type="Container" />
       </StatusEffect>
     </ItemComponent>
-    <LightComponent LightColor="255,25,25,255" range="20" IsOn="false" blinkfrequency="4" />
+    <LightComponent LightColor="255,25,25,255" range="80" IsOn="false" blinkfrequency="4" />
     <RepairTool>
       <StatusEffect type="OnUse" target="This" stackable="false" delay="0.1">
         <Conditional DisplaySideBySideWhenLinked="ne true" />
@@ -6955,19 +6955,19 @@
       </StatusEffect>
     </ItemComponent>
   </Item>
-  <Item name="" identifier="ek_40mmsmoke" category="Equipment,Weapon" maxstacksize="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade,40mmgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_40mmsmoke" category="Equipment,Weapon" maxstacksize="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade,40mmgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="grenadelauncher" />
     <PreferredContainer primary="secarmcab" />
-    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.15" />
-    <PreferredContainer secondary="wrecksecarmcab" minamount="0" maxamount="3" spawnprobability="0.15" />
+    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="4" spawnprobability="0.3" />
+    <PreferredContainer secondary="wrecksecarmcab" minamount="0" maxamount="6" spawnprobability="0.3" />
     <PreferredContainer primary="armcab" secondary="locker" />
     <Price baseprice="55" soldeverywhere="false">
       <!-- 50 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	5
@@ -7014,19 +7014,19 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_40mmbeehive" category="Equipment,Weapon" maxstacksize="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade,40mmgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_40mmbeehive" category="Equipment,Weapon" maxstacksize="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade,40mmgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="grenadelauncher" />
     <PreferredContainer primary="secarmcab" />
-    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="wrecksecarmcab" minamount="0" maxamount="3" spawnprobability="0.2" />
+    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="wrecksecarmcab" minamount="0" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer primary="armcab" secondary="locker" />
     <Price baseprice="60" soldeverywhere="false">
       <!-- 39 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	16.25
@@ -7079,19 +7079,19 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ek_40mmthermite" category="Equipment,Weapon" maxstacksize="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade,40mmgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ek_40mmthermite" category="Equipment,Weapon" maxstacksize="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade,40mmgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="grenadelauncher" />
     <PreferredContainer primary="secarmcab" />
-    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.15" />
-    <PreferredContainer secondary="wrecksecarmcab" minamount="0" maxamount="3" spawnprobability="0.15" />
+    <PreferredContainer secondary="wreckarmcab" minamount="0" maxamount="4" spawnprobability="0.3" />
+    <PreferredContainer secondary="wrecksecarmcab" minamount="0" maxamount="6" spawnprobability="0.3" />
     <PreferredContainer primary="armcab" secondary="locker" />
     <Price baseprice="90" soldeverywhere="false">
       <!-- 65 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	5
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_weapons_melee.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_weapons_melee.xml
index c460818b..37c500c3 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_weapons_melee.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/Weapons/ek_weapons_melee.xml	
@@ -7,11 +7,11 @@
     <Price storeidentifier="merchantOutpost" buyprice="35" />
     <Price storeidentifier="merchantMine" buyprice="40" />-->
     <Price baseprice="35">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="3" />
     </Price>
     <Deconstruct time="7">
       <Item identifier="steel" />
@@ -40,7 +40,7 @@
       </Attack>
     </MeleeWeapon>
     <!-- MeleeWeapon does not support OnUse, so use a light component as a workaround -->
-    <LightComponent AllowInGameEditing="false" lightcolor="0,0,0,0" canbeselected="false" range="10.0" IsOn="true" castshadows="false">
+    <LightComponent AllowInGameEditing="false" lightcolor="0,0,0,0" canbeselected="false" range="40" IsOn="true" castshadows="false">
       <StatusEffect type="OnUse" target="This" disabledeltatime="false" targettype="This" IsOn="false">
         <Conditional IsOn="eq True" targetitemcomponent="LightComponent" />
         <Explosion range="160.0" ballastfloradamage="15" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" applyFireEffects="false" />
@@ -58,11 +58,11 @@
     <!--<Price storeidentifier="merchantMilitary" buyprice="100" />
     <Price storeidentifier="merchantOutpost" buyprice="120" />-->
     <Price baseprice="100">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" minavailable="0" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="0" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" minavailable="0" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="0" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -106,11 +106,11 @@
     <Price storeidentifier="merchantMilitary" buyprice="30" />
     <Price storeidentifier="merchantOutpost" buyprice="30" />-->
     <Price baseprice="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="false" />
     </Price>
     <Deconstruct time="7">
       <Item identifier="aluminium" />
@@ -137,14 +137,14 @@
   </Item>
   <!--
   <Item name="Throwing Knives" identifier="ek_throwingknife" aliases="throwing knife,ek throwing knife,ek throwing knives" scale="0.22" category="Equipment,Weapon" tags="smallitem,weapon" 
-  description="" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" HideConditionBar="true" maxstacksize="8" >
+  description="" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" HideConditionBar="true" maxstacksize="16" >
 
 	<Price baseprice="8" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="5"  maxavailable="15"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="10"  maxavailable="15"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="0" maxavailable="10" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="10"  maxavailable="15"/>
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="0" maxavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="15"  maxavailable="15"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="30"  maxavailable="15"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="0" maxavailable="10" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="30"  maxavailable="15"/>
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="0" maxavailable="10" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.25" />
@@ -192,8 +192,8 @@
       </StatusEffect>
     </Projectile>
 
-	<ItemContainer itempos="0,0" autofill="False" hideitems="true" capacity="1" maxstacksize="1" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
-      <Containable items="ek_throwingknife" />
+	<ItemContainer itempos="0,0" autofill="False" hideitems="true" capacity="1" maxstacksize="2" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+      <Containable items="ek_throwingknife,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
 	
   </Item>
@@ -202,11 +202,11 @@
   <Item name="Throwing Knives" identifier="ek_throwingknife" aliases="throwing knife,ek throwing knife,ek throwing knives" scale="0.22" category="Equipment,Weapon" tags="smallitem,weapon" 
   description="" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" HideConditionBar="true" >
     <Price baseprice="85" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="1"  maxavailable="3"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2"  maxavailable="4"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="0" maxavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2"  maxavailable="4"/>
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="0" maxavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="3"  maxavailable="3"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6"  maxavailable="4"/>
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="0" maxavailable="2" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6"  maxavailable="4"/>
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="0" maxavailable="2" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" copycondition="true" />
@@ -253,17 +253,17 @@
     </Projectile>
 
     <ItemContainer itempos="0,0" autofill="False" hideitems="true" capacity="1" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
-      <Containable items="ek_throwingknife" />
+      <Containable items="ek_throwingknife,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 -->
-  <Item name="" identifier="ek_throwingknife" aliases="throwing knife,ek throwing knife,ek throwing knives" scale="0.22" category="Equipment,Weapon" tags="smallitem,weapon" description="" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" HideConditionBar="true" maxstacksize="6">
+  <Item name="" identifier="ek_throwingknife" aliases="throwing knife,ek throwing knife,ek throwing knives" scale="0.22" category="Equipment,Weapon" tags="smallitem,weapon" description="" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" HideConditionBar="true" maxstacksize="12">
     <Price baseprice="12" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="8" maxavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="16" maxavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" maxavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="24" maxavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="48" maxavailable="4" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="36" maxavailable="4" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" outcondition="0.25" />
@@ -304,7 +304,7 @@
       </StatusEffect>
     </Projectile>
     <ItemContainer itempos="0,0" autofill="False" hideitems="true" capacity="1" drawinventory="false" canbeselected="false" removecontaineditemsondeconstruct="true">
-      <Containable items="ek_throwingknife" />
+      <Containable items="ek_throwingknife,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,0,1,1" />
     </ItemContainer>
   </Item>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/overwrite_turrets.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/overwrite_turrets.xml
index 31a9962c..4060a480 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/overwrite_turrets.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/overwrite_turrets.xml	
@@ -17,7 +17,7 @@
         <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
         <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
         <RequiredSkill identifier="weapons" level="50" />
-        <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+        <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
           <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.05,1.05" />
         </LightComponent>
         <ParticleEmitter particle="muzzleflashcoilgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -53,7 +53,7 @@
         <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
         <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
         <RequiredSkill identifier="weapons" level="50" />
-        <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+        <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
           <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.05,1.05" />
         </LightComponent>
         <ParticleEmitter particle="muzzleflashrailgun" particleamount="1" velocitymin="50" velocitymax="100" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/overwrite_turrets_legacy.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/overwrite_turrets_legacy.xml
index 5c97062b..d998af4e 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/overwrite_turrets_legacy.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1769403760/Items/overwrite_turrets_legacy.xml	
@@ -17,7 +17,7 @@
         <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
         <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
         <RequiredSkill identifier="weapons" level="50" />
-        <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+        <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
           <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.05,1.05" />
         </LightComponent>
         <ParticleEmitter particle="muzzleflashcoilgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -52,7 +52,7 @@
         <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
         <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
         <RequiredSkill identifier="weapons" level="50" />
-        <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+        <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
           <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.05,1.05" />
         </LightComponent>
         <ParticleEmitter particle="muzzleflashrailgun" particleamount="1" velocitymin="50" velocitymax="100" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Containers/ekutility_containers.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Containers/ekutility_containers.xml
index f8336c38..37ce431c 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Containers/ekutility_containers.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Containers/ekutility_containers.xml	
@@ -6,11 +6,11 @@
     <Price storeidentifier="merchantMilitary" buyprice="50" />
     <Price storeidentifier="merchantResearch" buyprice="50" />-->
     <Price baseprice="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -27,7 +27,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="12" slotsperrow="6" canbeselected="true" hideitems="true">
+    <ItemContainer autofill="False" capacity="26" slotsperrow="6" canbeselected="true" hideitems="true">
       <GuiFrame relativesize="0.25,0.22" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,mediumitem">
         <StatusEffect type="OnContaining" target="This" Condition="-10.0" disabledeltatime="true">
@@ -47,11 +47,11 @@
     <Price storeidentifier="merchantMilitary" buyprice="80" />
     <Price storeidentifier="merchantResearch" buyprice="80" />-->
     <Price baseprice="60" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -70,7 +70,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="21" slotsperrow="7" canbeselected="true" hideitems="true">
+    <ItemContainer autofill="False" capacity="46" slotsperrow="7" canbeselected="true" hideitems="true">
       <GuiFrame relativesize="0.28,0.28" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,mediumitem">
         <StatusEffect type="OnContaining" target="This" Condition="-10.0" disabledeltatime="true">
@@ -89,11 +89,11 @@
     <Price storeidentifier="merchantOutpost" buyprice="60" />
     <Price storeidentifier="merchantMilitary" buyprice="40" />-->
     <Price baseprice="50">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="5" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="15" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -109,7 +109,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.55" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="6" maxstacksize="1" slotsperrow="6" itempos="33,-96" iteminterval="31.75,0" itemrotation="90" containedspritedepth="0.8" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="13" maxstacksize="2" slotsperrow="4" itempos="33,-96" iteminterval="31.75,0" itemrotation="90" containedspritedepth="0.8" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.22" anchor="Center" style="ItemUI" />
       <Containable identifiers="railgunshell,nuclearshell,railgunammo,ek_railguncontainable" />
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
@@ -121,11 +121,11 @@
     <Price storeidentifier="merchantOutpost" buyprice="60" />
     <Price storeidentifier="merchantMilitary" buyprice="40" />-->
     <Price baseprice="120" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="5" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="15" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -148,7 +148,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.35" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="12" maxstacksize="1" slotsperrow="6" itempos="124,-212" iteminterval="0,18.5" itemrotation="0" containedspritedepth="0.78" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="26" maxstacksize="2" slotsperrow="6" itempos="124,-212" iteminterval="0,18.5" itemrotation="0" containedspritedepth="0.78" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="railgunshell,nuclearshell,railgunammo,ek_railguncontainable" />
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
@@ -160,11 +160,11 @@
     <Price storeidentifier="merchantOutpost" buyprice="60" />
     <Price storeidentifier="merchantMilitary" buyprice="40" />-->
     <Price baseprice="50">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -186,7 +186,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.55" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="3" maxstacksize="1" itempos="88,-238" iteminterval="0,90" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="7" maxstacksize="2" itempos="88,-238" iteminterval="0,90" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource" />
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
@@ -198,11 +198,11 @@
     <Price storeidentifier="merchantOutpost" buyprice="60" />
     <Price storeidentifier="merchantMilitary" buyprice="40" />-->
     <Price baseprice="65" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -224,7 +224,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.55" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="4" maxstacksize="1" itempos="88,-322" iteminterval="0,92" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="9" maxstacksize="2" itempos="88,-322" iteminterval="0,92" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource" />
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
@@ -237,8 +237,8 @@
     <Price storeidentifier="merchantMilitary" buyprice="40" />-->
     <Price baseprice="160" soldeverywhere="false" minleveldifficulty="25">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
     </Price>
@@ -273,14 +273,14 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.3" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="3" maxstacksize="1" itempos="88,-312" iteminterval="0,90" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.845">
+    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="7" maxstacksize="2" itempos="88,-312" iteminterval="0,90" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.845">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="crate,ita_cratebulk,cratetall,ita_eggcrate,ita_eggcrate2,ek_crateperishable" />
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
       <StatusEffect type="OnNotContained" target="This" setvalue="true" drawinventory="true" />
       <StatusEffect type="Always" targettype="Contained" targets="ita_eggcrate2" Condition="12.5" />
     </ItemContainer>
-    <LightComponent range="10.0" lightcolor="175,175,175,0" powerconsumption="250" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.4">
+    <LightComponent range="40" lightcolor="175,175,175,0" powerconsumption="250" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.4">
       <sprite texture="%ModDir%/Items/Containers/ekutility_containers2.png" depth="0.025" sourcerect="184,304,144,344" origin="0.5,0.5" alpha="1.0" />
       <StatusEffect type="OnActive" targettype="Contained" targets="ek_crateperishable,ita_eggcrate" Condition="0.15" />
       <StatusEffect type="OnActive" targettype="Contained" targets="ita_eggcrate2" Condition="2.55" />
@@ -314,11 +314,11 @@
     <Price storeidentifier="merchantResearch" buyprice="150" />
     <Price storeidentifier="merchantMine" buyprice="200" />-->
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" minavailable="30" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -326,11 +326,11 @@
     <Sprite texture="%ModDir%/Items/Containers/ekutility_containers.png" depth="0.54" sourcerect="0,464,112,80" origin="0.5,0.5" />
     <Body width="100" height="68" density="12" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="0,-20" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" capacity="6" slotsperrow="3" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="13" slotsperrow="4" maxstacksize="2" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="1,240,112,16" />
-      <Containable identifiers="ek_chemlight,flare,smallarmsammo" excludeditems="toolbox" />
+      <Containable identifiers="ek_chemlight,flare,smallarmsammo"ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="50" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="200" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="0.3" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-30.0" delay="0.01" stackable="false">
         <Conditional Condition="gt 71" />
@@ -350,11 +350,11 @@
     <Price storeidentifier="merchantResearch" buyprice="150" />
     <Price storeidentifier="merchantMine" buyprice="200" />-->
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" minavailable="30" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -362,11 +362,11 @@
     <Sprite texture="%ModDir%/Items/Containers/ekutility_containers.png" depth="0.54" sourcerect="112,464,112,80" origin="0.5,0.5" />
     <Body width="100" height="68" density="12" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="0,-20" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" capacity="6" slotsperrow="3" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="13" slotsperrow="4" maxstacksize="2" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="1,240,112,16" />
-      <Containable identifiers="ek_chemlight,flare,smallarmsammo" excludeditems="toolbox" />
+      <Containable identifiers="ek_chemlight,flare,smallarmsammo"ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="50" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="200" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="0.3" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-30.0" delay="0.01" stackable="false">
         <Conditional Condition="gt 71" />
@@ -386,11 +386,11 @@
     <Price storeidentifier="merchantResearch" buyprice="150" />
     <Price storeidentifier="merchantMine" buyprice="200" />-->
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" minavailable="30" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -398,11 +398,11 @@
     <Sprite texture="%ModDir%/Items/Containers/ekutility_containers.png" depth="0.54" sourcerect="0,544,112,80" origin="0.5,0.5" />
     <Body width="100" height="68" density="12" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="0,-20" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" capacity="6" slotsperrow="3" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="13" slotsperrow="4" maxstacksize="2" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="1,240,112,16" />
-      <Containable identifiers="ek_chemlight,flare,smallarmsammo" excludeditems="toolbox" />
+      <Containable identifiers="ek_chemlight,flare,smallarmsammo"ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="50" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="200" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="0.3" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-30.0" delay="0.01" stackable="false">
         <Conditional Condition="gt 71" />
@@ -422,11 +422,11 @@
     <Price storeidentifier="merchantResearch" buyprice="150" />
     <Price storeidentifier="merchantMine" buyprice="200" />-->
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" minavailable="30" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -434,11 +434,11 @@
     <Sprite texture="%ModDir%/Items/Containers/ekutility_containers.png" depth="0.54" sourcerect="112,544,112,80" origin="0.5,0.5" />
     <Body width="100" height="68" density="12" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="10,-70" handle1="0,-20" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer autofill="False" capacity="6" slotsperrow="3" maxstacksize="1" canbeselected="false" hideitems="true">
+    <ItemContainer autofill="False" capacity="13" slotsperrow="4" maxstacksize="2" canbeselected="false" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="1,240,112,16" />
-      <Containable identifiers="ek_chemlight,flare,smallarmsammo" excludeditems="toolbox" />
+      <Containable identifiers="ek_chemlight,flare,smallarmsammo"ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="50" IsOn="true">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="200" IsOn="true">
       <StatusEffect type="OnActive" target="This" targetitemcomponent="LightComponent" IsOn="false" delay="0.3" />
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" Condition="-30.0" delay="0.01" stackable="false">
         <Conditional Condition="gt 71" />
@@ -458,11 +458,11 @@
     <Price storeidentifier="merchantResearch" buyprice="75" />
     <Price storeidentifier="merchantMine" buyprice="85" />-->
     <Price baseprice="75" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -479,7 +479,7 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="80,-70" holdangle="2" handle1="-108,76" handle2="-108,76" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.6" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="4" slotsperrow="2" maxstacksize="1" itempos="-40,16" iteminterval="80,1" itemrotation="90" itemsperrow="2" canbeselected="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="9" slotsperrow="3" maxstacksize="2" itempos="-40,16" iteminterval="80,1" itemrotation="90" itemsperrow="2" canbeselected="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
       <!--<GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" /> containedspritedepth="0.58"-->
       <Containable identifiers="depthchargeammo,crate,metalcrate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,divingsuit,combatdivingsuit,abyssdivingsuit,pucs,slipsuit,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource" />
     </ItemContainer>
@@ -491,11 +491,11 @@
     <Price storeidentifier="merchantResearch" buyprice="75" />
     <Price storeidentifier="merchantMine" buyprice="85" />-->
     <Price baseprice="75" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -512,7 +512,7 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="40,-88" holdangle="25" handle1="-40,82" handle2="-40,82" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.6" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="6" slotsperrow="3" maxstacksize="1" itempos="-6,-2" iteminterval="21,1" itemsperrow="3" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="13" slotsperrow="4" maxstacksize="2" itempos="-6,-2" iteminterval="21,1" itemsperrow="3" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
       <!--<GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />-->
       <Containable identifiers="railgunshell,nuclearshell,railgunammo,ek_railguncontainable">
         <!--<StatusEffect type="OnContaining" target="Character" SpeedMultiplier="0.5" setvalue="true" />-->
@@ -521,11 +521,11 @@
   </Item>
   <Item name="" identifier="ekutility_handtruck_reactorfuel" category="Equipment" Tags="reactor,ekutility_compatiblefuelstorage" pickdistance="75" scale="0.6">
     <Price baseprice="100">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -549,7 +549,7 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="52,-82" holdangle="25" handle1="-54,86" handle2="-54,86" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.6" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="true" drawinventory="true" capacity="3" slotsperrow="3" maxstacksize="1" canbeselected="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" hideitems="true" drawinventory="true" capacity="7" slotsperrow="3" maxstacksize="2" canbeselected="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
       <Containable identifiers="smallitem,fuelrod,reactorfuel" />
     </ItemContainer>
   </Item>
@@ -557,11 +557,11 @@
     <!--<Price storeidentifier="merchantCity" buyprice="240" />
     <Price storeidentifier="merchantResearch" buyprice="140" />-->
     <Price baseprice="180" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.6" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="4.8" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="titaniumaluminiumalloy" />
@@ -582,7 +582,7 @@
     <Holdable slots="RightHand+LeftHand" holdpos="55,-20" handle1="-25,33" handle2="-25,33" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="1" slotsperrow="1" maxstacksize="1" canbeselected="false" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer autofill="False" capacity="1" slotsperrow="1" maxstacksize="2" canbeselected="false" hideitems="true" msg="ItemMsgInteractSelect">
       <Containable identifiers="alienartifact">
         <StatusEffect type="OnContaining" target="This" Condition="-5.0" disabledeltatime="true">
           <Conditional Condition="eq 100" />
@@ -594,15 +594,15 @@
         <Conditional Condition="eq 95" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent LightColor="250,220,190,100" range="125" IsOn="true" />
+    <LightComponent LightColor="250,220,190,100" range="500" IsOn="true" />
   </Item>
   <Item name="" identifier="ekutility_storagecrate" tags="crate" scale="0.5" fireproof="true" waterproof="true" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy">
     <Price baseprice="110" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.6" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="4.8" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="6" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="aluminium" />
@@ -618,17 +618,17 @@
     <Sprite texture="%ModDir%/Items/Containers/ekutility_containers.png" depth="0.54" sourcerect="224,416,160,96" origin="0.5,0.5" />
     <Body width="150" height="85" density="10" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="30" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem,mediumitem" />
+    <ItemContainer capacity="66" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
-  <Item name="" identifier="ekutility_crateblocker" tags="mediumitem,crate" scale="0.5" fireproof="true" waterproof="true" maxstacksize="4" pickdistance="150" impactsoundtag="impact_metal_heavy">
+  <Item name="" identifier="ekutility_crateblocker" tags="mediumitem,crate" scale="0.5" fireproof="true" waterproof="true" maxstacksize="8" pickdistance="150" impactsoundtag="impact_metal_heavy">
     <Price baseprice="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" minavailable="5" />
-      <Price storeidentifier="merchantcity" multiplier="1.6" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" minavailable="15" />
+      <Price storeidentifier="merchantcity" multiplier="4.8" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="12" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="aluminium" />
@@ -643,11 +643,11 @@
   </Item>
   <Item name="" identifier="ekutility_materiallocker" tags="cabinet" pickdistance="150" scale="0.5" HideConditionBar="true">
     <Price baseprice="120" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -670,7 +670,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.4" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="35" slotsperrow="7" canbeselected="true" hideitems="true">
+    <ItemContainer autofill="False" capacity="77" slotsperrow="9" canbeselected="true" hideitems="true">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,mediumitem">
         <StatusEffect type="OnContaining" target="This" Condition="-10.0" disabledeltatime="true">
@@ -692,11 +692,11 @@
   <!-- Old Crate Transport Mule -->
   <Item name="" identifier="ekutility_mulecargo" category="Equipment,Diving" Tags="container,provocative" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="400" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="3" />
     </Price>
     <!--
 	150
@@ -729,11 +729,11 @@
     <AiTarget soundrange="2500" sonarlabel="Crate Transport Mule" />
     <Propulsion force="140" usablein="water" particles="bubbles">
       <sound file="%ModDir%/Items/Containers/mulescooterloop.ogg" type="OnUse" range="500.0" loop="true" />
-      <LightComponent LightColor="255,200,150,150" range="1000" Flicker="0.2" Flickerspeed="0.4" AllowInGameEditing="false">
+      <LightComponent LightColor="255,200,150,150" range="4000" Flicker="0.2" Flickerspeed="0.4" AllowInGameEditing="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.05, 0.5" size="1.0,1.0" />
       </LightComponent>
     </Propulsion>
-    <LightComponent LightColor="255,200,150,100" range="600" powerconsumption="0" Flicker="0.2" Flickerspeed="0.4" IsOn="false" castshadows="true" canbeselected="false" AllowInGameEditing="false" />
+    <LightComponent LightColor="255,200,150,100" range="2400" powerconsumption="0" Flicker="0.2" Flickerspeed="0.4" IsOn="false" castshadows="true" canbeselected="false" AllowInGameEditing="false" />
     <!--
 	<CustomInterface canbeselected="false" drawhudwhenequipped="true">
       <GuiFrame relativesize="0.12,0.08" anchor="BottomLeft" absoluteoffset="20,128" style="ItemUI" />
@@ -751,18 +751,18 @@
       </TickBox>
       <TextBox text="Crate Transport Mule" propertyname="SonarLabel" />
     </CustomInterface>
-    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="4" slotsperrow="2" maxstacksize="1" itempos="-74,8" iteminterval="152,1" itemrotation="0" itemsperrow="2" canbeselected="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="9" slotsperrow="3" maxstacksize="2" itempos="-74,8" iteminterval="152,1" itemrotation="0" itemsperrow="2" canbeselected="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
       <!--<Containable identifiers="depthchargeammo,crate,ek_ammocrate_small,coilgunammobox,coilgunammo,divingsuit,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource" />-->
       <Containable identifiers="depthchargeammo,crate,metalcrate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,divingsuit,combatdivingsuit,abyssdivingsuit,pucs,slipsuit,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekutility_securelockercaptain" tags="cabinet" pickdistance="150" scale="0.5" fireproof="true" waterproof="true" HideConditionBar="true">
     <Price baseprice="120">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!-- 
 	20
@@ -787,7 +787,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="15" canbeselected="true" hideitems="true">
+    <ItemContainer autofill="False" capacity="33" canbeselected="true" hideitems="true">
       <RequiredItem identifier="id_captain,com,master,jobid:captain" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,mediumitem">
@@ -804,11 +804,11 @@
   </Item>
   <Item name="" identifier="ekutility_securelockersecurityofficer" tags="cabinet" pickdistance="150" scale="0.5" fireproof="true" waterproof="true" HideConditionBar="true">
     <Price baseprice="120">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!-- 
 	20
@@ -833,7 +833,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="15" canbeselected="true" hideitems="true">
+    <ItemContainer autofill="False" capacity="33" canbeselected="true" hideitems="true">
       <RequiredItem identifier="id_security,id_captain,sec,com,master,jobid:securityofficer,jobid:captain" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,mediumitem">
@@ -850,11 +850,11 @@
   </Item>
   <Item name="" identifier="ekutility_securelockermedicaldoctor" tags="cabinet" pickdistance="150" scale="0.5" fireproof="true" waterproof="true" HideConditionBar="true">
     <Price baseprice="140">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!-- 
 	20
@@ -882,7 +882,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="15" canbeselected="true" hideitems="true">
+    <ItemContainer autofill="False" capacity="33" canbeselected="true" hideitems="true">
       <RequiredItem identifier="id_medical,med,jobid:medicaldoctor" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,mediumitem">
@@ -899,11 +899,11 @@
   </Item>
   <Item name="" identifier="ekutility_securelockermechanic" tags="cabinet" pickdistance="150" scale="0.5" fireproof="true" waterproof="true" HideConditionBar="true">
     <Price baseprice="140">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!-- 
 	20
@@ -931,7 +931,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="15" canbeselected="true" hideitems="true">
+    <ItemContainer autofill="False" capacity="33" canbeselected="true" hideitems="true">
       <RequiredItem identifier="id_mechanic,mechanic,mech,jobid:mechanic" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,mediumitem">
@@ -948,11 +948,11 @@
   </Item>
   <Item name="" identifier="ekutility_securelockerengineer" tags="cabinet" pickdistance="150" scale="0.5" fireproof="true" waterproof="true" HideConditionBar="true">
     <Price baseprice="140">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!-- 
 	20
@@ -980,7 +980,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" capacity="15" canbeselected="true" hideitems="true">
+    <ItemContainer autofill="False" capacity="33" canbeselected="true" hideitems="true">
       <RequiredItem identifier="id_engineer,engineer,eng,jobid:engineer" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,mediumitem">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Containers/ekutility_labels.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Containers/ekutility_labels.xml
index ad2faf58..0faf6f29 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Containers/ekutility_labels.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Containers/ekutility_labels.xml	
@@ -1449,11 +1449,11 @@
   <Item name="" identifier="ekutility_labelprinter" scale="0.32" category="Equipment" tags="mediumitem" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" HideConditionBar="true">
     <!-- <Price storeidentifier="merchantResearch" buyprice="150" /> -->
     <Price baseprice="150" soldeverywhere="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
@@ -1469,11 +1469,11 @@
     <!--<InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,256,64,64" origin="0.5,0.5" />-->
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="736,368,160,128" depth="0.6" origin="0.5,0.5" />
     <Body width="112" height="96" density="25" />
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
-      <Containable items="smallitem,tool,fireextinguisher,weapon" excludeditems="toolbelt,toolbox,mobilecontainer" />
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
+      <Containable items="smallitem,tool,fireextinguisher,weapon,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Holdable slots="Any,RightHand,LeftHand" holdpos="50,-10" aimpos="70,0" handle1="-20,-16" msg="ItemMsgPickUpSelect">
-      <!--<LightComponent LightColor="255,255,255,200" Flicker="0.25" range="45" powerconsumption="0" IsOn="true">
+      <!--<LightComponent LightColor="255,255,255,200" Flicker="0.25" range="180" powerconsumption="0" IsOn="true">
         <LightTexture texture="Mods/Ek Utilities/Lights/biometric_scanner_fixedlight.png" origin="0.5, 0.27" size="0.5,0.5" />
       </LightComponent>-->
       <StatusEffect type="OnBroken" target="This" condition="100" disabledeltatime="true" delay="2" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Diving/ekutility_divinggear.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Diving/ekutility_divinggear.xml
index 763d2d93..5fd01c1d 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Diving/ekutility_divinggear.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Diving/ekutility_divinggear.xml	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="ekutility_reinforcedtank_oxygen" aliases="ekutility_heavytank_oxygen,heavy oxygen tank" category="Equipment,Misc,Diving" Tags="smallitem,oxygensource,oxygentank,refillableoxygensource" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ekutility_reinforcedtank_oxygen" aliases="ekutility_heavytank_oxygen,heavy oxygen tank" category="Equipment,Misc,Diving" Tags="smallitem,oxygensource,oxygentank,refillableoxygensource" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" maxstacksize="16">
     <!--<Price storeidentifier="merchantCity" buyprice="110" />
     <Price storeidentifier="merchantResearch" buyprice="125" />
     <Price storeidentifier="merchantMilitary" buyprice="130" />
@@ -11,15 +11,15 @@
 	titaniumaluminiumalloy 90
 	ballisticfiber 37
 	-->
-    <PreferredContainer primary="divingcab" minamount="1" maxamount="5" spawnprobability="0.5" />
+    <PreferredContainer primary="divingcab" minamount="2" maxamount="10" spawnprobability="1" />
     <PreferredContainer primary="oxygentankcontainer" />
-    <PreferredContainer primary="divingsuit,divingmask,plasmacutter" spawnprobability="1.0" />
+    <PreferredContainer primary="divingsuit,divingmask,plasmacutter" spawnprobability="1" />
     <Price baseprice="120" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="8" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="5" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="24" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="36" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="15" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="titaniumaluminiumalloy" outcondition="0.5" />
@@ -42,14 +42,14 @@
       <QualityStat stattype="Condition" value="0.15" />
     </Quality>
   </Item>
-  <Item name="" identifier="ekutility_reinforcedtank_oxygenite" aliases="ekutility_heavytank_oxygenite,heavy oxygenite tank" category="Equipment,Misc,Diving" Tags="smallitem,oxygensource,oxygenitetank" scale="0.3" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ekutility_reinforcedtank_oxygenite" aliases="ekutility_heavytank_oxygenite,heavy oxygenite tank" category="Equipment,Misc,Diving" Tags="smallitem,oxygensource,oxygenitetank" scale="0.3" impactsoundtag="impact_metal_light" maxstacksize="16">
     <!--<Price storeidentifier="merchantResearch" buyprice="300" />-->
     <Price baseprice="300" soldeverywhere="false" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" sold="false" />
     </Price>
     <!-- 
 	base price 175
@@ -82,11 +82,11 @@
     <!--<Price storeidentifier="merchantResearch" buyprice="255" />-->
     <!--<Price storeidentifier="merchantMilitary" buyprice="300" />-->
     <Price baseprice="275" soldeverywhere="false" minleveldifficulty="33">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="titaniumaluminiumalloy" />
@@ -113,7 +113,7 @@
         <Conditional Condition="gt 99" />
       </StatusEffect>
     </Holdable>
-    <LightComponent characterusable="false" LightColor="0,0,0,0" range="1" IsOn="false">
+    <LightComponent characterusable="false" LightColor="0,0,0,0" range="4" IsOn="false">
       <StatusEffect type="OnActive" target="This" Condition="0.6">
         <RequiredItem identifier="batterycell,fulguriumbatterycell" type="Contained" />
       </StatusEffect>
@@ -124,7 +124,7 @@
         <RequiredItem identifier="fulguriumbatterycell" type="Contained" />
       </StatusEffect>
     </LightComponent>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="batterycell,fulguriumbatterycell" />
     </ItemContainer>
@@ -132,11 +132,11 @@
   <Item name="" identifier="ekutility_jetscooter" aliases="ekutility_experimentalscooter" category="Equipment,Diving" Tags="smallitem,provocative,scooter,underwaterscooter,light" cargocontaineridentifier="metalcrate" Scale="0.32" impactsoundtag="impact_metal_light" isshootable="true">
     <!--<Price storeidentifier="merchantResearch" buyprice="160" />-->
     <Price baseprice="170" soldeverywhere="false" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="25">
       <Item identifier="aluminium" />
@@ -165,7 +165,7 @@
         <RequiredItem excludedidentifiers="batterycell,fulguriumbatterycell" type="Contained" />
       </StatusEffect>
       <sound file="Content/Items/Diving/ScooterLoop.ogg" type="OnUse" range="500.0" loop="true" />
-      <LightComponent LightColor="1.0,1.0,1.0,0.8" range="1000" AllowInGameEditing="false">
+      <LightComponent LightColor="1.0,1.0,1.0,0.8" range="4000" AllowInGameEditing="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.05, 0.5" size="1.0,1.0" />
       </LightComponent>
     </Propulsion>
@@ -198,7 +198,7 @@
       <icon identifier="mineral" texture="Content/UI/MainIconsAtlas.png" sourcerect="336,434,7,12" origin="0.5,0.5" />
       <icon identifier="" texture="Content/UI/MainIconsAtlas.png" sourcerect="346,416,4,4" origin="0.5,0.5" />
     </Sonar>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable items="mobilebattery">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
@@ -224,7 +224,7 @@
     <Body width="40" height="100" density="10" />
     <Holdable slots="Any,RightHand,LeftHand" holdangle="30" handle1="-10,0" msg="ItemMsgPickUpSelect" />
     <AiTarget soundrange="5000" sonarlabel="Signal - Beacon" />
-    <LightComponent LightColor="0.25,1.0,0.3,1.0" range="50" powerconsumption="10" blinkfrequency="2" IsOn="false" canbeselected="false">
+    <LightComponent LightColor="0.25,1.0,0.3,1.0" range="200" powerconsumption="10" blinkfrequency="2" IsOn="false" canbeselected="false">
       <StatusEffect type="OnActive" targettype="Contained" Condition="-0.1" />
       <StatusEffect type="OnActive" targettype="This" SoundRange="10000" setvalue="true" />
       <sound file="Content/Items/WarningBeep.ogg" type="OnActive" range="500.0" loop="true" volume="0.25" />
@@ -270,11 +270,11 @@
     <Price storeidentifier="merchantMilitary" buyprice="200" />
     <Price storeidentifier="merchantOutpost" buyprice="200" />-->
     <Price baseprice="150" soldeverywhere="false" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.5" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="4.5" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="fpgacircuit" />
@@ -291,7 +291,7 @@
     <Body width="40" height="100" density="10" />
     <Holdable slots="Any,RightHand,LeftHand" holdangle="30" handle1="-10,0" msg="ItemMsgPickUpSelect" />
     <AiTarget soundrange="5000" sonarlabel="entityname.sonarbeacon" />
-    <LightComponent LightColor="0.4,1.0,0.3,0.7" range="20" powerconsumption="10" Flicker="0.35" IsOn="false" canbeselected="false">
+    <LightComponent LightColor="0.4,1.0,0.3,0.7" range="80" powerconsumption="10" Flicker="0.35" IsOn="false" canbeselected="false">
       <StatusEffect type="OnActive" targettype="Contained" Condition="-0.1">
         <RequiredItem items="batterycell" type="Contained" />
       </StatusEffect>
@@ -326,7 +326,7 @@
       </TickBox>
       <TextBox text="sonarbeacon.beaconsignal" propertyname="SonarLabel" />
     </CustomInterface>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable items="mobilebattery">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
@@ -350,11 +350,11 @@
 	20
 	-->
     <Price baseprice="350" soldeverywhere="false" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="6" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="titaniumaluminiumalloy" />
@@ -397,7 +397,7 @@
     <Holdable slots="RightHand+LeftHand" msg="ItemMsgPickUpUse" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect">
       <sprite texture="%ModDir%/Items/Diving/ekutility_divinglockersprites.png" limb="Head" inheritlimbdepth="true" hidelimb="true" hideotherwearables="true" inheritorigin="false" inherittexturescale="false" sourcerect="256,0,96,96" origin="0.55,0.53" scale="0.4">
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="400.0" lightcolor="250,200,170,40" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="1600" lightcolor="250,200,170,40" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -405,7 +405,7 @@
         </LightComponent>
       </sprite>
       <sprite texture="%ModDir%/Items/Diving/utility_diving_suit.png" limb="Torso" inheritlimbdepth="true" hidelimb="true" hideotherwearables="false" inheritorigin="false" inherittexturescale="false" origin="0.6,0.48" sourcerect="0,0,128,256" scale="0.4">
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="500.0" lightcolor="250,200,170,200" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="2000" lightcolor="250,200,170,200" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -528,7 +528,7 @@
       </ItemComponent>
     </Wearable>
     <!--
-	<ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+	<ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       <StatusEffect type="OnWearing" target="Contained">
@@ -547,8 +547,8 @@
       <!--<ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />-->
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="1,93,120,29" origin="0.5,0.45" />
-      <SubContainer capacity="3" maxstacksize="64">
-        <Containable items="smallitem,mediumitem" excludeditems="toolbelt,toolbox,bandolier,cargoscooter" />
+      <SubContainer capacity="7" maxstacksize="128">
+        <Containable items="smallitem,mediumitem" />
       </SubContainer>
     </ItemContainer>
   </Item>
@@ -570,11 +570,11 @@
 	-->
     <!--
 	<Price baseprice="350" soldeverywhere="false" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false"/>
-      <Price storeidentifier="merchantcity" multiplier="1.15" minavailable="3"/>
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="4"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" sold="false"/>
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2"/>
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="3.45" minavailable="9"/>
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="12"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" sold="false"/>
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="6"/>
     </Price>
 	-->
     <Deconstruct time="30">
@@ -605,7 +605,7 @@
     <Holdable slots="RightHand+LeftHand" msg="ItemMsgPickUpUse" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect">
       <sprite texture="%ModDir%/Items/Diving/ekutility_divinglockersprites_paintmechanic.png" limb="Head" inheritlimbdepth="true" hidelimb="true" hideotherwearables="true" inheritorigin="false" inherittexturescale="false" sourcerect="256,0,96,96" origin="0.55,0.53" scale="0.4">
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="400.0" lightcolor="250,200,170,40" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="1600" lightcolor="250,200,170,40" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -613,7 +613,7 @@
         </LightComponent>
       </sprite>
       <sprite texture="%ModDir%/Items/Diving/utility_diving_suit_paintmechanic.png" limb="Torso" inheritlimbdepth="true" hidelimb="true" hideotherwearables="false" inheritorigin="false" inherittexturescale="false" origin="0.6,0.48" sourcerect="0,0,128,256" scale="0.4">
-        <LightComponent canbeselected="false" AllowInGameEditing="false" range="500.0" lightcolor="250,200,170,200" powerconsumption="10" IsOn="true">
+        <LightComponent canbeselected="false" AllowInGameEditing="false" range="2000" lightcolor="250,200,170,200" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -736,7 +736,7 @@
       </ItemComponent>
     </Wearable>
     <!--
-	<ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+	<ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       <StatusEffect type="OnWearing" target="Contained">
@@ -751,24 +751,24 @@
       </StatusEffect>
     </ItemContainer>
 	-->
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0">
       <!--<ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />-->
       <Containable identifiers="oxygentank,weldingfueltank,oxygeniteshard,oxygenitetank,incendiumfueltank,oxygensource" />
       <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="1,93,120,29" origin="0.5,0.45" />
-      <SubContainer capacity="3" maxstacksize="64">
-        <Containable items="smallitem,mediumitem" excludeditems="toolbelt,toolbox,bandolier,cargoscooter" />
+      <SubContainer capacity="7" maxstacksize="128">
+        <Containable items="smallitem,mediumitem" />
       </SubContainer>
     </ItemContainer>
   </Item>
-  <Item name="" identifier="ekutility_oxygencell1" category="Equipment,Misc,Diving" maxstacksize="3" Tags="smallitem,oxygensource,tag_oxygencell1" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ekutility_oxygencell1" category="Equipment,Misc,Diving" maxstacksize="6" Tags="smallitem,oxygensource,tag_oxygencell1" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="oxygentankcontainer,divingcab" />
     <Price baseprice="120" soldeverywhere="false" minleveldifficulty="25">
       <!-- Why does a vanilla oxygen tank sell for more than twice it's value? -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="true" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="true" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="true" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="true" minavailable="6" />
     </Price>
     <!-- 60
 	42
@@ -799,15 +799,15 @@
       <QualityStat stattype="Condition" value="0.15" />
     </Quality>
   </Item>
-  <Item name="" identifier="ekutility_oxygencell2" category="Equipment,Misc,Diving" maxstacksize="3" Tags="smallitem,oxygensource,tag_oxygencell2" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ekutility_oxygencell2" category="Equipment,Misc,Diving" maxstacksize="6" Tags="smallitem,oxygensource,tag_oxygencell2" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="oxygentankcontainer,divingcab" />
     <Price baseprice="185" soldeverywhere="false">
       <!-- Why does a vanilla oxygen tank sell for more than twice it's value? -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!-- 92
 	42
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials.xml
index 27c359a8..966a72f9 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials.xml	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <!-- Raw Resources -->
-  <Item name="" identifier="ekutility_densifiedmaterial_iron" aliases="ekutility_bulkcrate_iron" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_iron" aliases="ekutility_bulkcrate_iron" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="4" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="50" soldeverywhere="false" minleveldifficulty="15">
       <!-- 5 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" mincondition="0.1" />
@@ -55,16 +55,16 @@
     </Wearable>
 	-->
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_aluminium" aliases="ekutility_bulkcrate_aluminium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_aluminium" aliases="ekutility_bulkcrate_aluminium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="4" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="400" soldeverywhere="false" minleveldifficulty="15">
       <!-- 40 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="aluminium" mincondition="0.1" />
@@ -104,16 +104,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_copper" aliases="ekutility_bulkcrate_copper" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.060" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_copper" aliases="ekutility_bulkcrate_copper" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="220" soldeverywhere="false" minleveldifficulty="15">
       <!-- 22 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" mincondition="0.1" />
@@ -153,16 +153,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_titanium" aliases="ekutility_bulkcrate_titanium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_titanium" aliases="ekutility_bulkcrate_titanium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="650" soldeverywhere="false" minleveldifficulty="15">
       <!-- 65 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titanium" mincondition="0.1" />
@@ -202,16 +202,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_carbon" aliases="ekutility_bulkcrate_carbon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_carbon" aliases="ekutility_bulkcrate_carbon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="100" soldeverywhere="false" minleveldifficulty="15">
       <!-- 10 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="carbon" mincondition="0.1" />
@@ -251,16 +251,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_lead" aliases="ekutility_bulkcrate_lead" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_lead" aliases="ekutility_bulkcrate_lead" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="180" soldeverywhere="false" minleveldifficulty="15">
       <!-- 18 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lead" mincondition="0.1" />
@@ -300,16 +300,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_tin" aliases="ekutility_bulkcrate_tin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_tin" aliases="ekutility_bulkcrate_tin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="110" soldeverywhere="false" minleveldifficulty="15">
       <!-- 11 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tin" mincondition="0.1" />
@@ -349,16 +349,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_zinc" aliases="ekutility_bulkcrate_zinc" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_zinc" aliases="ekutility_bulkcrate_zinc" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="260" soldeverywhere="false" minleveldifficulty="15">
       <!-- 26 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="zinc" mincondition="0.1" />
@@ -398,16 +398,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_silicon" aliases="ekutility_bulkcrate_silicon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_silicon" aliases="ekutility_bulkcrate_silicon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="310" soldeverywhere="false" minleveldifficulty="15">
       <!-- 31 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="silicon" mincondition="0.1" />
@@ -447,16 +447,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_steel" aliases="ekutility_bulkcrate_steel" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_steel" aliases="ekutility_bulkcrate_steel" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="200" soldeverywhere="false" minleveldifficulty="15">
       <!-- 20 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="steel" mincondition="0.1" />
@@ -496,16 +496,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_titaniumaluminiumalloy" aliases="ekutility_bulkcrate_titaniumaluminiumalloy" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_titaniumaluminiumalloy" aliases="ekutility_bulkcrate_titaniumaluminiumalloy" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="1500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 150 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titaniumaluminiumalloy" mincondition="0.1" />
@@ -545,16 +545,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_plastic" aliases="ekutility_bulkcrate_plastic" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_plastic" aliases="ekutility_bulkcrate_plastic" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="450" soldeverywhere="false" minleveldifficulty="15">
       <!-- 45 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="plastic" mincondition="0.1" />
@@ -594,16 +594,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_rubber" aliases="ekutility_bulkcrate_rubber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_rubber" aliases="ekutility_bulkcrate_rubber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="200" soldeverywhere="false" minleveldifficulty="15">
       <!-- 20 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="rubber" mincondition="0.1" />
@@ -643,16 +643,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_fpgacircuit" aliases="ekutility_bulkcrate_fpgacircuit" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_fpgacircuit" aliases="ekutility_bulkcrate_fpgacircuit" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="800">
       <!-- 80 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="fpgacircuit" mincondition="0.1" />
@@ -692,16 +692,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_organicfiber" aliases="ekutility_bulkcrate_organicfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_organicfiber" aliases="ekutility_bulkcrate_organicfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="300">
       <!-- 30 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="organicfiber" mincondition="0.1" />
@@ -741,16 +741,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_ballisticfiber" aliases="ekutility_bulkcrate_ballisticfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_ballisticfiber" aliases="ekutility_bulkcrate_ballisticfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="1500">
       <!-- 150 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ballisticfiber" mincondition="0.1" />
@@ -790,16 +790,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_uranium" aliases="ekutility_bulkcrate_uranium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab,reactorcab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab,wreckreactorcab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_uranium" aliases="ekutility_bulkcrate_uranium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab,reactorcab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab,wreckreactorcab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 50 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uranium" mincondition="0.1" />
@@ -838,16 +838,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_thorium" aliases="ekutility_bulkcrate_thorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_thorium" aliases="ekutility_bulkcrate_thorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="310" soldeverywhere="false" minleveldifficulty="15">
       <!-- 31 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="thorium" mincondition="0.1" />
@@ -886,17 +886,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_depleteduranium" aliases="ekutility_bulkcrate_depleteduranium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="abandonedstoragecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.005" />
-    <PreferredContainer primary="wreckreactorcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="" identifier="ekutility_densifiedmaterial_depleteduranium" aliases="ekutility_bulkcrate_depleteduranium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="abandonedstoragecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.01" />
+    <PreferredContainer primary="wreckreactorcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="750" soldeverywhere="false" minleveldifficulty="15">
       <!-- 31 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="depletedfuel" mincondition="0.1" />
@@ -936,16 +936,16 @@
     </Holdable>
   </Item>
   <!-- Chemical Resources -->
-  <Item name="" identifier="ekutility_densifiedmaterial_flashpowder" aliases="ekutility_bulkcrate_flashpowder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_flashpowder" aliases="ekutility_bulkcrate_flashpowder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="900" soldeverywhere="false" minleveldifficulty="15">
       <!-- 90 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="flashpowder" mincondition="0.1" />
@@ -985,17 +985,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_lithium" aliases="ekutility_bulkcrate_lithium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.01" />
+  <Item name="" identifier="ekutility_densifiedmaterial_lithium" aliases="ekutility_bulkcrate_lithium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.02" />
     <Price baseprice="880" soldeverywhere="false" minleveldifficulty="15">
       <!-- 88 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lithium" mincondition="0.1" />
@@ -1035,17 +1035,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_sodium" aliases="ekutility_bulkcrate_sodium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.01" />
+  <Item name="" identifier="ekutility_densifiedmaterial_sodium" aliases="ekutility_bulkcrate_sodium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.02" />
     <Price baseprice="330" soldeverywhere="false" minleveldifficulty="15">
       <!-- 33 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sodium" mincondition="0.1" />
@@ -1085,17 +1085,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_magnesium" aliases="ekutility_bulkcrate_magnesium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.01" />
+  <Item name="" identifier="ekutility_densifiedmaterial_magnesium" aliases="ekutility_bulkcrate_magnesium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.02" />
     <Price baseprice="330" soldeverywhere="false" minleveldifficulty="15">
       <!-- 33 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="magnesium" mincondition="0.1" />
@@ -1135,17 +1135,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_potassium" aliases="ekutility_bulkcrate_potassium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.01" />
+  <Item name="" identifier="ekutility_densifiedmaterial_potassium" aliases="ekutility_bulkcrate_potassium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.02" />
     <Price baseprice="100" soldeverywhere="false" minleveldifficulty="15">
       <!-- 10 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="potassium" mincondition="0.1" />
@@ -1185,17 +1185,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_chlorine" aliases="ekutility_bulkcrate_chlorine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.01" />
+  <Item name="" identifier="ekutility_densifiedmaterial_chlorine" aliases="ekutility_bulkcrate_chlorine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.02" />
     <Price baseprice="110" soldeverywhere="false" minleveldifficulty="15">
       <!-- 11 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chlorine" mincondition="0.1" />
@@ -1235,17 +1235,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_calcium" aliases="ekutility_bulkcrate_calcium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.01" />
+  <Item name="" identifier="ekutility_densifiedmaterial_calcium" aliases="ekutility_bulkcrate_calcium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.02" />
     <Price baseprice="310" soldeverywhere="false" minleveldifficulty="15">
       <!-- 31 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calcium" mincondition="0.1" />
@@ -1285,17 +1285,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_phosphorus" aliases="ekutility_bulkcrate_phosphorus" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.01" />
+  <Item name="" identifier="ekutility_densifiedmaterial_phosphorus" aliases="ekutility_bulkcrate_phosphorus" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.02" />
     <Price baseprice="150" soldeverywhere="false" minleveldifficulty="15">
       <!-- 15 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="phosphorus" mincondition="0.1" />
@@ -1335,17 +1335,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_ethanol" aliases="ekutility_bulkcrate_ethanol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_ethanol" aliases="ekutility_bulkcrate_ethanol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="600" soldeverywhere="false" minleveldifficulty="15">
       <!-- 60 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ethanol" mincondition="0.1" />
@@ -1385,16 +1385,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_sulphuricacid" aliases="ekutility_bulkcrate_sulphuricacid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_sulphuricacid" aliases="ekutility_bulkcrate_sulphuricacid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="800" soldeverywhere="false" minleveldifficulty="15">
       <!-- 80 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sulphuricacid" mincondition="0.1" />
@@ -1435,16 +1435,16 @@
     </Holdable>
   </Item>
   <!-- Explosives -->
-  <Item name="" identifier="ekutility_densifiedmaterial_uex" aliases="ekutility_bulkcrate_uex" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_uex" aliases="ekutility_bulkcrate_uex" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="4" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="750">
       <!-- 75 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uex" mincondition="0.1" />
@@ -1484,16 +1484,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_c4block" aliases="ekutility_bulkcrate_c4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.01" />
+  <Item name="" identifier="ekutility_densifiedmaterial_c4block" aliases="ekutility_bulkcrate_c4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.02" />
     <Price baseprice="1600">
       <!-- 160 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="c4block" mincondition="0.1" />
@@ -1533,16 +1533,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_compoundn" aliases="ekutility_bulkcrate_compoundn" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_compoundn" aliases="ekutility_bulkcrate_compoundn" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="1500">
       <!-- 150 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="compoundn" mincondition="0.1" />
@@ -1582,16 +1582,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_ic4block" aliases="ekutility_bulkcrate_ic4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_ic4block" aliases="ekutility_bulkcrate_ic4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="4000">
       <!-- 400 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ic4block" mincondition="0.1" />
@@ -1632,16 +1632,16 @@
     </Holdable>
   </Item>
   <!-- Alien Resources -->
-  <Item name="" identifier="ekutility_densifiedmaterial_physicorium" aliases="ekutility_bulkcrate_physicorium" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_physicorium" aliases="ekutility_bulkcrate_physicorium" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="2000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 200 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="physicorium" mincondition="0.1" />
@@ -1681,16 +1681,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_fulgurium" aliases="ekutility_bulkcrate_fulgurium" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_fulgurium" aliases="ekutility_bulkcrate_fulgurium" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="2000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 200 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="fulgurium" mincondition="0.1" />
@@ -1730,16 +1730,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_sulphuriteshard" aliases="ekutility_bulkcrate_sulphuriteshard" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.01" />
+  <Item name="" identifier="ekutility_densifiedmaterial_sulphuriteshard" aliases="ekutility_bulkcrate_sulphuriteshard" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.02" />
     <Price baseprice="2000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 200 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sulphuriteshard" mincondition="0.1" />
@@ -1779,16 +1779,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_oxygeniteshard" aliases="ekutility_bulkcrate_oxygeniteshard" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_oxygeniteshard" aliases="ekutility_bulkcrate_oxygeniteshard" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="2000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 200 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="oxygeniteshard" mincondition="0.1" />
@@ -1828,16 +1828,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_incendium" aliases="ekutility_bulkcrate_incendium" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_incendium" aliases="ekutility_bulkcrate_incendium" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="2000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 200 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="incendium" mincondition="0.1" />
@@ -1877,16 +1877,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_dementonite" aliases="ekutility_bulkcrate_dementonite" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.005" />
+  <Item name="" identifier="ekutility_densifiedmaterial_dementonite" aliases="ekutility_bulkcrate_dementonite" category="Material,Alien" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.01" />
     <Price baseprice="2000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 200 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="dementonite" mincondition="0.1" />
@@ -1927,16 +1927,16 @@
     </Holdable>
   </Item>
   <!-- Medical Resources -->
-  <Item name="" identifier="ekutility_densifiedmaterial_antibleeding1" aliases="ekutility_bulkcrate_antibleeding1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_antibleeding1" aliases="ekutility_bulkcrate_antibleeding1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="400" soldeverywhere="false" minleveldifficulty="15">
       <!-- 40 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding1" mincondition="0.1" />
@@ -1976,16 +1976,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_antibleeding2" aliases="ekutility_bulkcrate_antibleeding2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_antibleeding2" aliases="ekutility_bulkcrate_antibleeding2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="1000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 100 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding2" mincondition="0.1" />
@@ -2025,16 +2025,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_antibleeding3" aliases="ekutility_bulkcrate_antibleeding3" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_antibleeding3" aliases="ekutility_bulkcrate_antibleeding3" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="1400" soldeverywhere="false" minleveldifficulty="15">
       <!-- 140 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding3" mincondition="0.1" />
@@ -2074,16 +2074,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_tonicliquid" aliases="ekutility_bulkcrate_tonicliquid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_tonicliquid" aliases="ekutility_bulkcrate_tonicliquid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="750" soldeverywhere="false" minleveldifficulty="15">
       <!-- 75 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tonicliquid" mincondition="0.1" />
@@ -2123,16 +2123,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_antibloodloss1" aliases="ekutility_bulkcrate_antibloodloss1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_antibloodloss1" aliases="ekutility_bulkcrate_antibloodloss1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 50 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibloodloss1" mincondition="0.1" />
@@ -2172,16 +2172,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_antibloodloss2" aliases="ekutility_bulkcrate_antibloodloss2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_antibloodloss2" aliases="ekutility_bulkcrate_antibloodloss2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="2400" soldeverywhere="false" minleveldifficulty="15">
       <!-- 240 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibloodloss2" mincondition="0.1" />
@@ -2221,16 +2221,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_adrenaline" aliases="ekutility_bulkcrate_adrenaline" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_adrenaline" aliases="ekutility_bulkcrate_adrenaline" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="600" soldeverywhere="false" minleveldifficulty="15">
       <!-- 600 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="adrenaline" mincondition="0.1" />
@@ -2270,16 +2270,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_opium" aliases="ekutility_bulkcrate_opium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_opium" aliases="ekutility_bulkcrate_opium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="400" soldeverywhere="false" minleveldifficulty="15">
       <!-- 40 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="opium" mincondition="0.1" />
@@ -2319,16 +2319,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_elastin" aliases="ekutility_bulkcrate_elastin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_elastin" aliases="ekutility_bulkcrate_elastin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="400" soldeverywhere="false" minleveldifficulty="15">
       <!-- 40 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="elastin" mincondition="0.1" />
@@ -2368,16 +2368,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_alienblood" aliases="ekutility_bulkcrate_alienblood" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_alienblood" aliases="ekutility_bulkcrate_alienblood" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="1200" soldeverywhere="false" minleveldifficulty="15">
       <!-- 120 -->
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.85" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.55" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="alienblood" mincondition="0.1" />
@@ -2417,16 +2417,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_adrenalinegland" aliases="ekutility_bulkcrate_adrenalinegland" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_adrenalinegland" aliases="ekutility_bulkcrate_adrenalinegland" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="2500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 250 -->
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.85" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.55" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="adrenalinegland" mincondition="0.1" />
@@ -2466,16 +2466,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_swimbladder" aliases="ekutility_bulkcrate_swimbladder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_swimbladder" aliases="ekutility_bulkcrate_swimbladder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="2500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 250 -->
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="swimbladder" mincondition="0.1" />
@@ -2515,16 +2515,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_paralyxis" aliases="ekutility_bulkcrate_paralyxis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_paralyxis" aliases="ekutility_bulkcrate_paralyxis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="2000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 200 -->
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="paralyxis" mincondition="0.1" />
@@ -2564,16 +2564,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_huskeggs" aliases="ekutility_bulkcrate_huskeggs" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.06"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_huskeggs" aliases="ekutility_bulkcrate_huskeggs" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.12"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="6000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 600 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="huskeggs" mincondition="0.1" />
@@ -2614,16 +2614,16 @@
     </Holdable>
   </Item>
   <!-- Medical Products & Toxins -->
-  <Item name="" identifier="ekutility_densifiedmaterial_stabilozine" aliases="ekutility_bulkcrate_stabilozine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_stabilozine" aliases="ekutility_bulkcrate_stabilozine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="400" soldeverywhere="false" minleveldifficulty="15">
       <!-- 40-->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="stabilozine" mincondition="0.1" />
@@ -2665,16 +2665,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_morphine" aliases="ekutility_bulkcrate_morphine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_morphine" aliases="ekutility_bulkcrate_morphine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="1000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 100 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antidama1" mincondition="0.1" />
@@ -2716,16 +2716,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_fentanyl" aliases="ekutility_bulkcrate_fentanyl" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_fentanyl" aliases="ekutility_bulkcrate_fentanyl" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="2500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 250 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antidama2" mincondition="0.1" />
@@ -2767,16 +2767,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_deusizine" aliases="ekutility_bulkcrate_deusizine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.02"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_deusizine" aliases="ekutility_bulkcrate_deusizine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.04"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="5000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 500 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deusizine" mincondition="0.1" />
@@ -2818,16 +2818,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_naloxone" aliases="ekutility_bulkcrate_naloxone" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_naloxone" aliases="ekutility_bulkcrate_naloxone" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="1600" soldeverywhere="false" minleveldifficulty="15">
       <!-- 160 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antinarc" mincondition="0.1" />
@@ -2869,16 +2869,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_haloperidol" aliases="ekutility_bulkcrate_haloperidol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_haloperidol" aliases="ekutility_bulkcrate_haloperidol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="1300" soldeverywhere="false" minleveldifficulty="15">
       <!-- 130 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antipsychosis" mincondition="0.1" />
@@ -2920,16 +2920,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_meth" aliases="ekutility_bulkcrate_meth" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_meth" aliases="ekutility_bulkcrate_meth" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 50 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="meth" mincondition="0.1" />
@@ -2971,16 +2971,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_steroids" aliases="ekutility_bulkcrate_steroids" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_steroids" aliases="ekutility_bulkcrate_steroids" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="3500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 350 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="steroids" mincondition="0.1" />
@@ -3022,16 +3022,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_hyperzine" aliases="ekutility_bulkcrate_hyperzine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_hyperzine" aliases="ekutility_bulkcrate_hyperzine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="4500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 450 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="hyperzine" mincondition="0.1" />
@@ -3073,16 +3073,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_liquidoxygenite" aliases="ekutility_bulkcrate_liquidoxygenite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_liquidoxygenite" aliases="ekutility_bulkcrate_liquidoxygenite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="800" soldeverywhere="false" minleveldifficulty="15">
       <!-- 80 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="liquidoxygenite" mincondition="0.1" />
@@ -3124,16 +3124,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_antibiotics" aliases="ekutility_bulkcrate_antibiotics" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_antibiotics" aliases="ekutility_bulkcrate_antibiotics" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="400" soldeverywhere="false" minleveldifficulty="15">
       <!-- 40 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibiotics" mincondition="0.1" />
@@ -3175,16 +3175,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_chloralhydrate" aliases="ekutility_bulkcrate_chloralhydrate" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_chloralhydrate" aliases="ekutility_bulkcrate_chloralhydrate" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="1000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 100 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chloralhydrate" mincondition="0.1" />
@@ -3226,17 +3226,17 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_calyxanide" aliases="ekutility_bulkcrate_calyxanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_calyxanide" aliases="ekutility_bulkcrate_calyxanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <!-- Guys they fucked up the price of calyxanide again - nobody tell krezensky! -->
     <Price baseprice="7000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 250 - 700 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calyxanide" mincondition="0.1" />
@@ -3278,16 +3278,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_raptorbaneextract" aliases="ekutility_bulkcrate_raptorbaneextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_raptorbaneextract" aliases="ekutility_bulkcrate_raptorbaneextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="2500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 250 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="raptorbaneextract" mincondition="0.1" />
@@ -3329,16 +3329,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_pomegrenadeextract" aliases="ekutility_bulkcrate_pomegrenadeextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.025" />
+  <Item name="" identifier="ekutility_densifiedmaterial_pomegrenadeextract" aliases="ekutility_bulkcrate_pomegrenadeextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.05" />
     <Price baseprice="2500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 250 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="pomegrenadeextract" mincondition="0.1" />
@@ -3380,16 +3380,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_cyanide" aliases="ekutility_bulkcrate_cyanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_cyanide" aliases="ekutility_bulkcrate_cyanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="2000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 200 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="cyanide" mincondition="0.1" />
@@ -3431,16 +3431,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_cyanideantidote" aliases="ekutility_bulkcrate_cyanideantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_cyanideantidote" aliases="ekutility_bulkcrate_cyanideantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="1250" soldeverywhere="false" minleveldifficulty="15">
       <!-- 125 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="cyanideantidote" mincondition="0.1" />
@@ -3482,16 +3482,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_sufforin" aliases="ekutility_bulkcrate_sufforin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_sufforin" aliases="ekutility_bulkcrate_sufforin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="2000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 200 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sufforin" mincondition="0.1" />
@@ -3533,16 +3533,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_sufforinantidote" aliases="ekutility_bulkcrate_sufforinantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_sufforinantidote" aliases="ekutility_bulkcrate_sufforinantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="1250" soldeverywhere="false" minleveldifficulty="15">
       <!-- 125 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sufforinantidote" mincondition="0.1" />
@@ -3584,16 +3584,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_morbusine" aliases="ekutility_bulkcrate_morbusine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_morbusine" aliases="ekutility_bulkcrate_morbusine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="6500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 650 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="morbusine" mincondition="0.1" />
@@ -3635,16 +3635,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_morbusineantidote" aliases="ekutility_bulkcrate_morbusineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_morbusineantidote" aliases="ekutility_bulkcrate_morbusineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="3500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 350 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="morbusineantidote" mincondition="0.1" />
@@ -3686,16 +3686,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_radiotoxin" aliases="ekutility_bulkcrate_radiotoxin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_radiotoxin" aliases="ekutility_bulkcrate_radiotoxin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="2000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 200 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="radiotoxin" mincondition="0.1" />
@@ -3737,16 +3737,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_antirad" aliases="ekutility_bulkcrate_antirad" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_antirad" aliases="ekutility_bulkcrate_antirad" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="1260" soldeverywhere="false" minleveldifficulty="15">
       <!-- 126 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antirad" mincondition="0.1" />
@@ -3788,16 +3788,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_deliriumine" aliases="ekutility_bulkcrate_deliriumine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_deliriumine" aliases="ekutility_bulkcrate_deliriumine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="2500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 250 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deliriumine" mincondition="0.1" />
@@ -3839,16 +3839,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_deliriumineantidote" aliases="ekutility_bulkcrate_deliriumineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_deliriumineantidote" aliases="ekutility_bulkcrate_deliriumineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="1250" soldeverywhere="false" minleveldifficulty="15">
       <!-- 125 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deliriumineantidote" mincondition="0.1" />
@@ -3890,16 +3890,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_paralyzant" aliases="ekutility_bulkcrate_paralyzant" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_paralyzant" aliases="ekutility_bulkcrate_paralyzant" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="3500" soldeverywhere="false" minleveldifficulty="15">
       <!-- 350 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="paralyzant" mincondition="0.1" />
@@ -3941,16 +3941,16 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_densifiedmaterial_antiparalysis" aliases="ekutility_bulkcrate_antiparalysis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.055"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.015" />
+  <Item name="" identifier="ekutility_densifiedmaterial_antiparalysis" aliases="ekutility_bulkcrate_antiparalysis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.11"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.03" />
     <Price baseprice="2000" soldeverywhere="false" minleveldifficulty="15">
       <!-- 200 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antiparalysis" mincondition="0.1" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_doublesize.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_doublesize.xml
index fad27c01..641fabb4 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_doublesize.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_doublesize.xml	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <!-- Raw Resources -->
-  <Item name="Crate of Iron" identifier="ekutility_bulkcrate_iron" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw iron.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Iron" identifier="ekutility_bulkcrate_iron" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw iron.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="100" soldeverywhere="false">
       <!-- 5 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" mincondition="0.1" />
@@ -55,16 +55,16 @@
     </Wearable>
 	-->
   </Item>
-  <Item name="Crate of Aluminium" identifier="ekutility_bulkcrate_aluminium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw aluminium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Aluminium" identifier="ekutility_bulkcrate_aluminium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw aluminium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="4" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="aluminium" mincondition="0.1" />
@@ -104,16 +104,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Copper" identifier="ekutility_bulkcrate_copper" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw copper.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.20" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Copper" identifier="ekutility_bulkcrate_copper" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw copper.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="440" soldeverywhere="false">
       <!-- 22 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" mincondition="0.1" />
@@ -153,16 +153,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Titanium" identifier="ekutility_bulkcrate_titanium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw titanium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Titanium" identifier="ekutility_bulkcrate_titanium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw titanium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1300" soldeverywhere="false">
       <!-- 65 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titanium" mincondition="0.1" />
@@ -202,16 +202,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Carbon" identifier="ekutility_bulkcrate_carbon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw carbon.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Carbon" identifier="ekutility_bulkcrate_carbon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw carbon.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="200" soldeverywhere="false">
       <!-- 10 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="carbon" mincondition="0.1" />
@@ -251,16 +251,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Lead" identifier="ekutility_bulkcrate_lead" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw lead.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Lead" identifier="ekutility_bulkcrate_lead" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw lead.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="360" soldeverywhere="false">
       <!-- 18 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lead" mincondition="0.1" />
@@ -300,16 +300,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Tin" identifier="ekutility_bulkcrate_tin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw tin.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Tin" identifier="ekutility_bulkcrate_tin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw tin.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="220" soldeverywhere="false">
       <!-- 11 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tin" mincondition="0.1" />
@@ -349,16 +349,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Zinc" identifier="ekutility_bulkcrate_zinc" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw zinc.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Zinc" identifier="ekutility_bulkcrate_zinc" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw zinc.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="520" soldeverywhere="false">
       <!-- 26 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="zinc" mincondition="0.1" />
@@ -398,16 +398,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Silicon" identifier="ekutility_bulkcrate_silicon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw silicon.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Silicon" identifier="ekutility_bulkcrate_silicon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw silicon.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="620" soldeverywhere="false">
       <!-- 31 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="silicon" mincondition="0.1" />
@@ -447,16 +447,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Steel Bars" identifier="ekutility_bulkcrate_steel" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of steel bars.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Steel Bars" identifier="ekutility_bulkcrate_steel" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of steel bars.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 20 -->
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="steel" mincondition="0.1" />
@@ -496,16 +496,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Titanium Alloy Bars" identifier="ekutility_bulkcrate_titaniumaluminiumalloy" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of titanium-aluminium alloy bars.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Titanium Alloy Bars" identifier="ekutility_bulkcrate_titaniumaluminiumalloy" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of titanium-aluminium alloy bars.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="3000" soldeverywhere="false">
       <!-- 150 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titaniumaluminiumalloy" mincondition="0.1" />
@@ -545,16 +545,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Plastic" identifier="ekutility_bulkcrate_plastic" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw plastic.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Plastic" identifier="ekutility_bulkcrate_plastic" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw plastic.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="900" soldeverywhere="false">
       <!-- 45 -->
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="plastic" mincondition="0.1" />
@@ -594,16 +594,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Rubber" identifier="ekutility_bulkcrate_rubber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw rubber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Rubber" identifier="ekutility_bulkcrate_rubber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw rubber.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 20 -->
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="2" />
-      <Price locationtype="research" multiplier="1" sold="false" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="6" />
+      <Price locationtype="research" multiplier="3" sold="false" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="rubber" mincondition="0.1" />
@@ -643,16 +643,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of FPGA Circuits" identifier="ekutility_bulkcrate_fpgacircuit" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of FPGA circuits.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of FPGA Circuits" identifier="ekutility_bulkcrate_fpgacircuit" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of FPGA circuits.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1600">
       <!-- 80 -->
-      <Price locationtype="outpost" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="city" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="city" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="fpgacircuit" mincondition="0.1" />
@@ -692,16 +692,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Organic Fiber" identifier="ekutility_bulkcrate_organicfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of organic fiber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Organic Fiber" identifier="ekutility_bulkcrate_organicfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of organic fiber.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="600">
       <!-- 30 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="organicfiber" mincondition="0.1" />
@@ -741,16 +741,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Ballistic Fiber" identifier="ekutility_bulkcrate_ballisticfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of ballistic fiber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Ballistic Fiber" identifier="ekutility_bulkcrate_ballisticfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of ballistic fiber.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="600">
       <!-- 30 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ballisticfiber" mincondition="0.1" />
@@ -790,16 +790,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Uranium" identifier="ekutility_bulkcrate_uranium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw uranium.">
-    <PreferredContainer primary="storagecab,reactorcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab,wreckreactorcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Uranium" identifier="ekutility_bulkcrate_uranium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw uranium.">
+    <PreferredContainer primary="storagecab,reactorcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,wreckreactorcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="1000" soldeverywhere="false">
       <!-- 50 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="5" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="15" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uranium" mincondition="0.1" />
@@ -838,16 +838,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Thorium" identifier="ekutility_bulkcrate_thorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw thorium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Thorium" identifier="ekutility_bulkcrate_thorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw thorium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="620" soldeverywhere="false">
       <!-- 31 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="thorium" mincondition="0.1" />
@@ -887,16 +887,16 @@
     </Holdable>
   </Item>
   <!-- Chemical Resources -->
-  <Item name="Crate of Flash Powder" identifier="ekutility_bulkcrate_flashpowder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of flash powder.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Flash Powder" identifier="ekutility_bulkcrate_flashpowder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of flash powder.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1800" soldeverywhere="false">
       <!-- 90 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="flashpowder" mincondition="0.1" />
@@ -936,17 +936,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Lithium" identifier="ekutility_bulkcrate_lithium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of lithium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Lithium" identifier="ekutility_bulkcrate_lithium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of lithium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="1760" soldeverywhere="false">
       <!-- 88 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lithium" mincondition="0.1" />
@@ -986,17 +986,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sodium" identifier="ekutility_bulkcrate_sodium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of sodium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Sodium" identifier="ekutility_bulkcrate_sodium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of sodium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="660" soldeverywhere="false">
       <!-- 33 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sodium" mincondition="0.1" />
@@ -1036,17 +1036,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Magnesium" identifier="ekutility_bulkcrate_magnesium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of magnesium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Magnesium" identifier="ekutility_bulkcrate_magnesium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of magnesium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="660" soldeverywhere="false">
       <!-- 33 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="magnesium" mincondition="0.1" />
@@ -1086,17 +1086,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Potassium" identifier="ekutility_bulkcrate_potassium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of potassium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Potassium" identifier="ekutility_bulkcrate_potassium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of potassium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="200" soldeverywhere="false">
       <!-- 10 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="potassium" mincondition="0.1" />
@@ -1136,17 +1136,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Chlorine" identifier="ekutility_bulkcrate_chlorine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of chlorine.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Chlorine" identifier="ekutility_bulkcrate_chlorine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of chlorine.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="220" soldeverywhere="false">
       <!-- 11 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chlorine" mincondition="0.1" />
@@ -1186,17 +1186,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Calcium" identifier="ekutility_bulkcrate_calcium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of calcium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Calcium" identifier="ekutility_bulkcrate_calcium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of calcium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="620" soldeverywhere="false">
       <!-- 31 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calcium" mincondition="0.1" />
@@ -1236,17 +1236,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Phosphorus" identifier="ekutility_bulkcrate_phosphorus" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of phosphorus.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Phosphorus" identifier="ekutility_bulkcrate_phosphorus" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of phosphorus.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="300" soldeverywhere="false">
       <!-- 15 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="phosphorus" mincondition="0.1" />
@@ -1286,17 +1286,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Ethanol" identifier="ekutility_bulkcrate_ethanol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of ethanol.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Ethanol" identifier="ekutility_bulkcrate_ethanol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of ethanol.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1200" soldeverywhere="false">
       <!-- 60 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ethanol" mincondition="0.1" />
@@ -1336,16 +1336,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sulphuric Acid" identifier="ekutility_bulkcrate_sulphuricacid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of sulphuric acid.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Sulphuric Acid" identifier="ekutility_bulkcrate_sulphuricacid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of sulphuric acid.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1600" soldeverywhere="false">
       <!-- 80 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sulphuricacid" mincondition="0.1" />
@@ -1386,16 +1386,16 @@
     </Holdable>
   </Item>
   <!-- Explosives -->
-  <Item name="Crate of UEX" identifier="ekutility_bulkcrate_uex" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of UEX.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of UEX" identifier="ekutility_bulkcrate_uex" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of UEX.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1500">
       <!-- 75 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uex" mincondition="0.1" />
@@ -1435,16 +1435,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of C-4" identifier="ekutility_bulkcrate_c4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of C-4.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of C-4" identifier="ekutility_bulkcrate_c4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of C-4.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="3200">
       <!-- 160 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="c4block" mincondition="0.1" />
@@ -1484,16 +1484,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Compound-N" identifier="ekutility_bulkcrate_compoundn" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of compound-N.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Compound-N" identifier="ekutility_bulkcrate_compoundn" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of compound-N.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="3000">
       <!-- 150 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="compoundn" mincondition="0.1" />
@@ -1533,16 +1533,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of IC-4" identifier="ekutility_bulkcrate_ic4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of IC-4.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of IC-4" identifier="ekutility_bulkcrate_ic4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of IC-4.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="8000">
       <!-- 400 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ic4block" mincondition="0.1" />
@@ -1583,16 +1583,16 @@
     </Holdable>
   </Item>
   <!-- Alien Resources -->
-  <Item name="Crate of Physicorium" identifier="ekutility_bulkcrate_physicorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of physicorium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Physicorium" identifier="ekutility_bulkcrate_physicorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of physicorium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="4000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="physicorium" mincondition="0.1" />
@@ -1632,16 +1632,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Fulgurium" identifier="ekutility_bulkcrate_fulgurium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of fulgurium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Fulgurium" identifier="ekutility_bulkcrate_fulgurium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of fulgurium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="4000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="fulgurium" mincondition="0.1" />
@@ -1681,16 +1681,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sulphurite" identifier="ekutility_bulkcrate_sulphuriteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of sulphurite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Sulphurite" identifier="ekutility_bulkcrate_sulphuriteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of sulphurite.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="4000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sulphuriteshard" mincondition="0.1" />
@@ -1730,16 +1730,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Oxygenite" identifier="ekutility_bulkcrate_oxygeniteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of oxygenite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Oxygenite" identifier="ekutility_bulkcrate_oxygeniteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of oxygenite.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="4000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="oxygeniteshard" mincondition="0.1" />
@@ -1779,16 +1779,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Incendium" identifier="ekutility_bulkcrate_incendium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of incendium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Incendium" identifier="ekutility_bulkcrate_incendium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of incendium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="4000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="incendium" mincondition="0.1" />
@@ -1828,16 +1828,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Dementonite" identifier="ekutility_bulkcrate_dementonite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of dementonite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Dementonite" identifier="ekutility_bulkcrate_dementonite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of dementonite.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="4000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="dementonite" mincondition="0.1" />
@@ -1878,16 +1878,16 @@
     </Holdable>
   </Item>
   <!-- Medical Resources -->
-  <Item name="Crate of Bandages" identifier="ekutility_bulkcrate_antibleeding1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of medical bandages.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Bandages" identifier="ekutility_bulkcrate_antibleeding1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of medical bandages.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" minavailable="1" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" minavailable="3" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding1" mincondition="0.1" />
@@ -1927,16 +1927,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Plastiseal" identifier="ekutility_bulkcrate_antibleeding2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of plastiseal.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Plastiseal" identifier="ekutility_bulkcrate_antibleeding2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of plastiseal.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 100 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding2" mincondition="0.1" />
@@ -1976,16 +1976,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Antibiotic Glue" identifier="ekutility_bulkcrate_antibleeding3" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of antibiotic glue.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Antibiotic Glue" identifier="ekutility_bulkcrate_antibleeding3" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of antibiotic glue.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2800" soldeverywhere="false">
       <!-- 140 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding3" mincondition="0.1" />
@@ -2025,16 +2025,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Tonic Liquid" identifier="ekutility_bulkcrate_tonicliquid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of tonic liquid.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Tonic Liquid" identifier="ekutility_bulkcrate_tonicliquid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of tonic liquid.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1500" soldeverywhere="false">
       <!-- 75 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" minavailable="1" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" minavailable="3" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tonicliquid" mincondition="0.1" />
@@ -2074,16 +2074,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Saline" identifier="ekutility_bulkcrate_antibloodloss1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of medical saline.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Saline" identifier="ekutility_bulkcrate_antibloodloss1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of medical saline.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 50 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibloodloss1" mincondition="0.1" />
@@ -2123,16 +2123,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Blood Packs" identifier="ekutility_bulkcrate_antibloodloss2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of blood packs.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Blood Packs" identifier="ekutility_bulkcrate_antibloodloss2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of blood packs.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="4800" soldeverywhere="false">
       <!-- 240 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibloodloss2" mincondition="0.1" />
@@ -2172,16 +2172,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Adrenaline" identifier="ekutility_bulkcrate_adrenaline" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of medical adrenaline.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Adrenaline" identifier="ekutility_bulkcrate_adrenaline" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of medical adrenaline.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1200" soldeverywhere="false">
       <!-- 600 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="adrenaline" mincondition="0.1" />
@@ -2221,16 +2221,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Opium" identifier="ekutility_bulkcrate_opium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of opium.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Opium" identifier="ekutility_bulkcrate_opium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of opium.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="opium" mincondition="0.1" />
@@ -2270,16 +2270,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Elastin" identifier="ekutility_bulkcrate_elastin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of elastin.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Elastin" identifier="ekutility_bulkcrate_elastin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of elastin.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="elastin" mincondition="0.1" />
@@ -2319,16 +2319,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Alien Blood" identifier="ekutility_bulkcrate_alienblood" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of alien blood samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Alien Blood" identifier="ekutility_bulkcrate_alienblood" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of alien blood samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2400" soldeverywhere="false">
       <!-- 120 -->
-      <Price locationtype="outpost" multiplier="0.85" sold="false" />
-      <Price locationtype="city" multiplier="0.85" sold="false" />
-      <Price locationtype="research" multiplier="1.2" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.85" sold="false" />
+      <Price locationtype="outpost" multiplier="2.55" sold="false" />
+      <Price locationtype="city" multiplier="2.55" sold="false" />
+      <Price locationtype="research" multiplier="3.6" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.55" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="alienblood" mincondition="0.1" />
@@ -2368,16 +2368,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Adrenaline Glands" identifier="ekutility_bulkcrate_adrenalinegland" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of adrenaline gland samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Adrenaline Glands" identifier="ekutility_bulkcrate_adrenalinegland" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of adrenaline gland samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="5000" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1.1" sold="false" />
-      <Price locationtype="research" multiplier="1.2" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.85" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3.3" sold="false" />
+      <Price locationtype="research" multiplier="3.6" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.55" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="adrenalinegland" mincondition="0.1" />
@@ -2417,16 +2417,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Swim Bladder" identifier="ekutility_bulkcrate_swimbladder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of swim bladder samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Swim Bladder" identifier="ekutility_bulkcrate_swimbladder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of swim bladder samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="5000" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="swimbladder" mincondition="0.1" />
@@ -2466,16 +2466,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Paralyxis" identifier="ekutility_bulkcrate_paralyxis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of paralyxis samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Paralyxis" identifier="ekutility_bulkcrate_paralyxis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of paralyxis samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="4000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="paralyxis" mincondition="0.1" />
@@ -2515,16 +2515,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Velonaceps Calyx" identifier="ekutility_bulkcrate_huskeggs" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of velonaceps calyx egg samples.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Velonaceps Calyx" identifier="ekutility_bulkcrate_huskeggs" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of velonaceps calyx egg samples.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="12000" soldeverywhere="false">
       <!-- 600 -->
-      <Price locationtype="outpost" multiplier="1.2" sold="false" />
-      <Price locationtype="city" multiplier="1.3" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.2" sold="false" />
-      <Price locationtype="mine" multiplier="1.3" sold="false" />
+      <Price locationtype="outpost" multiplier="3.6" sold="false" />
+      <Price locationtype="city" multiplier="3.9" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.6" sold="false" />
+      <Price locationtype="mine" multiplier="3.9" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="huskeggs" mincondition="0.1" />
@@ -2565,16 +2565,16 @@
     </Holdable>
   </Item>
   <!-- Medical Products & Toxins -->
-  <Item name="Crate of Stabilozine" identifier="ekutility_bulkcrate_stabilozine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of stabilozine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Stabilozine" identifier="ekutility_bulkcrate_stabilozine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of stabilozine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
       <!-- 40-->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="stabilozine" mincondition="0.1" />
@@ -2614,16 +2614,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Morphine" identifier="ekutility_bulkcrate_morphine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of morphine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Morphine" identifier="ekutility_bulkcrate_morphine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of morphine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 100 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antidama1" mincondition="0.1" />
@@ -2663,16 +2663,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Fentanyl" identifier="ekutility_bulkcrate_fentanyl" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of fentanyl.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Fentanyl" identifier="ekutility_bulkcrate_fentanyl" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of fentanyl.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="5000" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antidama2" mincondition="0.1" />
@@ -2712,16 +2712,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Deusizine" identifier="ekutility_bulkcrate_deusizine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of deusizine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.1"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Deusizine" identifier="ekutility_bulkcrate_deusizine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of deusizine.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.2"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="10000" soldeverywhere="false">
       <!-- 500 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deusizine" mincondition="0.1" />
@@ -2761,16 +2761,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Naloxone" identifier="ekutility_bulkcrate_naloxone" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of naloxone.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Naloxone" identifier="ekutility_bulkcrate_naloxone" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of naloxone.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="3200" soldeverywhere="false">
       <!-- 160 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antinarc" mincondition="0.1" />
@@ -2810,16 +2810,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Haloperidol" identifier="ekutility_bulkcrate_haloperidol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of haloperidol.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Haloperidol" identifier="ekutility_bulkcrate_haloperidol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of haloperidol.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2600" soldeverywhere="false">
       <!-- 130 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antipsychosis" mincondition="0.1" />
@@ -2859,16 +2859,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Methamphetamine" identifier="ekutility_bulkcrate_meth" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of methamphetamine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Methamphetamine" identifier="ekutility_bulkcrate_meth" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of methamphetamine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1000" soldeverywhere="false">
       <!-- 50 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="meth" mincondition="0.1" />
@@ -2908,16 +2908,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Anabolic Steroids" identifier="ekutility_bulkcrate_steroids" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of anabolic steroids.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Anabolic Steroids" identifier="ekutility_bulkcrate_steroids" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of anabolic steroids.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="7000" soldeverywhere="false">
       <!-- 350 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="steroids" mincondition="0.1" />
@@ -2957,16 +2957,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Hyperzine" identifier="ekutility_bulkcrate_hyperzine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of hyperzine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Hyperzine" identifier="ekutility_bulkcrate_hyperzine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of hyperzine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="9000" soldeverywhere="false">
       <!-- 450 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="hyperzine" mincondition="0.1" />
@@ -3006,16 +3006,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Liquid Oxygenite" identifier="ekutility_bulkcrate_liquidoxygenite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of liquid oxygenite.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Liquid Oxygenite" identifier="ekutility_bulkcrate_liquidoxygenite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of liquid oxygenite.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1600" soldeverywhere="false">
       <!-- 80 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="liquidoxygenite" mincondition="0.1" />
@@ -3055,16 +3055,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Broad-spectrum Antibiotics" identifier="ekutility_bulkcrate_antibiotics" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of liquid oxygenite.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Broad-spectrum Antibiotics" identifier="ekutility_bulkcrate_antibiotics" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of liquid oxygenite.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibiotics" mincondition="0.1" />
@@ -3104,16 +3104,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Chloral Hydrate" identifier="ekutility_bulkcrate_chloralhydrate" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of chloral hydrate.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Chloral Hydrate" identifier="ekutility_bulkcrate_chloralhydrate" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of chloral hydrate.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 100 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chloralhydrate" mincondition="0.1" />
@@ -3153,16 +3153,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Calyxanide" identifier="ekutility_bulkcrate_calyxanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of chloral hydrate.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Calyxanide" identifier="ekutility_bulkcrate_calyxanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of chloral hydrate.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="5000" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calyxanide" mincondition="0.1" />
@@ -3202,16 +3202,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Raptor Bane Extract" identifier="ekutility_bulkcrate_raptorbaneextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raptor bane extract.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Raptor Bane Extract" identifier="ekutility_bulkcrate_raptorbaneextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raptor bane extract.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="5000" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="raptorbaneextract" mincondition="0.1" />
@@ -3251,16 +3251,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Pomegrenade Extract" identifier="ekutility_bulkcrate_pomegrenadeextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of pomegrenade extract.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Pomegrenade Extract" identifier="ekutility_bulkcrate_pomegrenadeextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of pomegrenade extract.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="5000" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="pomegrenadeextract" mincondition="0.1" />
@@ -3300,16 +3300,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Cyanide" identifier="ekutility_bulkcrate_cyanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of cyanide.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Cyanide" identifier="ekutility_bulkcrate_cyanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of cyanide.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="4000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="cyanide" mincondition="0.1" />
@@ -3349,16 +3349,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Cyanide Antidote" identifier="ekutility_bulkcrate_cyanideantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of cyanide antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Cyanide Antidote" identifier="ekutility_bulkcrate_cyanideantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of cyanide antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 125 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="cyanideantidote" mincondition="0.1" />
@@ -3398,16 +3398,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sufforin" identifier="ekutility_bulkcrate_sufforin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of sufforin.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Sufforin" identifier="ekutility_bulkcrate_sufforin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of sufforin.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="4000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sufforin" mincondition="0.1" />
@@ -3447,16 +3447,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sufforin Antidote" identifier="ekutility_bulkcrate_sufforinantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of sufforin antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Sufforin Antidote" identifier="ekutility_bulkcrate_sufforinantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of sufforin antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 125 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sufforinantidote" mincondition="0.1" />
@@ -3496,16 +3496,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Morbusine" identifier="ekutility_bulkcrate_morbusine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of morbusine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Morbusine" identifier="ekutility_bulkcrate_morbusine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of morbusine.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="13000" soldeverywhere="false">
       <!-- 650 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="morbusine" mincondition="0.1" />
@@ -3545,16 +3545,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Morbusine Antidote" identifier="ekutility_bulkcrate_morbusineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of morbusine antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Morbusine Antidote" identifier="ekutility_bulkcrate_morbusineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of morbusine antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="7000" soldeverywhere="false">
       <!-- 350 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="morbusineantidote" mincondition="0.1" />
@@ -3594,16 +3594,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Radiotoxin" identifier="ekutility_bulkcrate_radiotoxin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of radiotoxin.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Radiotoxin" identifier="ekutility_bulkcrate_radiotoxin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of radiotoxin.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="4000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="radiotoxin" mincondition="0.1" />
@@ -3643,16 +3643,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Antirad" identifier="ekutility_bulkcrate_antirad" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of antirad.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Antirad" identifier="ekutility_bulkcrate_antirad" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of antirad.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 126 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antirad" mincondition="0.1" />
@@ -3692,16 +3692,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Deliriumine" identifier="ekutility_bulkcrate_deliriumine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of deliriumine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Deliriumine" identifier="ekutility_bulkcrate_deliriumine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of deliriumine.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="5000" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deliriumine" mincondition="0.1" />
@@ -3741,16 +3741,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Deliriumine Antidote" identifier="ekutility_bulkcrate_deliriumineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of deliriumine antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Deliriumine Antidote" identifier="ekutility_bulkcrate_deliriumineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of deliriumine antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 125 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deliriumineantidote" mincondition="0.1" />
@@ -3790,16 +3790,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Paralyzant" identifier="ekutility_bulkcrate_paralyzant" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of paralyzant.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Paralyzant" identifier="ekutility_bulkcrate_paralyzant" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of paralyzant.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="7000" soldeverywhere="false">
       <!-- 350 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="paralyzant" mincondition="0.1" />
@@ -3839,16 +3839,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Anaparalyzant" identifier="ekutility_bulkcrate_antiparalysis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of anaparalyzant.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Anaparalyzant" identifier="ekutility_bulkcrate_antiparalysis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of anaparalyzant.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="4000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antiparalysis" mincondition="0.1" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldfab.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldfab.xml
index 72a6c1ac..04bb46cf 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldfab.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldfab.xml	
@@ -2,14 +2,14 @@
 <Items>
   <!-- Raw Resources -->
   <Item name="Crate of Iron" identifier="ekutility_bulkcrate_iron" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw iron.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="50" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" mincondition="0.1" />
@@ -50,14 +50,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Aluminium" identifier="ekutility_bulkcrate_aluminium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw aluminium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="4" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="aluminium" mincondition="0.1" />
@@ -98,14 +98,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Copper" identifier="ekutility_bulkcrate_copper" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw copper.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.20" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="220" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" mincondition="0.1" />
@@ -146,14 +146,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Titanium" identifier="ekutility_bulkcrate_titanium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw titanium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="650" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titanium" mincondition="0.1" />
@@ -194,14 +194,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Carbon" identifier="ekutility_bulkcrate_carbon" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw carbon.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="100" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="carbon" mincondition="0.1" />
@@ -242,14 +242,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Lead" identifier="ekutility_bulkcrate_lead" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw lead.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="180" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lead" mincondition="0.1" />
@@ -290,14 +290,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Tin" identifier="ekutility_bulkcrate_tin" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw tin.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="110" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tin" mincondition="0.1" />
@@ -338,14 +338,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Zinc" identifier="ekutility_bulkcrate_zinc" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw zinc.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="260" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="zinc" mincondition="0.1" />
@@ -386,14 +386,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Silicon" identifier="ekutility_bulkcrate_silicon" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw silicon.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="310" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="silicon" mincondition="0.1" />
@@ -434,14 +434,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Steel Bars" identifier="ekutility_bulkcrate_steel" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of steel bars.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="200" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="steel" mincondition="0.1" />
@@ -482,14 +482,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Titanium Alloy Bars" identifier="ekutility_bulkcrate_titaniumaluminiumalloy" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of titanium-aluminium alloy bars.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titaniumaluminiumalloy" mincondition="0.1" />
@@ -530,14 +530,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Plastic" identifier="ekutility_bulkcrate_plastic" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw plastic.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="450" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="plastic" mincondition="0.1" />
@@ -578,14 +578,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Rubber" identifier="ekutility_bulkcrate_rubber" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw rubber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="200" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="2" />
-      <Price locationtype="research" multiplier="1" sold="false" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="6" />
+      <Price locationtype="research" multiplier="3" sold="false" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="rubber" mincondition="0.1" />
@@ -626,14 +626,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of FPGA Circuits" identifier="ekutility_bulkcrate_fpgacircuit" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of FPGA circuits.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="800">
-      <Price locationtype="outpost" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="city" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="city" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="fpgacircuit" mincondition="0.1" />
@@ -674,14 +674,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Organic Fiber" identifier="ekutility_bulkcrate_organicfiber" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of organic fiber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="300">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="organicfiber" mincondition="0.1" />
@@ -722,14 +722,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Ballistic Fiber" identifier="ekutility_bulkcrate_ballisticfiber" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of ballistic fiber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="300">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ballisticfiber" mincondition="0.1" />
@@ -770,14 +770,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Uranium" identifier="ekutility_bulkcrate_uranium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw uranium.">
-    <PreferredContainer primary="storagecab,reactorcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab,wreckreactorcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab,reactorcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,wreckreactorcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="5" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="15" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uranium" mincondition="0.1" />
@@ -817,14 +817,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Thorium" identifier="ekutility_bulkcrate_thorium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raw thorium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="310" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="thorium" mincondition="0.1" />
@@ -865,14 +865,14 @@
   </Item>
   <!-- Chemical Resources -->
   <Item name="Crate of Flash Powder" identifier="ekutility_bulkcrate_flashpowder" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of flash powder.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="900" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="flashpowder" mincondition="0.1" />
@@ -913,15 +913,15 @@
     </Holdable>
   </Item>
   <Item name="Crate of Lithium" identifier="ekutility_bulkcrate_lithium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of lithium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="880" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lithium" mincondition="0.1" />
@@ -962,15 +962,15 @@
     </Holdable>
   </Item>
   <Item name="Crate of Sodium" identifier="ekutility_bulkcrate_sodium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of sodium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="330" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sodium" mincondition="0.1" />
@@ -1011,15 +1011,15 @@
     </Holdable>
   </Item>
   <Item name="Crate of Magnesium" identifier="ekutility_bulkcrate_magnesium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of magnesium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="330" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="magnesium" mincondition="0.1" />
@@ -1060,15 +1060,15 @@
     </Holdable>
   </Item>
   <Item name="Crate of Potassium" identifier="ekutility_bulkcrate_potassium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of potassium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="100" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="potassium" mincondition="0.1" />
@@ -1109,15 +1109,15 @@
     </Holdable>
   </Item>
   <Item name="Crate of Chlorine" identifier="ekutility_bulkcrate_chlorine" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of chlorine.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="110" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chlorine" mincondition="0.1" />
@@ -1158,15 +1158,15 @@
     </Holdable>
   </Item>
   <Item name="Crate of Calcium" identifier="ekutility_bulkcrate_calcium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of calcium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="310" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calcium" mincondition="0.1" />
@@ -1207,15 +1207,15 @@
     </Holdable>
   </Item>
   <Item name="Crate of Phosphorus" identifier="ekutility_bulkcrate_phosphorus" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of phosphorus.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="150" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="phosphorus" mincondition="0.1" />
@@ -1256,15 +1256,15 @@
     </Holdable>
   </Item>
   <Item name="Crate of Ethanol" identifier="ekutility_bulkcrate_ethanol" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of ethanol.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="600" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ethanol" mincondition="0.1" />
@@ -1305,14 +1305,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Sulphuric Acid" identifier="ekutility_bulkcrate_sulphuricacid" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of sulphuric acid.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sulphuricacid" mincondition="0.1" />
@@ -1354,14 +1354,14 @@
   </Item>
   <!-- Explosives -->
   <Item name="Crate of UEX" identifier="ekutility_bulkcrate_uex" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of UEX.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="750">
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uex" mincondition="0.1" />
@@ -1402,14 +1402,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of C-4" identifier="ekutility_bulkcrate_c4block" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of C-4.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1600">
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="c4block" mincondition="0.1" />
@@ -1450,14 +1450,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Compound-N" identifier="ekutility_bulkcrate_compoundn" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of compound-N.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="1500">
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="compoundn" mincondition="0.1" />
@@ -1498,14 +1498,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of IC-4" identifier="ekutility_bulkcrate_ic4block" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of IC-4.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="4000">
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ic4block" mincondition="0.1" />
@@ -1547,14 +1547,14 @@
   </Item>
   <!-- Alien Resources -->
   <Item name="Crate of Physicorium" identifier="ekutility_bulkcrate_physicorium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of physicorium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="physicorium" mincondition="0.1" />
@@ -1595,14 +1595,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Fulgurium" identifier="ekutility_bulkcrate_fulgurium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of fulgurium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="fulgurium" mincondition="0.1" />
@@ -1643,14 +1643,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Sulphurite" identifier="ekutility_bulkcrate_sulphuriteshard" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of sulphurite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sulphuriteshard" mincondition="0.1" />
@@ -1691,14 +1691,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Oxygenite" identifier="ekutility_bulkcrate_oxygeniteshard" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of oxygenite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="oxygeniteshard" mincondition="0.1" />
@@ -1739,14 +1739,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Incendium" identifier="ekutility_bulkcrate_incendium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of incendium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="incendium" mincondition="0.1" />
@@ -1787,14 +1787,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Dementonite" identifier="ekutility_bulkcrate_dementonite" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of dementonite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="dementonite" mincondition="0.1" />
@@ -1836,14 +1836,14 @@
   </Item>
   <!-- Medical Resources -->
   <Item name="Crate of Bandages" identifier="ekutility_bulkcrate_antibleeding1" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of medical bandages.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" minavailable="1" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" minavailable="3" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding1" mincondition="0.1" />
@@ -1884,14 +1884,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Plastiseal" identifier="ekutility_bulkcrate_antibleeding2" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of plastiseal.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding2" mincondition="0.1" />
@@ -1932,14 +1932,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Antibiotic Glue" identifier="ekutility_bulkcrate_antibleeding3" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of antibiotic glue.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1400" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding3" mincondition="0.1" />
@@ -1980,14 +1980,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Tonic Liquid" identifier="ekutility_bulkcrate_tonicliquid" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of tonic liquid.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="750" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" minavailable="1" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" minavailable="3" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tonicliquid" mincondition="0.1" />
@@ -2028,14 +2028,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Saline" identifier="ekutility_bulkcrate_antibloodloss1" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of medical saline.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibloodloss1" mincondition="0.1" />
@@ -2076,14 +2076,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Blood Packs" identifier="ekutility_bulkcrate_antibloodloss2" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A medical transport container of blood packs.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2400" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibloodloss2" mincondition="0.1" />
@@ -2124,14 +2124,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Adrenaline" identifier="ekutility_bulkcrate_adrenaline" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of medical adrenaline.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="600" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="adrenaline" mincondition="0.1" />
@@ -2172,14 +2172,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Opium" identifier="ekutility_bulkcrate_opium" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of opium.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="opium" mincondition="0.1" />
@@ -2220,14 +2220,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Elastin" identifier="ekutility_bulkcrate_elastin" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of elastin.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="elastin" mincondition="0.1" />
@@ -2268,14 +2268,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Alien Blood" identifier="ekutility_bulkcrate_alienblood" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A medical transport container of alien blood samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1200" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="0.85" sold="false" />
-      <Price locationtype="city" multiplier="0.85" sold="false" />
-      <Price locationtype="research" multiplier="1.2" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.85" sold="false" />
+      <Price locationtype="outpost" multiplier="2.55" sold="false" />
+      <Price locationtype="city" multiplier="2.55" sold="false" />
+      <Price locationtype="research" multiplier="3.6" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.55" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="alienblood" mincondition="0.1" />
@@ -2316,14 +2316,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Adrenaline Glands" identifier="ekutility_bulkcrate_adrenalinegland" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A medical transport container of adrenaline gland samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1.1" sold="false" />
-      <Price locationtype="research" multiplier="1.2" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.85" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3.3" sold="false" />
+      <Price locationtype="research" multiplier="3.6" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.55" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="adrenalinegland" mincondition="0.1" />
@@ -2364,14 +2364,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Swim Bladder" identifier="ekutility_bulkcrate_swimbladder" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A medical transport container of swim bladder samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="swimbladder" mincondition="0.1" />
@@ -2412,14 +2412,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Paralyxis" identifier="ekutility_bulkcrate_paralyxis" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A medical transport container of paralyxis samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="paralyxis" mincondition="0.1" />
@@ -2460,14 +2460,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Velonaceps Calyx" identifier="ekutility_bulkcrate_huskeggs" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A medical transport container of velonaceps calyx egg samples.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="6000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1.2" sold="false" />
-      <Price locationtype="city" multiplier="1.3" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.2" sold="false" />
-      <Price locationtype="mine" multiplier="1.3" sold="false" />
+      <Price locationtype="outpost" multiplier="3.6" sold="false" />
+      <Price locationtype="city" multiplier="3.9" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.6" sold="false" />
+      <Price locationtype="mine" multiplier="3.9" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="huskeggs" mincondition="0.1" />
@@ -2509,14 +2509,14 @@
   </Item>
   <!-- Medical Products & Toxins -->
   <Item name="Crate of Stabilozine" identifier="ekutility_bulkcrate_stabilozine" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of stabilozine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="stabilozine" mincondition="0.1" />
@@ -2557,14 +2557,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Morphine" identifier="ekutility_bulkcrate_morphine" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of morphine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antidama1" mincondition="0.1" />
@@ -2605,14 +2605,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Fentanyl" identifier="ekutility_bulkcrate_fentanyl" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of fentanyl.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antidama2" mincondition="0.1" />
@@ -2653,14 +2653,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Deusizine" identifier="ekutility_bulkcrate_deusizine" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of deusizine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.1"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.2"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="5000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deusizine" mincondition="0.1" />
@@ -2701,14 +2701,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Naloxone" identifier="ekutility_bulkcrate_naloxone" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of naloxone.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1600" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antinarc" mincondition="0.1" />
@@ -2749,14 +2749,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Haloperidol" identifier="ekutility_bulkcrate_haloperidol" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of haloperidol.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1300" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antipsychosis" mincondition="0.1" />
@@ -2797,14 +2797,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Methamphetamine" identifier="ekutility_bulkcrate_meth" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of methamphetamine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="meth" mincondition="0.1" />
@@ -2845,14 +2845,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Anabolic Steroids" identifier="ekutility_bulkcrate_steroids" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of anabolic steroids.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="3500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="steroids" mincondition="0.1" />
@@ -2893,14 +2893,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Hyperzine" identifier="ekutility_bulkcrate_hyperzine" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of hyperzine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="4500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="hyperzine" mincondition="0.1" />
@@ -2941,14 +2941,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Liquid Oxygenite" identifier="ekutility_bulkcrate_liquidoxygenite" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of liquid oxygenite.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="liquidoxygenite" mincondition="0.1" />
@@ -2989,14 +2989,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Broad-spectrum Antibiotics" identifier="ekutility_bulkcrate_antibiotics" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of liquid oxygenite.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibiotics" mincondition="0.1" />
@@ -3037,14 +3037,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Chloral Hydrate" identifier="ekutility_bulkcrate_chloralhydrate" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of chloral hydrate.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chloralhydrate" mincondition="0.1" />
@@ -3085,14 +3085,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Calyxanide" identifier="ekutility_bulkcrate_calyxanide" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of chloral hydrate.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calyxanide" mincondition="0.1" />
@@ -3133,14 +3133,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Raptor Bane Extract" identifier="ekutility_bulkcrate_raptorbaneextract" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of raptor bane extract.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="raptorbaneextract" mincondition="0.1" />
@@ -3181,14 +3181,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Pomegrenade Extract" identifier="ekutility_bulkcrate_pomegrenadeextract" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of pomegrenade extract.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="pomegrenadeextract" mincondition="0.1" />
@@ -3229,14 +3229,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Cyanide" identifier="ekutility_bulkcrate_cyanide" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of cyanide.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="cyanide" mincondition="0.1" />
@@ -3277,14 +3277,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Cyanide Antidote" identifier="ekutility_bulkcrate_cyanideantidote" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of cyanide antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1250" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="cyanideantidote" mincondition="0.1" />
@@ -3325,14 +3325,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Sufforin" identifier="ekutility_bulkcrate_sufforin" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of sufforin.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sufforin" mincondition="0.1" />
@@ -3373,14 +3373,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Sufforin Antidote" identifier="ekutility_bulkcrate_sufforinantidote" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of sufforin antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1250" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sufforinantidote" mincondition="0.1" />
@@ -3421,14 +3421,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Morbusine" identifier="ekutility_bulkcrate_morbusine" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of morbusine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="6500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="morbusine" mincondition="0.1" />
@@ -3469,14 +3469,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Morbusine Antidote" identifier="ekutility_bulkcrate_morbusineantidote" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of morbusine antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="3500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="morbusineantidote" mincondition="0.1" />
@@ -3517,14 +3517,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Radiotoxin" identifier="ekutility_bulkcrate_radiotoxin" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of radiotoxin.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="radiotoxin" mincondition="0.1" />
@@ -3565,14 +3565,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Antirad" identifier="ekutility_bulkcrate_antirad" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of antirad.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1260" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antirad" mincondition="0.1" />
@@ -3613,14 +3613,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Deliriumine" identifier="ekutility_bulkcrate_deliriumine" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of deliriumine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deliriumine" mincondition="0.1" />
@@ -3661,14 +3661,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Deliriumine Antidote" identifier="ekutility_bulkcrate_deliriumineantidote" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of deliriumine antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1250" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deliriumineantidote" mincondition="0.1" />
@@ -3709,14 +3709,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Paralyzant" identifier="ekutility_bulkcrate_paralyzant" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of paralyzant.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="3500" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="paralyzant" mincondition="0.1" />
@@ -3757,14 +3757,14 @@
     </Holdable>
   </Item>
   <Item name="Crate of Anaparalyzant" identifier="ekutility_bulkcrate_antiparalysis" category="Material" tags="smallitem,mediumitem,toolbox,crate,metalcrate" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" description="A bulk storage/transportation container of anaparalyzant.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antiparalysis" mincondition="0.1" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldids.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldids.xml
index 5f36fbfb..95b9dc1e 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldids.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldids.xml	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <!-- Raw Resources -->
-  <Item name="Crate of Iron" identifier="ekutility_bulkcrate_iron" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw iron.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Iron" identifier="ekutility_bulkcrate_iron" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw iron.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="50" soldeverywhere="false">
       <!-- 5 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" mincondition="0.1" />
@@ -55,16 +55,16 @@
     </Wearable>
 	-->
   </Item>
-  <Item name="Crate of Aluminium" identifier="ekutility_bulkcrate_aluminium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw aluminium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Aluminium" identifier="ekutility_bulkcrate_aluminium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw aluminium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="4" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="aluminium" mincondition="0.1" />
@@ -104,16 +104,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Copper" identifier="ekutility_bulkcrate_copper" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw copper.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.20" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Copper" identifier="ekutility_bulkcrate_copper" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw copper.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="220" soldeverywhere="false">
       <!-- 22 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" mincondition="0.1" />
@@ -153,16 +153,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Titanium" identifier="ekutility_bulkcrate_titanium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw titanium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Titanium" identifier="ekutility_bulkcrate_titanium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw titanium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="650" soldeverywhere="false">
       <!-- 65 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titanium" mincondition="0.1" />
@@ -202,16 +202,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Carbon" identifier="ekutility_bulkcrate_carbon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw carbon.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Carbon" identifier="ekutility_bulkcrate_carbon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw carbon.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="100" soldeverywhere="false">
       <!-- 10 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="carbon" mincondition="0.1" />
@@ -251,16 +251,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Lead" identifier="ekutility_bulkcrate_lead" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw lead.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Lead" identifier="ekutility_bulkcrate_lead" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw lead.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="180" soldeverywhere="false">
       <!-- 18 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lead" mincondition="0.1" />
@@ -300,16 +300,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Tin" identifier="ekutility_bulkcrate_tin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw tin.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Tin" identifier="ekutility_bulkcrate_tin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw tin.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="110" soldeverywhere="false">
       <!-- 11 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tin" mincondition="0.1" />
@@ -349,16 +349,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Zinc" identifier="ekutility_bulkcrate_zinc" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw zinc.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Zinc" identifier="ekutility_bulkcrate_zinc" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw zinc.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="260" soldeverywhere="false">
       <!-- 26 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="zinc" mincondition="0.1" />
@@ -398,16 +398,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Silicon" identifier="ekutility_bulkcrate_silicon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw silicon.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Silicon" identifier="ekutility_bulkcrate_silicon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw silicon.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="310" soldeverywhere="false">
       <!-- 31 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="silicon" mincondition="0.1" />
@@ -447,16 +447,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Steel Bars" identifier="ekutility_bulkcrate_steel" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of steel bars.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Steel Bars" identifier="ekutility_bulkcrate_steel" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of steel bars.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="200" soldeverywhere="false">
       <!-- 20 -->
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="steel" mincondition="0.1" />
@@ -496,16 +496,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Titanium Alloy Bars" identifier="ekutility_bulkcrate_titaniumaluminiumalloy" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of titanium-aluminium alloy bars.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Titanium Alloy Bars" identifier="ekutility_bulkcrate_titaniumaluminiumalloy" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of titanium-aluminium alloy bars.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1500" soldeverywhere="false">
       <!-- 150 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titaniumaluminiumalloy" mincondition="0.1" />
@@ -545,16 +545,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Plastic" identifier="ekutility_bulkcrate_plastic" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw plastic.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Plastic" identifier="ekutility_bulkcrate_plastic" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw plastic.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="450" soldeverywhere="false">
       <!-- 45 -->
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="plastic" mincondition="0.1" />
@@ -594,16 +594,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Rubber" identifier="ekutility_bulkcrate_rubber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw rubber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Rubber" identifier="ekutility_bulkcrate_rubber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw rubber.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="200" soldeverywhere="false">
       <!-- 20 -->
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="2" />
-      <Price locationtype="research" multiplier="1" sold="false" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="6" />
+      <Price locationtype="research" multiplier="3" sold="false" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="rubber" mincondition="0.1" />
@@ -643,16 +643,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of FPGA Circuits" identifier="ekutility_bulkcrate_fpgacircuit" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of FPGA circuits.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of FPGA Circuits" identifier="ekutility_bulkcrate_fpgacircuit" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of FPGA circuits.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="800">
       <!-- 80 -->
-      <Price locationtype="outpost" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="city" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="city" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="fpgacircuit" mincondition="0.1" />
@@ -692,16 +692,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Organic Fiber" identifier="ekutility_bulkcrate_organicfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of organic fiber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Organic Fiber" identifier="ekutility_bulkcrate_organicfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of organic fiber.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="300">
       <!-- 30 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="organicfiber" mincondition="0.1" />
@@ -741,16 +741,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Ballistic Fiber" identifier="ekutility_bulkcrate_ballisticfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of ballistic fiber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Ballistic Fiber" identifier="ekutility_bulkcrate_ballisticfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of ballistic fiber.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1500">
       <!-- 150 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ballisticfiber" mincondition="0.1" />
@@ -790,16 +790,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Uranium" identifier="ekutility_bulkcrate_uranium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw uranium.">
-    <PreferredContainer primary="storagecab,reactorcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab,wreckreactorcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Uranium" identifier="ekutility_bulkcrate_uranium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw uranium.">
+    <PreferredContainer primary="storagecab,reactorcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,wreckreactorcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="500" soldeverywhere="false">
       <!-- 50 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uranium" mincondition="0.1" />
@@ -838,16 +838,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Thorium" identifier="ekutility_bulkcrate_thorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raw thorium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Thorium" identifier="ekutility_bulkcrate_thorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raw thorium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="310" soldeverywhere="false">
       <!-- 31 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="thorium" mincondition="0.1" />
@@ -887,16 +887,16 @@
     </Holdable>
   </Item>
   <!-- Chemical Resources -->
-  <Item name="Crate of Flash Powder" identifier="ekutility_bulkcrate_flashpowder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of flash powder.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Flash Powder" identifier="ekutility_bulkcrate_flashpowder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of flash powder.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="900" soldeverywhere="false">
       <!-- 90 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="flashpowder" mincondition="0.1" />
@@ -936,17 +936,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Lithium" identifier="ekutility_bulkcrate_lithium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of lithium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Lithium" identifier="ekutility_bulkcrate_lithium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of lithium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="880" soldeverywhere="false">
       <!-- 88 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lithium" mincondition="0.1" />
@@ -986,17 +986,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sodium" identifier="ekutility_bulkcrate_sodium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of sodium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Sodium" identifier="ekutility_bulkcrate_sodium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of sodium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="330" soldeverywhere="false">
       <!-- 33 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sodium" mincondition="0.1" />
@@ -1036,17 +1036,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Magnesium" identifier="ekutility_bulkcrate_magnesium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of magnesium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Magnesium" identifier="ekutility_bulkcrate_magnesium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of magnesium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="330" soldeverywhere="false">
       <!-- 33 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="magnesium" mincondition="0.1" />
@@ -1086,17 +1086,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Potassium" identifier="ekutility_bulkcrate_potassium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of potassium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Potassium" identifier="ekutility_bulkcrate_potassium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of potassium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="100" soldeverywhere="false">
       <!-- 10 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="potassium" mincondition="0.1" />
@@ -1136,17 +1136,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Chlorine" identifier="ekutility_bulkcrate_chlorine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of chlorine.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Chlorine" identifier="ekutility_bulkcrate_chlorine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of chlorine.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="110" soldeverywhere="false">
       <!-- 11 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chlorine" mincondition="0.1" />
@@ -1186,17 +1186,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Calcium" identifier="ekutility_bulkcrate_calcium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of calcium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Calcium" identifier="ekutility_bulkcrate_calcium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of calcium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="310" soldeverywhere="false">
       <!-- 31 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calcium" mincondition="0.1" />
@@ -1236,17 +1236,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Phosphorus" identifier="ekutility_bulkcrate_phosphorus" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of phosphorus.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Phosphorus" identifier="ekutility_bulkcrate_phosphorus" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of phosphorus.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="150" soldeverywhere="false">
       <!-- 15 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="phosphorus" mincondition="0.1" />
@@ -1286,17 +1286,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Ethanol" identifier="ekutility_bulkcrate_ethanol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of ethanol.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Ethanol" identifier="ekutility_bulkcrate_ethanol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of ethanol.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="600" soldeverywhere="false">
       <!-- 60 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ethanol" mincondition="0.1" />
@@ -1336,16 +1336,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sulphuric Acid" identifier="ekutility_bulkcrate_sulphuricacid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of sulphuric acid.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Sulphuric Acid" identifier="ekutility_bulkcrate_sulphuricacid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of sulphuric acid.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
       <!-- 80 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sulphuricacid" mincondition="0.1" />
@@ -1386,16 +1386,16 @@
     </Holdable>
   </Item>
   <!-- Explosives -->
-  <Item name="Crate of UEX" identifier="ekutility_bulkcrate_uex" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of UEX.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of UEX" identifier="ekutility_bulkcrate_uex" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of UEX.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="750">
       <!-- 75 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uex" mincondition="0.1" />
@@ -1435,16 +1435,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of C-4" identifier="ekutility_bulkcrate_c4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of C-4.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of C-4" identifier="ekutility_bulkcrate_c4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of C-4.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="1600">
       <!-- 160 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="c4block" mincondition="0.1" />
@@ -1484,16 +1484,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Compound-N" identifier="ekutility_bulkcrate_compoundn" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of compound-N.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Compound-N" identifier="ekutility_bulkcrate_compoundn" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of compound-N.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="1500">
       <!-- 150 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="compoundn" mincondition="0.1" />
@@ -1533,16 +1533,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of IC-4" identifier="ekutility_bulkcrate_ic4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of IC-4.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of IC-4" identifier="ekutility_bulkcrate_ic4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of IC-4.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="4000">
       <!-- 400 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.25" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.75" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ic4block" mincondition="0.1" />
@@ -1583,16 +1583,16 @@
     </Holdable>
   </Item>
   <!-- Alien Resources -->
-  <Item name="Crate of Physicorium" identifier="ekutility_bulkcrate_physicorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of physicorium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Physicorium" identifier="ekutility_bulkcrate_physicorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of physicorium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="physicorium" mincondition="0.1" />
@@ -1632,16 +1632,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Fulgurium" identifier="ekutility_bulkcrate_fulgurium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of fulgurium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Fulgurium" identifier="ekutility_bulkcrate_fulgurium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of fulgurium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="fulgurium" mincondition="0.1" />
@@ -1681,16 +1681,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sulphurite" identifier="ekutility_bulkcrate_sulphuriteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of sulphurite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Sulphurite" identifier="ekutility_bulkcrate_sulphuriteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of sulphurite.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sulphuriteshard" mincondition="0.1" />
@@ -1730,16 +1730,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Oxygenite" identifier="ekutility_bulkcrate_oxygeniteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of oxygenite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Oxygenite" identifier="ekutility_bulkcrate_oxygeniteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of oxygenite.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="oxygeniteshard" mincondition="0.1" />
@@ -1779,16 +1779,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Incendium" identifier="ekutility_bulkcrate_incendium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of incendium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Incendium" identifier="ekutility_bulkcrate_incendium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of incendium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="incendium" mincondition="0.1" />
@@ -1828,16 +1828,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Dementonite" identifier="ekutility_bulkcrate_dementonite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of dementonite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Dementonite" identifier="ekutility_bulkcrate_dementonite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of dementonite.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="dementonite" mincondition="0.1" />
@@ -1878,16 +1878,16 @@
     </Holdable>
   </Item>
   <!-- Medical Resources -->
-  <Item name="Crate of Bandages" identifier="ekutility_bulkcrate_antibleeding1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of medical bandages.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Bandages" identifier="ekutility_bulkcrate_antibleeding1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of medical bandages.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" minavailable="1" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" minavailable="3" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding1" mincondition="0.1" />
@@ -1927,16 +1927,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Plastiseal" identifier="ekutility_bulkcrate_antibleeding2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of plastiseal.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Plastiseal" identifier="ekutility_bulkcrate_antibleeding2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of plastiseal.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1000" soldeverywhere="false">
       <!-- 100 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding2" mincondition="0.1" />
@@ -1976,16 +1976,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Antibiotic Glue" identifier="ekutility_bulkcrate_antibleeding3" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of antibiotic glue.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Antibiotic Glue" identifier="ekutility_bulkcrate_antibleeding3" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of antibiotic glue.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1400" soldeverywhere="false">
       <!-- 140 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding3" mincondition="0.1" />
@@ -2025,16 +2025,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Tonic Liquid" identifier="ekutility_bulkcrate_tonicliquid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of tonic liquid.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Tonic Liquid" identifier="ekutility_bulkcrate_tonicliquid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of tonic liquid.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="750" soldeverywhere="false">
       <!-- 75 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" minavailable="1" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" minavailable="3" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tonicliquid" mincondition="0.1" />
@@ -2074,16 +2074,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Saline" identifier="ekutility_bulkcrate_antibloodloss1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of medical saline.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Saline" identifier="ekutility_bulkcrate_antibloodloss1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of medical saline.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="500" soldeverywhere="false">
       <!-- 50 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibloodloss1" mincondition="0.1" />
@@ -2123,16 +2123,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Blood Packs" identifier="ekutility_bulkcrate_antibloodloss2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A medical transport container of blood packs.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Blood Packs" identifier="ekutility_bulkcrate_antibloodloss2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A medical transport container of blood packs.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2400" soldeverywhere="false">
       <!-- 240 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibloodloss2" mincondition="0.1" />
@@ -2172,16 +2172,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Adrenaline" identifier="ekutility_bulkcrate_adrenaline" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of medical adrenaline.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Adrenaline" identifier="ekutility_bulkcrate_adrenaline" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of medical adrenaline.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="600" soldeverywhere="false">
       <!-- 600 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="adrenaline" mincondition="0.1" />
@@ -2221,16 +2221,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Opium" identifier="ekutility_bulkcrate_opium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of opium.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Opium" identifier="ekutility_bulkcrate_opium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of opium.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="opium" mincondition="0.1" />
@@ -2270,16 +2270,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Elastin" identifier="ekutility_bulkcrate_elastin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of elastin.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Elastin" identifier="ekutility_bulkcrate_elastin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of elastin.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="elastin" mincondition="0.1" />
@@ -2319,16 +2319,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Alien Blood" identifier="ekutility_bulkcrate_alienblood" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A medical transport container of alien blood samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Alien Blood" identifier="ekutility_bulkcrate_alienblood" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A medical transport container of alien blood samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1200" soldeverywhere="false">
       <!-- 120 -->
-      <Price locationtype="outpost" multiplier="0.85" sold="false" />
-      <Price locationtype="city" multiplier="0.85" sold="false" />
-      <Price locationtype="research" multiplier="1.2" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.85" sold="false" />
+      <Price locationtype="outpost" multiplier="2.55" sold="false" />
+      <Price locationtype="city" multiplier="2.55" sold="false" />
+      <Price locationtype="research" multiplier="3.6" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.55" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="alienblood" mincondition="0.1" />
@@ -2368,16 +2368,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Adrenaline Glands" identifier="ekutility_bulkcrate_adrenalinegland" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A medical transport container of adrenaline gland samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Adrenaline Glands" identifier="ekutility_bulkcrate_adrenalinegland" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A medical transport container of adrenaline gland samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1.1" sold="false" />
-      <Price locationtype="research" multiplier="1.2" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.85" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3.3" sold="false" />
+      <Price locationtype="research" multiplier="3.6" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.55" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="adrenalinegland" mincondition="0.1" />
@@ -2417,16 +2417,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Swim Bladder" identifier="ekutility_bulkcrate_swimbladder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A medical transport container of swim bladder samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Swim Bladder" identifier="ekutility_bulkcrate_swimbladder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A medical transport container of swim bladder samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="swimbladder" mincondition="0.1" />
@@ -2466,16 +2466,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Paralyxis" identifier="ekutility_bulkcrate_paralyxis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A medical transport container of paralyxis samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Paralyxis" identifier="ekutility_bulkcrate_paralyxis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A medical transport container of paralyxis samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="paralyxis" mincondition="0.1" />
@@ -2515,16 +2515,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Velonaceps Calyx" identifier="ekutility_bulkcrate_huskeggs" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A medical transport container of velonaceps calyx egg samples.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Velonaceps Calyx" identifier="ekutility_bulkcrate_huskeggs" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A medical transport container of velonaceps calyx egg samples.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="6000" soldeverywhere="false">
       <!-- 600 -->
-      <Price locationtype="outpost" multiplier="1.2" sold="false" />
-      <Price locationtype="city" multiplier="1.3" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.2" sold="false" />
-      <Price locationtype="mine" multiplier="1.3" sold="false" />
+      <Price locationtype="outpost" multiplier="3.6" sold="false" />
+      <Price locationtype="city" multiplier="3.9" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.6" sold="false" />
+      <Price locationtype="mine" multiplier="3.9" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="huskeggs" mincondition="0.1" />
@@ -2565,16 +2565,16 @@
     </Holdable>
   </Item>
   <!-- Medical Products & Toxins -->
-  <Item name="Crate of Stabilozine" identifier="ekutility_bulkcrate_stabilozine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of stabilozine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Stabilozine" identifier="ekutility_bulkcrate_stabilozine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of stabilozine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40-->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="stabilozine" mincondition="0.1" />
@@ -2614,16 +2614,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Morphine" identifier="ekutility_bulkcrate_morphine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of morphine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Morphine" identifier="ekutility_bulkcrate_morphine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of morphine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1000" soldeverywhere="false">
       <!-- 100 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antidama1" mincondition="0.1" />
@@ -2663,16 +2663,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Fentanyl" identifier="ekutility_bulkcrate_fentanyl" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of fentanyl.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Fentanyl" identifier="ekutility_bulkcrate_fentanyl" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of fentanyl.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antidama2" mincondition="0.1" />
@@ -2712,16 +2712,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Deusizine" identifier="ekutility_bulkcrate_deusizine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of deusizine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.1"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Deusizine" identifier="ekutility_bulkcrate_deusizine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of deusizine.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.2"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="5000" soldeverywhere="false">
       <!-- 500 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deusizine" mincondition="0.1" />
@@ -2761,16 +2761,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Naloxone" identifier="ekutility_bulkcrate_naloxone" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of naloxone.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Naloxone" identifier="ekutility_bulkcrate_naloxone" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of naloxone.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1600" soldeverywhere="false">
       <!-- 160 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antinarc" mincondition="0.1" />
@@ -2810,16 +2810,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Haloperidol" identifier="ekutility_bulkcrate_haloperidol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of haloperidol.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Haloperidol" identifier="ekutility_bulkcrate_haloperidol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of haloperidol.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1300" soldeverywhere="false">
       <!-- 130 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antipsychosis" mincondition="0.1" />
@@ -2859,16 +2859,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Methamphetamine" identifier="ekutility_bulkcrate_meth" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of methamphetamine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Methamphetamine" identifier="ekutility_bulkcrate_meth" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of methamphetamine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="500" soldeverywhere="false">
       <!-- 50 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="meth" mincondition="0.1" />
@@ -2908,16 +2908,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Anabolic Steroids" identifier="ekutility_bulkcrate_steroids" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of anabolic steroids.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Anabolic Steroids" identifier="ekutility_bulkcrate_steroids" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of anabolic steroids.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="3500" soldeverywhere="false">
       <!-- 350 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="steroids" mincondition="0.1" />
@@ -2957,16 +2957,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Hyperzine" identifier="ekutility_bulkcrate_hyperzine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of hyperzine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Hyperzine" identifier="ekutility_bulkcrate_hyperzine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of hyperzine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="4500" soldeverywhere="false">
       <!-- 450 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="hyperzine" mincondition="0.1" />
@@ -3006,16 +3006,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Liquid Oxygenite" identifier="ekutility_bulkcrate_liquidoxygenite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of liquid oxygenite.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Liquid Oxygenite" identifier="ekutility_bulkcrate_liquidoxygenite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of liquid oxygenite.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
       <!-- 80 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="liquidoxygenite" mincondition="0.1" />
@@ -3055,16 +3055,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Broad-spectrum Antibiotics" identifier="ekutility_bulkcrate_antibiotics" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of liquid oxygenite.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Broad-spectrum Antibiotics" identifier="ekutility_bulkcrate_antibiotics" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of liquid oxygenite.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibiotics" mincondition="0.1" />
@@ -3104,16 +3104,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Chloral Hydrate" identifier="ekutility_bulkcrate_chloralhydrate" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of chloral hydrate.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Chloral Hydrate" identifier="ekutility_bulkcrate_chloralhydrate" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of chloral hydrate.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1000" soldeverywhere="false">
       <!-- 100 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chloralhydrate" mincondition="0.1" />
@@ -3153,16 +3153,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Calyxanide" identifier="ekutility_bulkcrate_calyxanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of chloral hydrate.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Calyxanide" identifier="ekutility_bulkcrate_calyxanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of chloral hydrate.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calyxanide" mincondition="0.1" />
@@ -3202,16 +3202,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Raptor Bane Extract" identifier="ekutility_bulkcrate_raptorbaneextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of raptor bane extract.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Raptor Bane Extract" identifier="ekutility_bulkcrate_raptorbaneextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of raptor bane extract.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="raptorbaneextract" mincondition="0.1" />
@@ -3251,16 +3251,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Pomegrenade Extract" identifier="ekutility_bulkcrate_pomegrenadeextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of pomegrenade extract.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Pomegrenade Extract" identifier="ekutility_bulkcrate_pomegrenadeextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of pomegrenade extract.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="pomegrenadeextract" mincondition="0.1" />
@@ -3300,16 +3300,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Cyanide" identifier="ekutility_bulkcrate_cyanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of cyanide.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Cyanide" identifier="ekutility_bulkcrate_cyanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of cyanide.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="cyanide" mincondition="0.1" />
@@ -3349,16 +3349,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Cyanide Antidote" identifier="ekutility_bulkcrate_cyanideantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of cyanide antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Cyanide Antidote" identifier="ekutility_bulkcrate_cyanideantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of cyanide antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1250" soldeverywhere="false">
       <!-- 125 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="cyanideantidote" mincondition="0.1" />
@@ -3398,16 +3398,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sufforin" identifier="ekutility_bulkcrate_sufforin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of sufforin.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Sufforin" identifier="ekutility_bulkcrate_sufforin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of sufforin.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sufforin" mincondition="0.1" />
@@ -3447,16 +3447,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sufforin Antidote" identifier="ekutility_bulkcrate_sufforinantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of sufforin antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Sufforin Antidote" identifier="ekutility_bulkcrate_sufforinantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of sufforin antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1250" soldeverywhere="false">
       <!-- 125 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sufforinantidote" mincondition="0.1" />
@@ -3496,16 +3496,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Morbusine" identifier="ekutility_bulkcrate_morbusine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of morbusine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Morbusine" identifier="ekutility_bulkcrate_morbusine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of morbusine.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="6500" soldeverywhere="false">
       <!-- 650 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="morbusine" mincondition="0.1" />
@@ -3545,16 +3545,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Morbusine Antidote" identifier="ekutility_bulkcrate_morbusineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of morbusine antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Morbusine Antidote" identifier="ekutility_bulkcrate_morbusineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of morbusine antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="3500" soldeverywhere="false">
       <!-- 350 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="morbusineantidote" mincondition="0.1" />
@@ -3594,16 +3594,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Radiotoxin" identifier="ekutility_bulkcrate_radiotoxin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of radiotoxin.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Radiotoxin" identifier="ekutility_bulkcrate_radiotoxin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of radiotoxin.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="radiotoxin" mincondition="0.1" />
@@ -3643,16 +3643,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Antirad" identifier="ekutility_bulkcrate_antirad" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of antirad.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Antirad" identifier="ekutility_bulkcrate_antirad" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of antirad.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1260" soldeverywhere="false">
       <!-- 126 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antirad" mincondition="0.1" />
@@ -3692,16 +3692,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Deliriumine" identifier="ekutility_bulkcrate_deliriumine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of deliriumine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Deliriumine" identifier="ekutility_bulkcrate_deliriumine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of deliriumine.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deliriumine" mincondition="0.1" />
@@ -3741,16 +3741,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Deliriumine Antidote" identifier="ekutility_bulkcrate_deliriumineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of deliriumine antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Deliriumine Antidote" identifier="ekutility_bulkcrate_deliriumineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of deliriumine antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1250" soldeverywhere="false">
       <!-- 125 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deliriumineantidote" mincondition="0.1" />
@@ -3790,16 +3790,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Paralyzant" identifier="ekutility_bulkcrate_paralyzant" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of paralyzant.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Paralyzant" identifier="ekutility_bulkcrate_paralyzant" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of paralyzant.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="3500" soldeverywhere="false">
       <!-- 350 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="paralyzant" mincondition="0.1" />
@@ -3839,16 +3839,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Anaparalyzant" identifier="ekutility_bulkcrate_antiparalysis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="3" description="A bulk storage/transportation container of anaparalyzant.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Anaparalyzant" identifier="ekutility_bulkcrate_antiparalysis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer,ek_densifiedresource" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="6" description="A bulk storage/transportation container of anaparalyzant.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antiparalysis" mincondition="0.1" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldstacking.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldstacking.xml
index cbb0ca61..438409a7 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldstacking.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Materials/ekutility_densifiedmaterials_oldstacking.xml	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <!-- Raw Resources -->
-  <Item name="Crate of Iron" identifier="ekutility_bulkcrate_iron" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw iron.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Iron" identifier="ekutility_bulkcrate_iron" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw iron.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="50" soldeverywhere="false">
       <!-- 5 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" mincondition="0.1" />
@@ -55,16 +55,16 @@
     </Wearable>
 	-->
   </Item>
-  <Item name="Crate of Aluminium" identifier="ekutility_bulkcrate_aluminium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw aluminium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Aluminium" identifier="ekutility_bulkcrate_aluminium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw aluminium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="4" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="aluminium" mincondition="0.1" />
@@ -104,16 +104,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Copper" identifier="ekutility_bulkcrate_copper" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw copper.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.20" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Copper" identifier="ekutility_bulkcrate_copper" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw copper.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="220" soldeverywhere="false">
       <!-- 22 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" mincondition="0.1" />
@@ -153,16 +153,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Titanium" identifier="ekutility_bulkcrate_titanium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw titanium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Titanium" identifier="ekutility_bulkcrate_titanium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw titanium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="650" soldeverywhere="false">
       <!-- 65 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titanium" mincondition="0.1" />
@@ -202,16 +202,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Carbon" identifier="ekutility_bulkcrate_carbon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw carbon.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Carbon" identifier="ekutility_bulkcrate_carbon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw carbon.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="100" soldeverywhere="false">
       <!-- 10 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="carbon" mincondition="0.1" />
@@ -251,16 +251,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Lead" identifier="ekutility_bulkcrate_lead" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw lead.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Lead" identifier="ekutility_bulkcrate_lead" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw lead.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="180" soldeverywhere="false">
       <!-- 18 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lead" mincondition="0.1" />
@@ -300,16 +300,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Tin" identifier="ekutility_bulkcrate_tin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw tin.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Tin" identifier="ekutility_bulkcrate_tin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw tin.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="110" soldeverywhere="false">
       <!-- 11 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tin" mincondition="0.1" />
@@ -349,16 +349,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Zinc" identifier="ekutility_bulkcrate_zinc" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw zinc.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Zinc" identifier="ekutility_bulkcrate_zinc" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw zinc.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="260" soldeverywhere="false">
       <!-- 26 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="zinc" mincondition="0.1" />
@@ -398,16 +398,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Silicon" identifier="ekutility_bulkcrate_silicon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw silicon.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Silicon" identifier="ekutility_bulkcrate_silicon" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw silicon.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="310" soldeverywhere="false">
       <!-- 31 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="silicon" mincondition="0.1" />
@@ -447,16 +447,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Steel Bars" identifier="ekutility_bulkcrate_steel" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of steel bars.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Steel Bars" identifier="ekutility_bulkcrate_steel" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of steel bars.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="200" soldeverywhere="false">
       <!-- 20 -->
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="steel" mincondition="0.1" />
@@ -496,16 +496,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Titanium Alloy Bars" identifier="ekutility_bulkcrate_titaniumaluminiumalloy" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of titanium-aluminium alloy bars.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Titanium Alloy Bars" identifier="ekutility_bulkcrate_titaniumaluminiumalloy" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of titanium-aluminium alloy bars.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1500" soldeverywhere="false">
       <!-- 150 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titaniumaluminiumalloy" mincondition="0.1" />
@@ -545,16 +545,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Plastic" identifier="ekutility_bulkcrate_plastic" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw plastic.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Plastic" identifier="ekutility_bulkcrate_plastic" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw plastic.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="450" soldeverywhere="false">
       <!-- 45 -->
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="plastic" mincondition="0.1" />
@@ -594,16 +594,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Rubber" identifier="ekutility_bulkcrate_rubber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw rubber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Rubber" identifier="ekutility_bulkcrate_rubber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw rubber.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="200" soldeverywhere="false">
       <!-- 20 -->
-      <Price locationtype="outpost" multiplier="1.3" minavailable="1" />
-      <Price locationtype="city" multiplier="1.25" minavailable="2" />
-      <Price locationtype="research" multiplier="1" sold="false" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" minavailable="3" />
+      <Price locationtype="city" multiplier="3.75" minavailable="6" />
+      <Price locationtype="research" multiplier="3" sold="false" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="rubber" mincondition="0.1" />
@@ -643,16 +643,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of FPGA Circuits" identifier="ekutility_bulkcrate_fpgacircuit" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of FPGA circuits.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of FPGA Circuits" identifier="ekutility_bulkcrate_fpgacircuit" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of FPGA circuits.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="800">
       <!-- 80 -->
-      <Price locationtype="outpost" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="city" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="city" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="fpgacircuit" mincondition="0.1" />
@@ -692,16 +692,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Organic Fiber" identifier="ekutility_bulkcrate_organicfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of organic fiber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Organic Fiber" identifier="ekutility_bulkcrate_organicfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of organic fiber.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="300">
       <!-- 30 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="organicfiber" mincondition="0.1" />
@@ -741,16 +741,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Ballistic Fiber" identifier="ekutility_bulkcrate_ballisticfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of ballistic fiber.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Ballistic Fiber" identifier="ekutility_bulkcrate_ballisticfiber" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of ballistic fiber.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="300">
       <!-- 30 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="true" minavailable="1" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="true" minavailable="3" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ballisticfiber" mincondition="0.1" />
@@ -790,16 +790,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Uranium" identifier="ekutility_bulkcrate_uranium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw uranium.">
-    <PreferredContainer primary="storagecab,reactorcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab,wreckreactorcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Uranium" identifier="ekutility_bulkcrate_uranium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw uranium.">
+    <PreferredContainer primary="storagecab,reactorcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,wreckreactorcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="500" soldeverywhere="false">
       <!-- 50 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="5" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="15" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uranium" mincondition="0.1" />
@@ -838,16 +838,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Thorium" identifier="ekutility_bulkcrate_thorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raw thorium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Thorium" identifier="ekutility_bulkcrate_thorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raw thorium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="310" soldeverywhere="false">
       <!-- 31 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="thorium" mincondition="0.1" />
@@ -887,16 +887,16 @@
     </Holdable>
   </Item>
   <!-- Chemical Resources -->
-  <Item name="Crate of Flash Powder" identifier="ekutility_bulkcrate_flashpowder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of flash powder.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Flash Powder" identifier="ekutility_bulkcrate_flashpowder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of flash powder.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="900" soldeverywhere="false">
       <!-- 90 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="true" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="true" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="flashpowder" mincondition="0.1" />
@@ -936,17 +936,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Lithium" identifier="ekutility_bulkcrate_lithium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of lithium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Lithium" identifier="ekutility_bulkcrate_lithium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of lithium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="880" soldeverywhere="false">
       <!-- 88 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lithium" mincondition="0.1" />
@@ -986,17 +986,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sodium" identifier="ekutility_bulkcrate_sodium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of sodium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Sodium" identifier="ekutility_bulkcrate_sodium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of sodium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="330" soldeverywhere="false">
       <!-- 33 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sodium" mincondition="0.1" />
@@ -1036,17 +1036,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Magnesium" identifier="ekutility_bulkcrate_magnesium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of magnesium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Magnesium" identifier="ekutility_bulkcrate_magnesium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of magnesium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="330" soldeverywhere="false">
       <!-- 33 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="magnesium" mincondition="0.1" />
@@ -1086,17 +1086,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Potassium" identifier="ekutility_bulkcrate_potassium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of potassium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Potassium" identifier="ekutility_bulkcrate_potassium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of potassium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="100" soldeverywhere="false">
       <!-- 10 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="potassium" mincondition="0.1" />
@@ -1136,17 +1136,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Chlorine" identifier="ekutility_bulkcrate_chlorine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of chlorine.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Chlorine" identifier="ekutility_bulkcrate_chlorine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of chlorine.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="110" soldeverywhere="false">
       <!-- 11 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="2" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="6" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chlorine" mincondition="0.1" />
@@ -1186,17 +1186,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Calcium" identifier="ekutility_bulkcrate_calcium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of calcium.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Calcium" identifier="ekutility_bulkcrate_calcium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of calcium.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="310" soldeverywhere="false">
       <!-- 31 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calcium" mincondition="0.1" />
@@ -1236,17 +1236,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Phosphorus" identifier="ekutility_bulkcrate_phosphorus" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of phosphorus.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Phosphorus" identifier="ekutility_bulkcrate_phosphorus" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of phosphorus.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="150" soldeverywhere="false">
       <!-- 15 -->
-      <Price locationtype="outpost" multiplier="1.3" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.8" sold="true" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3.9" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.4" sold="true" minavailable="3" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="phosphorus" mincondition="0.1" />
@@ -1286,17 +1286,17 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Ethanol" identifier="ekutility_bulkcrate_ethanol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of ethanol.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Ethanol" identifier="ekutility_bulkcrate_ethanol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of ethanol.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="600" soldeverywhere="false">
       <!-- 60 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ethanol" mincondition="0.1" />
@@ -1336,16 +1336,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sulphuric Acid" identifier="ekutility_bulkcrate_sulphuricacid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of sulphuric acid.">
-    <PreferredContainer primary="medfabcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Sulphuric Acid" identifier="ekutility_bulkcrate_sulphuricacid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of sulphuric acid.">
+    <PreferredContainer primary="medfabcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
       <!-- 80 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sulphuricacid" mincondition="0.1" />
@@ -1386,16 +1386,16 @@
     </Holdable>
   </Item>
   <!-- Explosives -->
-  <Item name="Crate of UEX" identifier="ekutility_bulkcrate_uex" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of UEX.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of UEX" identifier="ekutility_bulkcrate_uex" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of UEX.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="750">
       <!-- 75 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uex" mincondition="0.1" />
@@ -1435,16 +1435,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of C-4" identifier="ekutility_bulkcrate_c4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of C-4.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of C-4" identifier="ekutility_bulkcrate_c4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of C-4.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="1600">
       <!-- 160 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="c4block" mincondition="0.1" />
@@ -1484,16 +1484,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Compound-N" identifier="ekutility_bulkcrate_compoundn" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of compound-N.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Compound-N" identifier="ekutility_bulkcrate_compoundn" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of compound-N.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="1500">
       <!-- 150 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="compoundn" mincondition="0.1" />
@@ -1533,16 +1533,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of IC-4" identifier="ekutility_bulkcrate_ic4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of IC-4.">
-    <PreferredContainer primary="secarmcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of IC-4" identifier="ekutility_bulkcrate_ic4block" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of IC-4.">
+    <PreferredContainer primary="secarmcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckarmcab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="4000">
       <!-- 400 -->
-      <Price locationtype="outpost" multiplier="1.5" sold="false" />
-      <Price locationtype="city" multiplier="1.25" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" sold="false" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1" sold="false" />
+      <Price locationtype="outpost" multiplier="4.5" sold="false" />
+      <Price locationtype="city" multiplier="3.75" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" sold="false" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ic4block" mincondition="0.1" />
@@ -1583,16 +1583,16 @@
     </Holdable>
   </Item>
   <!-- Alien Resources -->
-  <Item name="Crate of Physicorium" identifier="ekutility_bulkcrate_physicorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of physicorium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Physicorium" identifier="ekutility_bulkcrate_physicorium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of physicorium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="physicorium" mincondition="0.1" />
@@ -1632,16 +1632,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Fulgurium" identifier="ekutility_bulkcrate_fulgurium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of fulgurium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Fulgurium" identifier="ekutility_bulkcrate_fulgurium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of fulgurium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="fulgurium" mincondition="0.1" />
@@ -1681,16 +1681,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sulphurite" identifier="ekutility_bulkcrate_sulphuriteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of sulphurite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.03" />
+  <Item name="Crate of Sulphurite" identifier="ekutility_bulkcrate_sulphuriteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of sulphurite.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sulphuriteshard" mincondition="0.1" />
@@ -1730,16 +1730,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Oxygenite" identifier="ekutility_bulkcrate_oxygeniteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of oxygenite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Oxygenite" identifier="ekutility_bulkcrate_oxygeniteshard" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of oxygenite.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="oxygeniteshard" mincondition="0.1" />
@@ -1779,16 +1779,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Incendium" identifier="ekutility_bulkcrate_incendium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of incendium.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Incendium" identifier="ekutility_bulkcrate_incendium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of incendium.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="incendium" mincondition="0.1" />
@@ -1828,16 +1828,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Dementonite" identifier="ekutility_bulkcrate_dementonite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of dementonite.">
-    <PreferredContainer primary="storagecab" minamount="0" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.02" />
+  <Item name="Crate of Dementonite" identifier="ekutility_bulkcrate_dementonite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of dementonite.">
+    <PreferredContainer primary="storagecab" minamount="0" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.04" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.15" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.45" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="dementonite" mincondition="0.1" />
@@ -1878,16 +1878,16 @@
     </Holdable>
   </Item>
   <!-- Medical Resources -->
-  <Item name="Crate of Bandages" identifier="ekutility_bulkcrate_antibleeding1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of medical bandages.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Bandages" identifier="ekutility_bulkcrate_antibleeding1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of medical bandages.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" minavailable="1" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" minavailable="3" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding1" mincondition="0.1" />
@@ -1927,16 +1927,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Plastiseal" identifier="ekutility_bulkcrate_antibleeding2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of plastiseal.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Plastiseal" identifier="ekutility_bulkcrate_antibleeding2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of plastiseal.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1000" soldeverywhere="false">
       <!-- 100 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding2" mincondition="0.1" />
@@ -1976,16 +1976,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Antibiotic Glue" identifier="ekutility_bulkcrate_antibleeding3" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of antibiotic glue.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Antibiotic Glue" identifier="ekutility_bulkcrate_antibleeding3" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of antibiotic glue.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1400" soldeverywhere="false">
       <!-- 140 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibleeding3" mincondition="0.1" />
@@ -2025,16 +2025,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Tonic Liquid" identifier="ekutility_bulkcrate_tonicliquid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of tonic liquid.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Tonic Liquid" identifier="ekutility_bulkcrate_tonicliquid" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of tonic liquid.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="750" soldeverywhere="false">
       <!-- 75 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" minavailable="1" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" minavailable="3" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tonicliquid" mincondition="0.1" />
@@ -2074,16 +2074,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Saline" identifier="ekutility_bulkcrate_antibloodloss1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of medical saline.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Saline" identifier="ekutility_bulkcrate_antibloodloss1" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of medical saline.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="500" soldeverywhere="false">
       <!-- 50 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibloodloss1" mincondition="0.1" />
@@ -2123,16 +2123,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Blood Packs" identifier="ekutility_bulkcrate_antibloodloss2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of blood packs.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Blood Packs" identifier="ekutility_bulkcrate_antibloodloss2" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of blood packs.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2400" soldeverywhere="false">
       <!-- 240 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.75" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.25" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibloodloss2" mincondition="0.1" />
@@ -2172,16 +2172,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Adrenaline" identifier="ekutility_bulkcrate_adrenaline" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of medical adrenaline.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Adrenaline" identifier="ekutility_bulkcrate_adrenaline" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of medical adrenaline.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="600" soldeverywhere="false">
       <!-- 600 -->
-      <Price locationtype="outpost" multiplier="1.25" sold="false" />
-      <Price locationtype="city" multiplier="1.25" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3.75" sold="false" />
+      <Price locationtype="city" multiplier="3.75" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="adrenaline" mincondition="0.1" />
@@ -2221,16 +2221,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Opium" identifier="ekutility_bulkcrate_opium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of opium.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Opium" identifier="ekutility_bulkcrate_opium" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of opium.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="opium" mincondition="0.1" />
@@ -2270,16 +2270,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Elastin" identifier="ekutility_bulkcrate_elastin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of elastin.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Elastin" identifier="ekutility_bulkcrate_elastin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of elastin.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="elastin" mincondition="0.1" />
@@ -2319,16 +2319,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Alien Blood" identifier="ekutility_bulkcrate_alienblood" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of alien blood samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Alien Blood" identifier="ekutility_bulkcrate_alienblood" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of alien blood samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1200" soldeverywhere="false">
       <!-- 120 -->
-      <Price locationtype="outpost" multiplier="0.85" sold="false" />
-      <Price locationtype="city" multiplier="0.85" sold="false" />
-      <Price locationtype="research" multiplier="1.2" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.85" sold="false" />
+      <Price locationtype="outpost" multiplier="2.55" sold="false" />
+      <Price locationtype="city" multiplier="2.55" sold="false" />
+      <Price locationtype="research" multiplier="3.6" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.55" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="alienblood" mincondition="0.1" />
@@ -2368,16 +2368,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Adrenaline Glands" identifier="ekutility_bulkcrate_adrenalinegland" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of adrenaline gland samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Adrenaline Glands" identifier="ekutility_bulkcrate_adrenalinegland" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of adrenaline gland samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1.1" sold="false" />
-      <Price locationtype="research" multiplier="1.2" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" sold="false" />
-      <Price locationtype="mine" multiplier="0.85" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3.3" sold="false" />
+      <Price locationtype="research" multiplier="3.6" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" sold="false" />
+      <Price locationtype="mine" multiplier="2.55" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="adrenalinegland" mincondition="0.1" />
@@ -2417,16 +2417,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Swim Bladder" identifier="ekutility_bulkcrate_swimbladder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of swim bladder samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Swim Bladder" identifier="ekutility_bulkcrate_swimbladder" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of swim bladder samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="swimbladder" mincondition="0.1" />
@@ -2466,16 +2466,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Paralyxis" identifier="ekutility_bulkcrate_paralyxis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of paralyxis samples.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Paralyxis" identifier="ekutility_bulkcrate_paralyxis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of paralyxis samples.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="1" sold="false" />
-      <Price locationtype="research" multiplier="1.1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="0.9" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="3" sold="false" />
+      <Price locationtype="research" multiplier="3.3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="2.7" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="paralyxis" mincondition="0.1" />
@@ -2515,16 +2515,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Velonaceps Calyx" identifier="ekutility_bulkcrate_huskeggs" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A medical transport container of velonaceps calyx egg samples.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.35"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Velonaceps Calyx" identifier="ekutility_bulkcrate_huskeggs" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A medical transport container of velonaceps calyx egg samples.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.7"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="6000" soldeverywhere="false">
       <!-- 600 -->
-      <Price locationtype="outpost" multiplier="1.2" sold="false" />
-      <Price locationtype="city" multiplier="1.3" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="true" minavailable="1" />
-      <Price locationtype="military" multiplier="1.2" sold="false" />
-      <Price locationtype="mine" multiplier="1.3" sold="false" />
+      <Price locationtype="outpost" multiplier="3.6" sold="false" />
+      <Price locationtype="city" multiplier="3.9" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="true" minavailable="3" />
+      <Price locationtype="military" multiplier="3.6" sold="false" />
+      <Price locationtype="mine" multiplier="3.9" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="huskeggs" mincondition="0.1" />
@@ -2565,16 +2565,16 @@
     </Holdable>
   </Item>
   <!-- Medical Products & Toxins -->
-  <Item name="Crate of Stabilozine" identifier="ekutility_bulkcrate_stabilozine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of stabilozine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Stabilozine" identifier="ekutility_bulkcrate_stabilozine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of stabilozine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40-->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="stabilozine" mincondition="0.1" />
@@ -2614,16 +2614,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Morphine" identifier="ekutility_bulkcrate_morphine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of morphine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Morphine" identifier="ekutility_bulkcrate_morphine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of morphine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1000" soldeverywhere="false">
       <!-- 100 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="2" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="6" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antidama1" mincondition="0.1" />
@@ -2663,16 +2663,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Fentanyl" identifier="ekutility_bulkcrate_fentanyl" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of fentanyl.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Fentanyl" identifier="ekutility_bulkcrate_fentanyl" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of fentanyl.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antidama2" mincondition="0.1" />
@@ -2712,16 +2712,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Deusizine" identifier="ekutility_bulkcrate_deusizine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of deusizine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.1"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Deusizine" identifier="ekutility_bulkcrate_deusizine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of deusizine.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.2"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="5000" soldeverywhere="false">
       <!-- 500 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deusizine" mincondition="0.1" />
@@ -2761,16 +2761,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Naloxone" identifier="ekutility_bulkcrate_naloxone" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of naloxone.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Naloxone" identifier="ekutility_bulkcrate_naloxone" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of naloxone.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1600" soldeverywhere="false">
       <!-- 160 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antinarc" mincondition="0.1" />
@@ -2810,16 +2810,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Haloperidol" identifier="ekutility_bulkcrate_haloperidol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of haloperidol.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Haloperidol" identifier="ekutility_bulkcrate_haloperidol" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of haloperidol.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1300" soldeverywhere="false">
       <!-- 130 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antipsychosis" mincondition="0.1" />
@@ -2859,16 +2859,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Methamphetamine" identifier="ekutility_bulkcrate_meth" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of methamphetamine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Methamphetamine" identifier="ekutility_bulkcrate_meth" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of methamphetamine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="500" soldeverywhere="false">
       <!-- 50 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="meth" mincondition="0.1" />
@@ -2908,16 +2908,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Anabolic Steroids" identifier="ekutility_bulkcrate_steroids" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of anabolic steroids.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Anabolic Steroids" identifier="ekutility_bulkcrate_steroids" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of anabolic steroids.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="3500" soldeverywhere="false">
       <!-- 350 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="steroids" mincondition="0.1" />
@@ -2957,16 +2957,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Hyperzine" identifier="ekutility_bulkcrate_hyperzine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of hyperzine.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Hyperzine" identifier="ekutility_bulkcrate_hyperzine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of hyperzine.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="4500" soldeverywhere="false">
       <!-- 450 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="hyperzine" mincondition="0.1" />
@@ -3006,16 +3006,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Liquid Oxygenite" identifier="ekutility_bulkcrate_liquidoxygenite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of liquid oxygenite.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Liquid Oxygenite" identifier="ekutility_bulkcrate_liquidoxygenite" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of liquid oxygenite.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="800" soldeverywhere="false">
       <!-- 80 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="liquidoxygenite" mincondition="0.1" />
@@ -3055,16 +3055,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Broad-spectrum Antibiotics" identifier="ekutility_bulkcrate_antibiotics" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of liquid oxygenite.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Broad-spectrum Antibiotics" identifier="ekutility_bulkcrate_antibiotics" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of liquid oxygenite.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="400" soldeverywhere="false">
       <!-- 40 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibiotics" mincondition="0.1" />
@@ -3104,16 +3104,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Chloral Hydrate" identifier="ekutility_bulkcrate_chloralhydrate" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of chloral hydrate.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Chloral Hydrate" identifier="ekutility_bulkcrate_chloralhydrate" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of chloral hydrate.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="1000" soldeverywhere="false">
       <!-- 100 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chloralhydrate" mincondition="0.1" />
@@ -3153,16 +3153,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Calyxanide" identifier="ekutility_bulkcrate_calyxanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of chloral hydrate.">
-    <PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Calyxanide" identifier="ekutility_bulkcrate_calyxanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of chloral hydrate.">
+    <PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calyxanide" mincondition="0.1" />
@@ -3202,16 +3202,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Raptor Bane Extract" identifier="ekutility_bulkcrate_raptorbaneextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of raptor bane extract.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Raptor Bane Extract" identifier="ekutility_bulkcrate_raptorbaneextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of raptor bane extract.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="raptorbaneextract" mincondition="0.1" />
@@ -3251,16 +3251,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Pomegrenade Extract" identifier="ekutility_bulkcrate_pomegrenadeextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of pomegrenade extract.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.06" />
+  <Item name="Crate of Pomegrenade Extract" identifier="ekutility_bulkcrate_pomegrenadeextract" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of pomegrenade extract.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.12" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="pomegrenadeextract" mincondition="0.1" />
@@ -3300,16 +3300,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Cyanide" identifier="ekutility_bulkcrate_cyanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of cyanide.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Cyanide" identifier="ekutility_bulkcrate_cyanide" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of cyanide.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="cyanide" mincondition="0.1" />
@@ -3349,16 +3349,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Cyanide Antidote" identifier="ekutility_bulkcrate_cyanideantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of cyanide antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Cyanide Antidote" identifier="ekutility_bulkcrate_cyanideantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of cyanide antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1250" soldeverywhere="false">
       <!-- 125 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="cyanideantidote" mincondition="0.1" />
@@ -3398,16 +3398,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sufforin" identifier="ekutility_bulkcrate_sufforin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of sufforin.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Sufforin" identifier="ekutility_bulkcrate_sufforin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of sufforin.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sufforin" mincondition="0.1" />
@@ -3447,16 +3447,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Sufforin Antidote" identifier="ekutility_bulkcrate_sufforinantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of sufforin antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Sufforin Antidote" identifier="ekutility_bulkcrate_sufforinantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of sufforin antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1250" soldeverywhere="false">
       <!-- 125 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sufforinantidote" mincondition="0.1" />
@@ -3496,16 +3496,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Morbusine" identifier="ekutility_bulkcrate_morbusine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of morbusine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Morbusine" identifier="ekutility_bulkcrate_morbusine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of morbusine.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="6500" soldeverywhere="false">
       <!-- 650 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="morbusine" mincondition="0.1" />
@@ -3545,16 +3545,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Morbusine Antidote" identifier="ekutility_bulkcrate_morbusineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of morbusine antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Morbusine Antidote" identifier="ekutility_bulkcrate_morbusineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of morbusine antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="3500" soldeverywhere="false">
       <!-- 350 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="morbusineantidote" mincondition="0.1" />
@@ -3594,16 +3594,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Radiotoxin" identifier="ekutility_bulkcrate_radiotoxin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of radiotoxin.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Radiotoxin" identifier="ekutility_bulkcrate_radiotoxin" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of radiotoxin.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="radiotoxin" mincondition="0.1" />
@@ -3643,16 +3643,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Antirad" identifier="ekutility_bulkcrate_antirad" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of antirad.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Antirad" identifier="ekutility_bulkcrate_antirad" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of antirad.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1260" soldeverywhere="false">
       <!-- 126 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" minavailable="1" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" minavailable="3" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antirad" mincondition="0.1" />
@@ -3692,16 +3692,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Deliriumine" identifier="ekutility_bulkcrate_deliriumine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of deliriumine.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Deliriumine" identifier="ekutility_bulkcrate_deliriumine" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of deliriumine.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2500" soldeverywhere="false">
       <!-- 250 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deliriumine" mincondition="0.1" />
@@ -3741,16 +3741,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Deliriumine Antidote" identifier="ekutility_bulkcrate_deliriumineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of deliriumine antidote.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Deliriumine Antidote" identifier="ekutility_bulkcrate_deliriumineantidote" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of deliriumine antidote.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="1250" soldeverywhere="false">
       <!-- 125 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="deliriumineantidote" mincondition="0.1" />
@@ -3790,16 +3790,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Paralyzant" identifier="ekutility_bulkcrate_paralyzant" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of paralyzant.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Paralyzant" identifier="ekutility_bulkcrate_paralyzant" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of paralyzant.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="3500" soldeverywhere="false">
       <!-- 350 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="paralyzant" mincondition="0.1" />
@@ -3839,16 +3839,16 @@
       </CustomInterface>
     </Holdable>
   </Item>
-  <Item name="Crate of Anaparalyzant" identifier="ekutility_bulkcrate_antiparalysis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="2" description="A bulk storage/transportation container of anaparalyzant.">
-    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="1" spawnprobability="0.15"/>-->
-    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="1" spawnprobability="0.04" />
+  <Item name="Crate of Anaparalyzant" identifier="ekutility_bulkcrate_antiparalysis" category="Material" tags="smallitem,mediumitem,toolbox,mobilecontainer" scale="0.5" pickdistance="150" impactsoundtag="impact_metal_light" maxstacksize="4" description="A bulk storage/transportation container of anaparalyzant.">
+    <!--<PreferredContainer primary="medcab" minamount="0" maxamount="2" spawnprobability="0.3"/>-->
+    <PreferredContainer primary="wreckmedcab" minamount="0" maxamount="2" spawnprobability="0.08" />
     <Price baseprice="2000" soldeverywhere="false">
       <!-- 200 -->
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="0.9" sold="false" />
-      <Price locationtype="research" multiplier="0.9" sold="false" />
-      <Price locationtype="military" multiplier="1.1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="2.7" sold="false" />
+      <Price locationtype="research" multiplier="2.7" sold="false" />
+      <Price locationtype="military" multiplier="3.3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antiparalysis" mincondition="0.1" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Tools/ekutility_placeablemachines.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Tools/ekutility_placeablemachines.xml
index cf25a19b..612711b2 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Tools/ekutility_placeablemachines.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Tools/ekutility_placeablemachines.xml	
@@ -6,11 +6,11 @@
     <Price storeidentifier="merchantMilitary" buyprice="50" />
     <Price storeidentifier="merchantResearch" buyprice="50" />-->
     <Price baseprice="110" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!--
 	20
@@ -57,7 +57,7 @@
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="6,-10" iteminterval="0,0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <!-- Thanks to lazy tagging consistency this has to be hardcoded for every future diving suit -->
-      <Containable items="divingsuit,abyssdivingsuit,combatdivingsuit,pucs,slipsuit" />
+      <Containable items="divingsuit,abyssdivingsuit,combatdivingsuit,pucs,slipsuit,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
       <StatusEffect type="OnNotContained" target="This" setvalue="true" drawinventory="true" />
     </ItemContainer>
@@ -68,11 +68,11 @@
     <Price storeidentifier="merchantMilitary" buyprice="50" />
     <Price storeidentifier="merchantResearch" buyprice="50" />-->
     <Price baseprice="125" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!--
 	20
@@ -115,9 +115,9 @@
       <ParticleEmitter particle="fleshsmoke" particlespersecond="2" scalemin="1" scalemax="2" mincondition="0.0" maxcondition="50.0" />
       <input name="power_in" displayname="connection.powerin" />
     </ConnectionPanel>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="3" maxstacksize="1" slotsperrow="3" itempos="33,-50" iteminterval="22.5,0" itemrotation="0" canbeselected="true" containedspritedepth="0.69" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="7" maxstacksize="2" slotsperrow="3" itempos="33,-50" iteminterval="22.5,0" itemrotation="0" canbeselected="true" containedspritedepth="0.69" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.16,0.18" anchor="Center" style="ItemUI" />
-      <Containable items="oxygensource,weldingfuel" excludeditems="oxygeniteshard" excludebroken="false">
+      <Containable items="oxygensource,weldingfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" excludebroken="false">
         <StatusEffect type="OnContaining" targettype="Contained" Condition="1.0" Comparison="And">
           <Conditional Voltage="gt 0.1" targetcontainer="true" targetitemcomponent="Powered" />
           <Conditional HasTag="refillableoxygensource" />
@@ -129,11 +129,11 @@
   </Item>
   <Item name="" identifier="ekutility_placeabletextdisplay" scale="0.5">
     <Price baseprice="125" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <!--
 	45
@@ -153,7 +153,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
     </Holdable>
     <ItemLabel scrollable="true" padding="14,5,14,12" textcolor="1,1,1,1">
-      <LightComponent range="10.0" lightcolor="1.0,1.0,1.0,0.1" IsOn="true" castshadows="false">
+      <LightComponent range="40" lightcolor="1.0,1.0,1.0,0.1" IsOn="true" castshadows="false">
         <sprite texture="Content/Items/Labels/labels.png" sourcerect="0,48,126,48" depth="0.025" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
     </ItemLabel>
@@ -167,11 +167,11 @@
   </Item>
   <Item name="" identifier="ekutility_placeabletextdisplaylong" scale="0.5">
     <Price baseprice="125" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <!--
 	45
@@ -191,7 +191,7 @@
       <RequiredItem identifier="wrench" type="Equipped" />
     </Holdable>
     <ItemLabel scrollable="true" padding="14,5,14,12" textcolor="1,1,1,1">
-      <LightComponent range="10.0" lightcolor="1.0,1.0,1.0,0.1" IsOn="true" castshadows="false">
+      <LightComponent range="40" lightcolor="1.0,1.0,1.0,0.1" IsOn="true" castshadows="false">
         <sprite texture="%ModDir%/Items/Tools/ekutility_placeablemachines.png" sourcerect="432,288,272,48" depth="0.025" origin="0.497,0.56" alpha="1.0" />
       </LightComponent>
     </ItemLabel>
@@ -203,14 +203,14 @@
       <input name="set_text_color" displayname="connection.settextcolor" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekutility_portablesprinkler" aliases="ekutility_portablespinkler" category="Equipment" Tags="smallitem,tool,signal" cargocontaineridentifier="metalcrate" requireaimtouse="true" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="2">
+  <Item name="" identifier="ekutility_portablesprinkler" aliases="ekutility_portablespinkler" category="Equipment" Tags="smallitem,tool,signal" cargocontaineridentifier="metalcrate" requireaimtouse="true" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="4">
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="704,496,104,128" depth="0.55" canflipx="false" origin="0.38,0.5" />
     <Price baseprice="85">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Body width="121" height="96" density="40" />
     <!--
@@ -233,7 +233,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand+LeftHand" msg="ItemMsgDetachWrench" PickingTime="10.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="false">
       <RequiredItem identifier="wrench" type="Equipped" />
     </Holdable>
-    <RepairTool wateramount="10.0" extinguishamount="30.0" range="350" powerconsumption="25" barrelpos="0,-10" barrelrotation="270" spread="40" unskilledspread="40" targetstructures="false" hititems="false" characterusable="false" requireaimtouse="false" usablein="air">
+    <RepairTool wateramount="10.0" extinguishamount="30.0" range="1400" powerconsumption="25" barrelpos="0,-10" barrelrotation="270" spread="40" unskilledspread="40" targetstructures="false" hititems="false" characterusable="false" requireaimtouse="false" usablein="air">
       <!--
 	  <ParticleEmitter particle="waterdrop" velocitymin="0.0" velocitymax="700.0" particlespersecond="50" anglemin="-45" anglemax="45" />
 	  -->
@@ -242,7 +242,7 @@
       <StatusEffect type="OnNotContained" target="This" setvalue="true" requireaimtouse="false" />
       <StatusEffect type="OnContained" target="This" setvalue="true" requireaimtouse="true" />
     </RepairTool>
-    <LightComponent lightcolor="255,255,255,0" range="10.0" powerconsumption="25" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent lightcolor="255,255,255,0" range="40" powerconsumption="25" IsOn="true" castshadows="false" allowingameediting="false">
       <StatusEffect type="OnActive" target="This">
         <UseItem />
       </StatusEffect>
@@ -260,11 +260,11 @@
   description="A small electro-mechanical switch which can be used to turn sprinklers on and off on timed intervals. ( Place by pressing aim + use )" Scale="0.5" impactsoundtag="impact_metal_light">
     <Sprite texture="Content/Items/Electricity/signalcomp.png" depth="0.8" sourcerect="122,68,36,36" origin="0.5,0.5" />
     <Price baseprice="120" >
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <Body width="121" height="96" density="40" />
     <Fabricate suitablefabricators="fabricator" requiredtime="30" >
@@ -282,7 +282,7 @@
 	  <StatusEffect type="Always" target="This" condition="50"/>
 	  <StatusEffect type="OnBroken" target="This" condition="100" disabledeltatime="true" stackable="false"/>
 	</Holdable>
-    <LightComponent lightcolor="255,255,255,0" range="10.0" powerconsumption="15" IsOn="false" castshadows="false" allowingameediting="false" >
+    <LightComponent lightcolor="255,255,255,0" range="40" powerconsumption="15" IsOn="false" castshadows="false" allowingameediting="false" >
       <StatusEffect type="OnActive" target="This" condition="-60"/>
     </LightComponent>
     <SignalCheckComponent output="1" falseoutput="1" canbeselected="false" >
@@ -302,14 +302,14 @@
     </ConnectionPanel>
   </Item>
 -->
-  <Item name="" identifier="ekutility_securebuttoncaptain" category="Electrical" tags="smallitem,button" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="8">
+  <Item name="" identifier="ekutility_securebuttoncaptain" category="Electrical" tags="smallitem,button" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="16">
     <Price baseprice="125" soldeverywhere="false">
       <!-- What kind of literal psychopath made the default button price 150? -->
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <!--
 	80
@@ -339,13 +339,13 @@
       <requireditem identifier="crowbar" type="Equipped" />
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_securebuttonsecurityofficer" category="Electrical" tags="smallitem,button" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="8">
+  <Item name="" identifier="ekutility_securebuttonsecurityofficer" category="Electrical" tags="smallitem,button" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="16">
     <Price baseprice="125" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Sprite texture="%ModDir%/Items/Containers/ekutility_containers2.png" sourcerect="768,440,40,56" depth="0.8" canflipx="false" origin="0.5,0.5" />
     <Deconstruct time="10">
@@ -371,13 +371,13 @@
       <requireditem identifier="crowbar" type="Equipped" />
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_securebuttonmedicaldoctor" category="Electrical" tags="smallitem,button" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="8">
+  <Item name="" identifier="ekutility_securebuttonmedicaldoctor" category="Electrical" tags="smallitem,button" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="16">
     <Price baseprice="125" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Sprite texture="%ModDir%/Items/Containers/ekutility_containers2.png" sourcerect="768,496,40,56" depth="0.8" canflipx="false" origin="0.5,0.5" />
     <Deconstruct time="10">
@@ -403,13 +403,13 @@
       <requireditem identifier="crowbar" type="Equipped" />
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_securebuttonmechanic" category="Electrical" tags="smallitem,button" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="8">
+  <Item name="" identifier="ekutility_securebuttonmechanic" category="Electrical" tags="smallitem,button" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="16">
     <Price baseprice="125" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Sprite texture="%ModDir%/Items/Containers/ekutility_containers2.png" sourcerect="768,552,40,56" depth="0.8" canflipx="false" origin="0.5,0.5" />
     <Deconstruct time="10">
@@ -435,13 +435,13 @@
       <requireditem identifier="crowbar" type="Equipped" />
     </Holdable>
   </Item>
-  <Item name="" identifier="ekutility_securebuttonengineer" category="Electrical" tags="smallitem,button" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="8">
+  <Item name="" identifier="ekutility_securebuttonengineer" category="Electrical" tags="smallitem,button" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="16">
     <Price baseprice="125" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Sprite texture="%ModDir%/Items/Containers/ekutility_containers2.png" sourcerect="768,608,40,56" depth="0.8" canflipx="false" origin="0.5,0.5" />
     <Deconstruct time="10">
@@ -469,11 +469,11 @@
   </Item>
   <Item name="" identifier="ekutility_placeablejunction" tags="junctionbox" category="Electrical" aliases="auxiliary power bus" scale="0.25" linkable="false" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Price baseprice="175" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <!--
 	20
@@ -519,11 +519,11 @@
         <Conditional currPowerConsumption="lt -10" />
       </StatusEffect>
     </PowerTransfer>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.4" Flickerspeed="0.3">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.4" Flickerspeed="0.3">
       <sprite texture="%ModDir%/Items/Tools/ekutility_placeablemachines.png" sourcerect="512,136,64,64" depth="0.1" origin="1.45,1.3" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq False" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,225,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="3">
+    <LightComponent range="40" lightcolor="255,255,225,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="3">
       <sprite texture="%ModDir%/Items/Tools/ekutility_placeablemachines.png" sourcerect="576,136,64,64" depth="0.1" origin="1.05,1.3" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq True" />
     </LightComponent>
@@ -554,13 +554,13 @@
       <ParticleEmitter particle="fleshsmoke" particlespersecond="2" scalemin="1" scalemax="2" mincondition="0.0" maxcondition="50.0" />
     </Repairable>
   </Item>
-  <Item name="" identifier="ekutility_heavypowerswitch" category="Electrical" Tags="smallitem,signal,logic" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.25" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekutility_heavypowerswitch" category="Electrical" Tags="smallitem,signal,logic" maxstacksize="4" cargocontaineridentifier="metalcrate" scale="0.25" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="165" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <!--
 	20
@@ -589,7 +589,7 @@
     <RelayComponent maxpower="5000" ison="True" canbeselected="true" vulnerabletoemp="false" canbeoverloaded="false">
       <GuiFrame relativesize="0.2,0.14" minsize="450,160" anchor="Center" style="ItemUI" />
     </RelayComponent>
-    <LightComponent range="10.0" lightcolor="150,125,100,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.3" Flickerspeed="0.2">
+    <LightComponent range="40" lightcolor="150,125,100,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.3" Flickerspeed="0.2">
       <sprite texture="%ModDir%/Items/Tools/ekutility_placeablemachines.png" sourcerect="96,136,40,24" depth="0.1" origin="0.5,1.9" alpha="1.0" />
       <IsActive targetitemcomponent="RelayComponent" ison="eq True" />
     </LightComponent>
@@ -605,11 +605,11 @@
   </Item>
   <Item name="" identifier="ekutility_placeablebattery" tags="battery,batterycellrecharger" category="Electrical" scale="0.5" linkable="false" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Price baseprice="650" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <!--
 	165
@@ -646,7 +646,7 @@
         <Conditional attached="false" />
       </StatusEffect>
     </Holdable>
-    <PowerContainer capacity="2000.0" maxrechargespeed="1500.0" maxoutput="1500.0" canbeselected="true" indicatorposition="36,27" indicatorsize="48,13" ishorizontal="true" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="4400" maxrechargespeed="1500.0" maxoutput="1500.0" canbeselected="true" indicatorposition="36,27" indicatorsize="48,13" ishorizontal="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" />
       <!--minsize="350,250" maxsize="420,300"-->
       <StatusEffect type="InWater" target="This" condition="-0.25">
@@ -656,7 +656,7 @@
         <Conditional ChargePercentage="gt 0.01" targetcontainer="true" targetitemcomponent="PowerContainer" />
       </StatusEffect>
     </PowerContainer>
-    <LightComponent range="10.0" lightcolor="175,175,175,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.3" Flickerspeed="0.2">
+    <LightComponent range="40" lightcolor="175,175,175,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.3" Flickerspeed="0.2">
       <sprite texture="%ModDir%/Items/Tools/ekutility_placeablemachines.png" sourcerect="96,160,48,16" depth="0.1" origin="0.5,3.2" alpha="1.0" />
       <IsActive targetitemcomponent="PowerContainer" ChargePercentage="gt 0.01" />
     </LightComponent>
@@ -678,9 +678,9 @@
       <output name="charge_rate" displayname="connection.batteryrechargespeedout" />
       <output name="condition_out" displayname="connection.conditionout" />
     </ConnectionPanel>
-    <ItemContainer capacity="2" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
+    <ItemContainer capacity="4" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
-      <Containable items="loadable" />
+      <Containable items="loadable,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.06" mindeteriorationdelay="360" maxdeteriorationdelay="720" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="15" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.16" minsize="400,180" maxsize="480,216" anchor="Center" relativeoffset="0.0,0.27" style="ItemUI" />
@@ -701,11 +701,11 @@
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" sourcerect="896,384,128,128" depth="0.75" premultiplyalpha="false" origin="0.5,0.5" />
     <Body width="95" height="106" density="40" />
     <Price baseprice="120" >
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <PreferredContainer primary="storagecab" />
     <PreferredContainer primary="wreckstoragecab" />
@@ -725,9 +725,9 @@
       <Item identifier="plastic" copycondition="true" mincondition="0.1" />
     </Deconstruct>
     <ItemContainer capacity="1" hideitems="true" drawinventory="false" uilabel="" allowuioverlap="true" allowdraganddrop="false" showcontainedstateindicator="false">
-      <Containable items="seed" />
+      <Containable items="seed,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" minvoltage="0.5" powerconsumption="250" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" minvoltage="0.5" powerconsumption="250" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.025" sourcerect="896,512,128,128" origin="0.5,0.5" alpha="1.0" />
 	  <StatusEffect type="OnActive" target="This" targetitemcomponent="Planter" setvalue="true" fertilizer="100" />
 	  <StatusEffect type="OnActive" target="Contained" targetitemcomponent="Growable" setvalue="true" condition="100" Hardiness="0.1" maxhealth="9000" />
@@ -753,11 +753,11 @@
   <Item name="" identifier="ekutility_placeableterminal" category="Electrical" Tags="smallitem,logic,terminal" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Sprite texture="%ModDir%/Items/Tools/ekutility_placeablemachines.png" sourcerect="0,352,120,128" depth="0.78" canflipx="false" origin="0.5,0.5" />
     <Price baseprice="165" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" sold="false" />
     </Price>
     <!--
 	42
@@ -794,11 +794,11 @@
   </Item>
   <Item name="" identifier="ekutility_placeablesmallpump" tags="pump" linkable="false" category="Machine" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2" hideinmenus="false">
     <Price baseprice="250" soldeverywhere="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!--
 	150
@@ -869,11 +869,11 @@
   </Item>
   <Item name="" identifier="ekutility_placeablefabricator" tags="fabricator,donttakeitems" category="Machine" linkable="true" allowedlinks="deconstructor,locker,medcabinet,toxcontainer" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Price baseprice="400" soldeverywhere="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!--
 	25
@@ -922,7 +922,7 @@
         <Conditional attached="false" />
       </StatusEffect>
     </Holdable>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
       <sprite texture="%ModDir%/Items/Tools/ekutility_placeablefabricator.png" depth="0.025" sourcerect="264,200,208,80" origin="0.5,0.92" alpha="1.0" />
     </LightComponent>
     <Fabricator canbeselected="true" powerconsumption="350.0" msg="ItemMsgInteractSelect" fabricationspeed="0.6">
@@ -959,7 +959,7 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="" allowuioverlap="true">
+    <ItemContainer capacity="11" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="" allowuioverlap="true">
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
       <StatusEffect type="OnNotContained" target="This" setvalue="true" drawinventory="true" />
     </ItemContainer>
@@ -970,11 +970,11 @@
   </Item>
   <Item name="" identifier="ekutility_placeablefabricator_adaptive" tags="fabricator,donttakeitems" category="Machine" linkable="true" allowedlinks="deconstructor,locker,medcabinet,toxcontainer" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Price baseprice="850" soldeverywhere="false" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" sold="false" />
     </Price>
     <!--
 	400
@@ -1028,7 +1028,7 @@
         <Conditional attached="false" />
       </StatusEffect>
     </Holdable>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
       <sprite texture="%ModDir%/Items/Tools/ekutility_placeablefabricator_adaptive.png" depth="0.025" sourcerect="264,200,240,160" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Fabricator canbeselected="true" powerconsumption="750.0" msg="ItemMsgInteractSelect" fabricationspeed="0.8" skillrequirementmultiplier="0.6">
@@ -1065,7 +1065,7 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="" allowuioverlap="true">
+    <ItemContainer capacity="11" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="" allowuioverlap="true">
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
       <StatusEffect type="OnNotContained" target="This" setvalue="true" drawinventory="true" />
     </ItemContainer>
@@ -1077,11 +1077,11 @@
   <Item name="" identifier="ekutility_placeablemedicalfabricator" tags="medicalfabricator,donttakeitems" category="Machine" linkable="true" allowedlinks="deconstructor,locker,medcabinet,toxcontainer" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Price baseprice="550" soldeverywhere="false" minleveldifficulty="15">
       <!--530-->
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <!--
 	150
@@ -1131,7 +1131,7 @@
       </StatusEffect>
     </Holdable>
     <!--
-	<LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5"  IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
+	<LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5"  IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
       <sprite texture="Mods/EK Utilities/Items/Tools/ekutility_placeablefabricator.png" depth="0.025" sourcerect="264,200,208,80" origin="0.5,0.92" alpha="1.0" />
     </LightComponent>
 	-->
@@ -1169,7 +1169,7 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="" allowuioverlap="true">
+    <ItemContainer capacity="11" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="" allowuioverlap="true">
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
       <StatusEffect type="OnNotContained" target="This" setvalue="true" drawinventory="true" />
     </ItemContainer>
@@ -1180,11 +1180,11 @@
   </Item>
   <Item name="" identifier="ekutility_placeabledeconstructor" tags="deconstructor,donttakeitems" category="Machine" linkable="true" allowedlinks="deconstructor,locker,medcabinet,toxcontainer" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Price baseprice="350" soldeverywhere="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!--
 	25
@@ -1267,22 +1267,22 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer capacity="3" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true">
+    <ItemContainer capacity="7" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true">
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
       <StatusEffect type="OnNotContained" target="This" setvalue="true" drawinventory="true" />
     </ItemContainer>
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="5" uilabel="" allowuioverlap="true">
+    <ItemContainer capacity="11" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="4" uilabel="" allowuioverlap="true">
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
       <StatusEffect type="OnNotContained" target="This" setvalue="true" drawinventory="true" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekutility_placeablesonarmonitor" tags="command,sonarmonitor" category="Machine" linkable="true" allowedlinks="statusmonitor" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Price baseprice="340" soldeverywhere="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!--
 	20
@@ -1319,7 +1319,7 @@
         <Conditional attached="false" />
       </StatusEffect>
     </Holdable>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
       <sprite texture="%ModDir%/Items/Tools/ekutility_placeableconsoles.png" depth="0.025" sourcerect="16,240,160,160" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <aitarget sightrange="200" soundrange="10000" staticsight="true" fadeouttime="5" />
@@ -1383,11 +1383,11 @@
   </Item>
   <Item name="" identifier="ekutility_placeablestatusmonitor" tags="command,statusmonitor" category="Machine" linkable="true" allowedlinks="navterminal" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Price baseprice="390" soldeverywhere="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!--
 	150
@@ -1424,7 +1424,7 @@
         <Conditional attached="false" />
       </StatusEffect>
     </Holdable>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
       <sprite texture="%ModDir%/Items/Tools/ekutility_placeableconsoles.png" depth="0.025" sourcerect="592,208,160,160" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <MiniMap requirewaterdetectors="False" requireoxygendetectors="False" showhullintegrity="True" MinVoltage="0.5" PowerConsumption="100" canbeselected="true" msg="ItemMsgInteractSelect" allowuioverlap="true">
@@ -1465,11 +1465,11 @@
   </Item>
   <Item name="" identifier="ekutility_chargingdock1" tags="chargingdock,batterycellrecharger" category="Electrical" scale="0.5">
     <Price baseprice="175" soldeverywhere="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
     <!--
 	45
@@ -1515,9 +1515,9 @@
       <ParticleEmitter particle="fleshsmoke" particlespersecond="2" scalemin="1" scalemax="2" mincondition="0.0" maxcondition="50.0" />
       <input name="power_in" displayname="connection.powerin" />
     </ConnectionPanel>
-    <ItemContainer capacity="4" maxstacksize="1" canbeselected="true" hideitems="false" itempos="38.5,5" iteminterval="22,0" itemrotation="-90" uilabel="ChargingDock" containedspritedepth="0.81">
+    <ItemContainer capacity="9" maxstacksize="2" canbeselected="true" hideitems="false" itempos="38.5,5" iteminterval="22,0" itemrotation="-90" uilabel="ChargingDock" containedspritedepth="0.81">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="loadable" />
+      <Containable items="loadable,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Tools/ekutility_tools.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Tools/ekutility_tools.xml
index 24501500..194e89c0 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Tools/ekutility_tools.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/Tools/ekutility_tools.xml	
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="ekutility_reinforcedtank_weldingfuel" aliases="ekutility_heavytank_weldingfuel,heavy fuel tank,heavy welding fuel tank" category="Equipment,Fuel" Tags="smallitem,weldingfuel,weldingtoolfuel,weldingfueltank" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" maxstacksize="8">
-    <PreferredContainer primary="weldingtool,flamer" spawnprobability="0.5" />
-    <PreferredContainer primary="engcab" minamount="0" maxamount="4" spawnprobability="1" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="0" maxamount="3" spawnprobability="0.15" />
-    <!--<Price storeidentifier="merchantCity" buyprice="135" minavailable="6" />
-    <Price storeidentifier="merchantResearch" buyprice="150" minavailable="2" />
-    <Price storeidentifier="merchantMilitary" buyprice="160" minavailable="3" />
-    <Price storeidentifier="merchantOutpost" buyprice="150" minavailable="4" />
-    <Price storeidentifier="merchantMine" buyprice="160" minavailable="4" />-->
+  <Item name="" identifier="ekutility_reinforcedtank_weldingfuel" aliases="ekutility_heavytank_weldingfuel,heavy fuel tank,heavy welding fuel tank" category="Equipment,Fuel" Tags="smallitem,weldingfuel,weldingtoolfuel,weldingfueltank" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" maxstacksize="16">
+    <PreferredContainer primary="weldingtool,flamer" spawnprobability="1" />
+    <PreferredContainer primary="engcab" minamount="0" maxamount="8" spawnprobability="1" />
+    <PreferredContainer secondary="wreckstoragecab" minamount="0" maxamount="6" spawnprobability="0.3" />
+    <!--<Price storeidentifier="merchantCity" buyprice="135" minavailable="18" />
+    <Price storeidentifier="merchantResearch" buyprice="150" minavailable="6" />
+    <Price storeidentifier="merchantMilitary" buyprice="160" minavailable="9" />
+    <Price storeidentifier="merchantOutpost" buyprice="150" minavailable="12" />
+    <Price storeidentifier="merchantMine" buyprice="160" minavailable="12" />-->
     <!-- 
 	base price 120
 	
@@ -17,11 +17,11 @@
 	ethanol 60
 	-->
     <Price baseprice="160" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="7" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="21" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="45" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="titaniumaluminiumalloy" outcondition="0.5" />
@@ -46,13 +46,13 @@
       <QualityStat stattype="Condition" value="0.15" />
     </Quality>
   </Item>
-  <Item name="" identifier="ekutility_heavytank_incendium" aliases="heavy incendium tank,heavy incendium fuel tank" category="Equipment,Fuel" Tags="smallitem,weldingfuel,weldingtoolfuel,incendiumfueltank" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ekutility_heavytank_incendium" aliases="heavy incendium tank,heavy incendium fuel tank" category="Equipment,Fuel" Tags="smallitem,weldingfuel,weldingtoolfuel,incendiumfueltank" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" maxstacksize="16">
     <Price baseprice="325" soldeverywhere="false" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" sold="false" />
     </Price>
     <!-- 
 	base price 250
@@ -86,16 +86,16 @@
     <Price storeidentifier="merchantOutpost" buyprice="90" />
     <Price storeidentifier="merchantMine" buyprice="80" />
 	-->
-    <PreferredContainer primary="divingcab" minamount="1" maxamount="2" spawnprobability="1" />
-    <PreferredContainer primary="engcab" minamount="1" maxamount="2" spawnprobability="1" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.125" />
-    <PreferredContainer primary="outpostcrewcabinet" minamount="0" maxamount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="divingcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer primary="engcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="4" spawnprobability="0.25" />
+    <PreferredContainer primary="outpostcrewcabinet" minamount="0" maxamount="2" spawnprobability="0.2" />
     <Price baseprice="90">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="30" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -112,7 +112,7 @@
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="48,128,272,128" depth="0.55" origin="0.5,0.5" />
     <Body width="228" height="96" density="30" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" holdpos="65,-5" aimpos="50,0" handle1="-98,-24" handle2="8,-16" holdangle="-40" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="10.0" structurefixamount="-0.1" range="25" barrelpos="48,10" combatpriority="23" RepairMultiple="true" RepairThroughHoles="false" levelwallfixamount="-5.0">
+    <RepairTool firedamage="10.0" structurefixamount="-0.1" range="100" barrelpos="48,10" combatpriority="23" RepairMultiple="true" RepairThroughHoles="false" levelwallfixamount="-5.0">
       <RequiredItems identifier="batterycell,fulguriumbatterycell" type="Contained" msg="ItemMsgBatteryCellRequired" />
       <StatusEffect type="OnUse" target="Contained" targetidentifiers="batterycell" Condition="-1.5" />
       <StatusEffect type="OnUse" target="Contained" targetidentifiers="fulguriumbatterycell" Condition="-0.75" />
@@ -139,7 +139,7 @@
       <sound file="%ModDir%/Items/Tools/drill_loop.ogg" type="OnUse" range="500.0" loop="true" />
       <Fixable identifier="structure" />
     </RepairTool>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="batterycell,fulguriumbatterycell" />
     </ItemContainer>
@@ -149,15 +149,15 @@
     </Quality>
   </Item>
   <!-- Unfortunately repair bonuses cannot be linked to conditionals.
-  <Item name="Torque Wrench" identifier="ekutility_poweredwrench" category="Equipment" maxstacksize="1" Tags="smallitem,tool,wrench" cargocontaineridentifier="metalcrate" 
+  <Item name="Torque Wrench" identifier="ekutility_poweredwrench" category="Equipment" maxstacksize="2" Tags="smallitem,tool,wrench" cargocontaineridentifier="metalcrate" 
   description="Battery-powered wrench with articulating head. Allows for rapid mechanical repairs." Scale="0.32" impactsoundtag="impact_metal_light" addedrepairspeedmultiplier="1.5" hideconditionbar="true" hideconditionintooltip="true" >
 
     <Price baseprice="175" minleveldifficulty="20" >
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
 	-->
   <!--
@@ -190,7 +190,7 @@
       <StatusEffect type="OnSuccess" target="Contained" targetidentifiers="batterycell" Condition="-20" />
       <StatusEffect type="OnSuccess" target="Contained" targetidentifiers="fulguriumbatterycell" Condition="-10" />
     </Holdable>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="batterycell,fulguriumbatterycell" >
 		<StatusEffect type="OnContaining" target="This" setvalue="true" Condition="100" />
@@ -200,15 +200,15 @@
   </Item>
   -->
   <!--
-  <Item name="Soldering Omnitool" identifier="ekutility_poweredscrewdriver" category="Equipment" maxstacksize="1" Tags="smallitem,tool,screwdriver" cargocontaineridentifier="metalcrate" 
+  <Item name="Soldering Omnitool" identifier="ekutility_poweredscrewdriver" category="Equipment" maxstacksize="2" Tags="smallitem,tool,screwdriver" cargocontaineridentifier="metalcrate" 
   description="Multipurpose electrical soldering gun. Allows for rapid electrical repairs." Scale="0.32" impactsoundtag="impact_metal_light" addedrepairspeedmultiplier="1.5" hideconditionbar="true" hideconditionintooltip="true" >
 
     <Price baseprice="225" minleveldifficulty="20" >
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
 	-->
   <!--
@@ -244,7 +244,7 @@
       <StatusEffect type="OnSuccess" target="Contained" targetidentifiers="batterycell" Condition="-20" />
       <StatusEffect type="OnSuccess" target="Contained" targetidentifiers="fulguriumbatterycell" Condition="-10" />
     </Holdable>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="batterycell,fulguriumbatterycell" >
 		<StatusEffect type="OnContaining" target="This" setvalue="true" Condition="100" />
@@ -253,16 +253,16 @@
     </ItemContainer>
   </Item>
   -->
-  <Item name="" identifier="ekutility_metalfoam_tank" aliases="metal foam canister, metal foam tank, metallic foam tank" category="Equipment,Fuel" Tags="smallitem,weldingfuel,ekutility_metalfoamfuel_tag,tool" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" maxstacksize="2">
+  <Item name="" identifier="ekutility_metalfoam_tank" aliases="metal foam canister, metal foam tank, metallic foam tank" category="Equipment,Fuel" Tags="smallitem,weldingfuel,ekutility_metalfoamfuel_tag,tool" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" maxstacksize="4">
     <!--<Price storeidentifier="merchantResearch" buyprice="175" />-->
     <PreferredContainer primary="ekutility_metalfoam_gun" spawnprobability="1" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab" minamount="0" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="175" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="5" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="15" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="titaniumaluminiumalloy" />
@@ -299,7 +299,7 @@
     <Throwable slots="Any,RightHand,LeftHand" holdpos="30,-15" handle1="0,5" throwforce="2.0" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnSecondaryUse" target="This" IsOn="True" delay="3.0" disabledeltatime="true" checkconditionalalways="true" />
     </Throwable>
-    <LightComponent LightColor="0.0,0.0,0.0,0.0" range="1" IsOn="false" castshadows="false">
+    <LightComponent LightColor="0.0,0.0,0.0,0.0" range="4" IsOn="false" castshadows="false">
       <StatusEffect type="OnActive" targettype="This" Condition="-6">
         <sound file="Content/Items/Tools/Extinguisher.ogg" range="1000" />
         <ParticleEmitter particle="ekmetalfoamspray" anglemax="360" velocitymin="2000" velocitymax="3000" particlespersecond="40" scalemultiplier="1.50,1.50" />
@@ -321,14 +321,14 @@
   </Item>
   <Item name="" identifier="ekutility_metalfoam_gun" category="Equipment" Tags="smallitem,weldingequipment,tools" preferredcontainers="suppliescabinet,locker" cargocontaineridentifier="metalcrate" Scale="0.32" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantResearch" buyprice="280" />-->
-    <PreferredContainer primary="engcab" minamount="0" maxamount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" minamount="0" maxamount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.2" />
     <Price baseprice="280" soldeverywhere="false" minleveldifficulty="20">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="titaniumaluminiumalloy" />
@@ -347,7 +347,7 @@
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="0,448,272,160" depth="0.55" origin="0.5,0.27" />
     <Body width="256" height="92" density="40" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="50,0" handle1="-16,-64" handle2="8,-48" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="30.0" structurefixamount="9" extinguishamount="60.0" range="250" barrelpos="45,1" repairmultiple="true" repairthroughwalls="false" combatpriority="30" spread="35" unskilledspread="35">
+    <RepairTool firedamage="30.0" structurefixamount="9" extinguishamount="60.0" range="1000" barrelpos="45,1" repairmultiple="true" repairthroughwalls="true" combatpriority="30" spread="35" unskilledspread="35">
       <RequiredItems items="ekutility_metalfoamfuel_tag" type="Contained" msg="ItemMsgWeldingFuelRequired" />
       <StatusEffect type="OnUse" targettype="Contained" targets="ekutility_metalfoam_tank" Condition="-1.0" />
       <StatusEffect type="OnUse" targettype="UseTarget" targets="door,hatch,ductblock" Stuck="15.0" Condition="15.0" />
@@ -369,9 +369,9 @@
       <sound file="Content/Items/Tools/Extinguisher.ogg" type="OnUse" range="500.0" loop="true" />
       <Fixable identifier="structure" />
     </RepairTool>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" hideitems="false" itempos="40,-100" containedspritedepth="0.56">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" hideitems="false" itempos="40,-100" containedspritedepth="0.56">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
-      <Containable items="ekutility_metalfoamfuel_tag" />
+      <Containable items="ekutility_metalfoamfuel_tag,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Quality>
       <QualityStat stattype="RepairToolStructureRepairMultiplier" value="0.2" />
@@ -381,13 +381,13 @@
     <!--<Price storeidentifier="merchantResearch" buyprice="320" />
     <Price storeidentifier="merchantMilitary" buyprice="340" />
     <Price storeidentifier="merchantMine" buyprice="380" />-->
-    <PreferredContainer secondary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.1" />
     <Price baseprice="340" soldeverywhere="false" minleveldifficulty="33">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="3" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="titaniumaluminiumalloy" />
@@ -406,7 +406,7 @@
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="0,336,352,112" depth="0.55" origin="0.5,0.5" />
     <Body width="320" height="80" density="30" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" holdpos="45,-10" aimpos="45,0" handle1="-40,-16" handle2="70,-30" holdangle="-40" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="40.0" structurefixamount="-0.3" range="100" barrelpos="50,5" combatpriority="27" RepairMultiple="true" RepairThroughHoles="false" TargetForce="80" spread="25" unskilledspread="25" levelwallfixamount="-7.5">
+    <RepairTool firedamage="40.0" structurefixamount="-0.3" range="400" barrelpos="50,5" combatpriority="27" RepairMultiple="true" RepairThroughHoles="false" TargetForce="80" spread="25" unskilledspread="25" levelwallfixamount="-7.5">
       <RequiredItems identifier="batterycell,fulguriumbatterycell" type="Contained" msg="ItemMsgBatteryCellRequired" />
       <StatusEffect type="OnUse" targettype="Contained" targets="batterycell" Condition="-4.5" />
       <StatusEffect type="OnUse" targettype="Contained" targets="fulguriumbatterycell" Condition="-2.25" />
@@ -440,22 +440,22 @@
       <ParticleEmitterHitCharacter particle="fleshsmoke" particlespersecond="3" anglemin="-5" anglemax="5" velocitymin="10" velocitymax="100" />
       <sound file="%ModDir%/Items/Tools/ioncutter_loop.ogg" type="OnUse" range="500.0" loop="true" />
       <Fixable identifier="structure" />
-      <LightComponent LightColor="0.4,1.0,0.9,0.7" range="400" Flicker="0.5">
+      <LightComponent LightColor="0.4,1.0,0.9,0.7" range="1600" Flicker="0.5">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5" />
       </LightComponent>
     </RepairTool>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" hideitems="false" itempos="9,-20" containedspritedepth="0.56">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" hideitems="false" itempos="9,-20" containedspritedepth="0.56">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
-      <Containable items="mobilebattery,batterycell,fulguriumbatterycell" />
+      <Containable items="mobilebattery,batterycell,fulguriumbatterycell,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
-  <Item name="" identifier="ekutility_redchemlight" aliases="chemlight red,glowstick red" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,light,ek_chemlight" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ekutility_redchemlight" aliases="chemlight red,glowstick red" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,light,ek_chemlight" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <Price baseprice="25" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="phosphorus" mincondition="0.9" outcondition="0.25" />
@@ -471,7 +471,7 @@
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="0,256,32,80" depth="0.55" origin="0.5,0.5" />
     <Body width="22" height="80" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" throwforce="4.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,25,25,125" range="500" IsOn="false">
+    <LightComponent LightColor="255,25,25,125" range="2000" IsOn="false">
       <sprite texture="%ModDir%/Lights/light_small.png" sourcerect="0,0,128,128" alpha="1.0" />
       <StatusEffect type="OnUse" targettype="This" IsOn="true">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
@@ -482,13 +482,13 @@
     </LightComponent>
     <AiTarget sightrange="4000" />
   </Item>
-  <Item name="" identifier="ekutility_greenchemlight" aliases="chemlight green,glowstick green" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,light,ek_chemlight" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ekutility_greenchemlight" aliases="chemlight green,glowstick green" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,light,ek_chemlight" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <Price baseprice="25" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="phosphorus" mincondition="0.9" outcondition="0.25" />
@@ -504,7 +504,7 @@
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="32,256,32,80" depth="0.55" origin="0.5,0.5" />
     <Body width="22" height="80" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" throwforce="4.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="150,255,0,125" range="500" IsOn="false">
+    <LightComponent LightColor="150,255,0,125" range="2000" IsOn="false">
       <sprite texture="%ModDir%/Lights/light_small.png" sourcerect="0,0,128,128" alpha="1.0" />
       <StatusEffect type="OnUse" targettype="This" IsOn="true">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
@@ -515,13 +515,13 @@
     </LightComponent>
     <AiTarget sightrange="4000" />
   </Item>
-  <Item name="" identifier="ekutility_bluechemlight" aliases="chemlight blue,glowstick blue" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,light,ek_chemlight" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ekutility_bluechemlight" aliases="chemlight blue,glowstick blue" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,light,ek_chemlight" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <Price baseprice="25" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="phosphorus" mincondition="0.9" outcondition="0.25" />
@@ -537,7 +537,7 @@
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="64,256,32,80" depth="0.55" origin="0.5,0.5" />
     <Body width="22" height="80" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" throwforce="4.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="50,100,255,125" range="500" IsOn="false">
+    <LightComponent LightColor="50,100,255,125" range="2000" IsOn="false">
       <sprite texture="%ModDir%/Lights/light_small.png" sourcerect="0,0,128,128" alpha="1.0" />
       <StatusEffect type="OnUse" targettype="This" IsOn="true">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
@@ -548,13 +548,13 @@
     </LightComponent>
     <AiTarget sightrange="4000" />
   </Item>
-  <Item name="" identifier="ekutility_yellowchemlight" aliases="chemlight yellow,glowstick yellow" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,light,ek_chemlight" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="8">
+  <Item name="" identifier="ekutility_yellowchemlight" aliases="chemlight yellow,glowstick yellow" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,light,ek_chemlight" Scale="0.32" impactsoundtag="impact_soft" maxstacksize="16">
     <Price baseprice="25" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="phosphorus" mincondition="0.9" outcondition="0.25" />
@@ -570,7 +570,7 @@
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="96,256,32,80" depth="0.55" origin="0.5,0.5" />
     <Body width="22" height="80" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" throwforce="4.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,180,50,125" range="500" IsOn="false">
+    <LightComponent LightColor="255,180,50,125" range="2000" IsOn="false">
       <sprite texture="%ModDir%/Lights/light_small.png" sourcerect="0,0,128,128" alpha="1.0" />
       <StatusEffect type="OnUse" targettype="This" IsOn="true">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
@@ -584,11 +584,11 @@
   <Item name="" identifier="ekutility_medicalscanner" scale="0.32" category="Equipment,Medical" tags="smallitem" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantResearch" buyprice="150" />-->
     <Price baseprice="150" soldeverywhere="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="8" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="24" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="fpgacircuit" />
@@ -604,14 +604,14 @@
     <Body width="112" height="96" density="25" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="45,-10" aimpos="65,0" handle1="-20,-16" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" targettype="Contained" Condition="-0.45" />
-      <LightComponent LightColor="255,255,255,200" Flicker="0.25" range="45" powerconsumption="0" IsOn="true">
+      <LightComponent LightColor="255,255,255,200" Flicker="0.25" range="180" powerconsumption="0" IsOn="true">
         <LightTexture texture="%ModDir%/Lights/biometric_scanner_fixedlight.png" origin="0.5, 0.27" size="0.5,0.5" />
       </LightComponent>
       <SkillModifier skillidentifier="medical" skillvalue="10" />
     </Holdable>
     <!--<ItemContainer autofill="False" capacity="1" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
-      <Containable items="mobilebattery">
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>-->
@@ -649,11 +649,11 @@
   <!-- SPRINKLER MOVED TO PLACEABLEMACINES.XML FILE -->
   <Item name="" identifier="ekutility_grapplegun" category="Equipment" cargocontaineridentifier="metalcrate" tags="mediumitem,tool,provocative" Scale="0.32" impactsoundtag="impact_metal_light" HideConditionBar="true">
     <Price baseprice="115" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="6" />
     </Price>
     <!--
 	20
@@ -710,7 +710,7 @@
         </StatusEffect>
       </TickBox>
     </CustomInterface>
-    <LightComponent lightcolor="0,0,0,0" range="1.0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent lightcolor="0,0,0,0" range="4" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <StatusEffect type="Always" target="This" checkconditionalalways="true" comparison="and">
         <Conditional ison="false" />
         <Conditional Condition="eq 100" />
@@ -722,8 +722,8 @@
         <SpawnItem identifiers="ekutility_grapplegunprojectile_rappel" spawnposition="ThisInventory" />
       </StatusEffect>
     </LightComponent>
-    <ItemContainer itempos="95,10" iteminterval="0,0" hideitems="false" drawinventory="false" canbeselected="false" capacity="1" maxstacksize="1" containedstateindicatorstyle="spear">
-      <Containable items="ekutility_grapplegunprojectile,ekutility_grapplegunprojectile_rappel" />
+    <ItemContainer itempos="95,10" iteminterval="0,0" hideitems="false" drawinventory="false" canbeselected="false" capacity="1" maxstacksize="2" containedstateindicatorstyle="spear">
+      <Containable items="ekutility_grapplegunprojectile,ekutility_grapplegunprojectile_rappel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!--
 	  <StatusEffect type="Always" target="Contained" delay="0.5" disabledeltatime="true" stackable="false" >
         <Remove />
@@ -811,12 +811,12 @@
   </Item>
   <Item name="" identifier="ekutility_jetpack1" aliases="Jetpack" category="Equipment" Tags="mediumitem,weldingequipment,tool" cargocontaineridentifier="metalcrate" Scale="0.32" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="engcab,divingcab" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="abandonedstoragecab" minamount="0" maxamount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="abandonedstoragecab" minamount="0" maxamount="2" spawnprobability="0.1" />
     <Price baseprice="325" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" /> /&gt;
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" /> /&gt;
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" /><Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" /><Price storeidentifier="merchantmine" multiplier="0.9" sold="false" /> /&gt;
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" /> /&gt;
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" /> /&gt;
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" /><Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" /><Price storeidentifier="merchantmine" multiplier="2.7" sold="false" /> /&gt;
     </Price>
     <!--
 	20
@@ -844,7 +844,7 @@
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="0,784,240,208" depth="0.55" origin="0.5,0.5" />
     <Body width="180" height="85" density="30" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" holdpos="15,4" aimpos="25,0" handle1="50,65" handle2="50,65" holdangle="-90" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="20.0" structurefixamount="0" range="500" barrelpos="40,-10" spread="55" unskilledspread="55" usablein="Air" repairmultiple="false" repairthroughwalls="false" combatpriority="0" levelwallfixamount="0" targetforce="40">
+    <RepairTool firedamage="20.0" structurefixamount="0" range="2000" barrelpos="40,-10" spread="55" unskilledspread="55" usablein="Air" repairmultiple="false" repairthroughwalls="true" combatpriority="0" levelwallfixamount="0" targetforce="40">
       <RequiredItems items="weldingtoolfuel,oxygensource" type="Contained" msg="ItemMsgWeldingFuelRequired" />
       <ParticleEmitter particle="impactfirearm" particlespersecond="60" copyentityangle="true" anglemin="-35" anglemax="35" velocitymin="200" velocitymax="500" scalemin="3" scalemax="5" colormultiplier="255,225,200,100" />
       <ParticleEmitterHitStructure particle="ekutilitysmokefixed" particlespersecond="20" anglemin="-180" anglemax="180" velocitymin="10" velocitymax="100" scalemin="1" scalemax="1.5" colormultiplier="125,125,125,200" />
@@ -864,7 +864,7 @@
         <Affliction identifier="explosiondamage" amount="0.75" />
       </StatusEffect>
       <Fixable identifier="structure" />
-      <LightComponent LightColor="255,200,175,75" range="400" Flicker="0.3" flickerspeed="0.6">
+      <LightComponent LightColor="255,200,175,75" range="1600" Flicker="0.3" flickerspeed="0.6">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5" />
       </LightComponent>
     </RepairTool>
@@ -875,13 +875,13 @@
 	  -->
       <RequiredItems items="weldingtoolfuel,oxygensource" type="Contained" />
     </Propulsion>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" hideitems="false" itempos="-21,-73" itemrotation="90" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" hideitems="false" itempos="-21,-73" itemrotation="90" containedspritedepth="0.56" containedstateindicatorstyle="tank">
       <!--<ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />-->
       <Containable identifiers="weldingtoolfuel" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekutility_advancedheadset" scale="0.5" category="Equipment" tags="smallitem,headset" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
-    <!--<PreferredContainer primary="divingcab,crewcab" minamount="0" maxamount="2" spawnprobability="0.5"/>
+    <!--<PreferredContainer primary="divingcab,crewcab" minamount="0" maxamount="4" spawnprobability="1"/>
     <PreferredContainer primary="storagecab"/>-->
     <!--<Price storeidentifier="merchantResearch" buyprice="150" />
     <Price storeidentifier="merchantMilitary" buyprice="150" />
@@ -889,11 +889,11 @@
     <Price storeidentifier="merchantOutpost" buyprice="150" />
     <Price storeidentifier="merchantMine" buyprice="150" />-->
     <Price baseprice="200" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="18" />
     </Price>
     <InventoryIcon texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="384,0,64,64" origin="0.5,0.5" />
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" depth="0.6" sourcerect="448,112,64,80" origin="0.5,0.5" />
@@ -912,9 +912,9 @@
 	  -->
     </WifiComponent>
     <!--
-	<ItemContainer capacity="1" maxstacksize="1" hideitems="true">
+	<ItemContainer capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
-      <Containable items="mobilebattery" />
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
 	-->
     <Wearable limbtype="Head" slots="Any,Headset" msg="ItemMsgPickUpSelect" displaycontainedstatus="true">
@@ -945,11 +945,11 @@
     <Price storeidentifier="merchantCity" buyprice="220" />
     <Price storeidentifier="merchantOutpost" buyprice="260" />-->
     <Price baseprice="280" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="18" />
     </Price>
     <InventoryIcon texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="320,0,64,64" origin="0.5,0.5" />
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" depth="0.6" sourcerect="448,0,128,112" origin="0.5,0.5" />
@@ -972,13 +972,13 @@
       <!--<RequiredItems items="mobilebattery" type="Contained" />-->
     </WifiComponent>
     <!--
-	<ItemContainer autofill="True" capacity="1" maxstacksize="1" hideitems="true">
+	<ItemContainer autofill="True" capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
-      <Containable items="mobilebattery" />
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
 	-->
-    <ItemContainer capacity="6">
-      <Containable items="smallitem,explosive,tool,ore" excludeditems="toolbelt,bandolier,toolbox,mobilecontainer,rucksack,backpack,waistbelt" />
+    <ItemContainer capacity="13">
+      <Containable items="smallitem,explosive,tool,ore,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <!-- Headset+Bag -->
     <Holdable slots="RightHand+LeftHand" holdpos="0,-70" handle1="-5,0" handle2="10,-20" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Select" allowswappingwhenpicked="false" />
@@ -1027,11 +1027,11 @@
         </StatusEffect>-->
   <Item name="" identifier="ekutility_sledgehammer" aliases="ek_sledgehammer,sledgehammer_ek,ek sledgehammer,sledgehammer ek" scale="0.32" category="Equipment" tags="mediumitem,weapon" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_heavy">
     <Price baseprice="45" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="6" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -1054,18 +1054,18 @@
       </Attack>
     </MeleeWeapon>
   </Item>
-  <Item name="" identifier="ekutility_electroflare" aliases="electro flare" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,light,loadable" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="8">
+  <Item name="" identifier="ekutility_electroflare" aliases="electro flare" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,light,loadable" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="16">
     <!--<Price storeidentifier="merchantCity" buyprice="30" />
     <Price storeidentifier="merchantResearch" buyprice="50" />
     <Price storeidentifier="merchantMilitary" buyprice="55" />
     <Price storeidentifier="merchantOutpost" buyprice="35" />
     <Price storeidentifier="merchantMine" buyprice="40" />-->
     <Price baseprice="75" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="30" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="sodium" outcondition="0.5" />
@@ -1082,7 +1082,7 @@
     <ContainedSprite allowedcontainertags="chargingdock" texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="432,192,114,48" depth="0.55" origin="0.75,0.5" />
     <Body width="40" height="100" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,-10" throwforce="2.5" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,200,150,255" range="600" IsOn="false" castshadows="true" canbeselected="false" allowingameediting="false">
+    <LightComponent LightColor="255,200,150,255" range="2400" IsOn="false" castshadows="true" canbeselected="false" allowingameediting="false">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright.png" origin="0.5, 0.5" />
       <!-- ROTATING LIGHT SPRITES STILL MAKE NO GODDAMN SENSE
 	  <sprite texture="Mods/Ek Utilities/Lights/electroflare_light.png" depth="0.025" sourcerect="0,0,144,144" alpha="1.0" />
@@ -1101,14 +1101,14 @@
     <AiTarget sightrange="4000" />
   </Item>
   <Item name="" identifier="ekutility_pda" category="Equipment" Tags="smallitem,tool,sonar" cargocontaineridentifier="metalcrate" Scale="0.3" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="engcab" minamount="1" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="outpostcrewcabinet" minamount="1" maxamount="1" spawnprobability="0.125" />
+    <PreferredContainer primary="engcab" minamount="2" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="outpostcrewcabinet" minamount="2" maxamount="2" spawnprobability="0.25" />
     <Price baseprice="225" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="6" />
     </Price>
     <!--
 	42
@@ -1143,22 +1143,22 @@
       <GuiFrame relativesize="0.5,0.5" anchor="Center" style="ItemUI" />
       <AlternativeLayout relativesize="0.2725,0.3" pivot="BottomLeft" relativeoffset="0.05,-0.001" />
     </MiniMap>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
-      <Containable items="mobilebattery,batterycell,fulguriumbatterycell">
+      <Containable items="mobilebattery,batterycell,fulguriumbatterycell,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekutility_pdacargo" category="Equipment" Tags="smallitem,tool,sonar" cargocontaineridentifier="metalcrate" Scale="0.3" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="engcab" minamount="1" maxamount="1" spawnprobability="0.15" />
-    <PreferredContainer primary="outpostcrewcabinet" minamount="1" maxamount="1" spawnprobability="0.125" />
+    <PreferredContainer primary="engcab" minamount="2" maxamount="2" spawnprobability="0.3" />
+    <PreferredContainer primary="outpostcrewcabinet" minamount="2" maxamount="2" spawnprobability="0.25" />
     <Price baseprice="225" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" minavailable="6" />
     </Price>
     <!--
 	42
@@ -1193,9 +1193,9 @@
       <GuiFrame relativesize="0.5,0.5" anchor="Center" style="ItemUI" />
       <AlternativeLayout relativesize="0.2725,0.3" pivot="BottomLeft" relativeoffset="0.05,-0.001" />
     </MiniMap>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
-      <Containable items="mobilebattery,batterycell,fulguriumbatterycell">
+      <Containable items="mobilebattery,batterycell,fulguriumbatterycell,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>
@@ -1207,11 +1207,11 @@
     <Price storeidentifier="merchantOutpost" buyprice="40" />
     <Price storeidentifier="merchantMine" buyprice="45" />-->
     <Price baseprice="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="aluminium" />
@@ -1236,29 +1236,29 @@
         <Conditional Condition="eq 90" />
       </StatusEffect>
     </Holdable>
-    <RepairTool structurefixamount="0.6" range="25" barrelpos="32,0" spread="40" unskilledspread="40" repairmultiple="false" repairthroughwalls="false">
+    <RepairTool structurefixamount="0.6" range="100" barrelpos="32,0" spread="40" unskilledspread="40" repairmultiple="false" repairthroughwalls="true">
       <RequiredItems identifier="steel" type="Contained" msg="ItemMsgAmmoRequired" />
       <StatusEffect type="OnUse" targettype="Contained" targets="steel" Condition="-1.5" />
       <StatusEffect type="OnUse" targettype="UseTarget" targets="door,hatch,ductblock" Condition="10.0" />
       <sound file="%ModDir%/Items/Tools/patching_kit_loop.ogg" type="OnUse" range="500.0" loop="true" />
       <Fixable identifier="structure" />
     </RepairTool>
-    <ItemContainer autofill="False" capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer autofill="False" capacity="1" maxstacksize="2" hideitems="true">
       <!--<ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />-->
-      <Containable items="steel" />
+      <Containable items="steel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekutility_laserdrill" aliases="ek laser bore,laser drill,ek laser drill" category="Equipment" Tags="smallitem,cuttingequipment,tools,flashlight" cargocontaineridentifier="metalcrate" Scale="0.32" impactsoundtag="impact_metal_light">
     <!--<Price storeidentifier="merchantResearch" buyprice="320" />
     <Price storeidentifier="merchantMilitary" buyprice="340" />
     <Price storeidentifier="merchantMine" buyprice="380" />-->
-    <PreferredContainer secondary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.1" />
     <Price baseprice="300" soldeverywhere="false" minleveldifficulty="33">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="2" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="6" minavailable="3" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="titaniumaluminiumalloy" />
@@ -1277,7 +1277,7 @@
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="352,416,352,144" depth="0.55" origin="0.5,0.45" />
     <Body width="320" height="80" density="30" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" holdpos="40,5" aimpos="35,15" handle1="-10,-35" handle2="90,-35" holdangle="-45" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="60" structurefixamount="-0.12" range="700" barrelpos="53,0" combatpriority="27" RepairMultiple="true" RepairThroughHoles="true" TargetForce="20" levelwallfixamount="-10.0">
+    <RepairTool firedamage="60" structurefixamount="-0.12" range="2800" barrelpos="53,0" combatpriority="27" RepairMultiple="true" RepairThroughHoles="true" TargetForce="20" levelwallfixamount="-10.0">
       <RequiredItems identifier="batterycell,fulguriumbatterycell" type="Contained" msg="ItemMsgBatteryCellRequired" />
       <StatusEffect type="OnUse" target="This" Condition="-30" />
       <StatusEffect type="Always" target="This" Condition="10">
@@ -1330,16 +1330,16 @@
       <sound file="%ModDir%/Items/Tools/laserbore_fire.ogg" type="OnUse" range="800.0" loop="false" selectionmode="All" />
       <sound file="%ModDir%/Items/Tools/laserbore_loop.ogg" type="OnUse" range="800.0" loop="true" selectionmode="All" />
       <Fixable identifier="structure" />
-      <LightComponent LightColor="1.0,0.2,0.1,0.6" range="350" Flicker="0.3">
+      <LightComponent LightColor="1.0,0.2,0.1,0.6" range="1400" Flicker="0.3">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5" />
       </LightComponent>
-      <LightComponent LightColor="1.0,1.0,1.0,0.7" range="650" Flicker="0.3">
+      <LightComponent LightColor="1.0,1.0,1.0,0.7" range="2600" Flicker="0.3">
         <LightTexture texture="%ModDir%/Lights/laserbore_beam.png" origin="-0.001, 0.5" size="1.0,0.5" />
       </LightComponent>
     </RepairTool>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" hideitems="false" itempos="48,-45" itemrotation="90" containedspritedepth="0.56">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" hideitems="false" itempos="48,-45" itemrotation="90" containedspritedepth="0.56">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
-      <Containable items="mobilebattery,batterycell,fulguriumbatterycell" />
+      <Containable items="mobilebattery,batterycell,fulguriumbatterycell,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Quality>
       <QualityStat stattype="RepairToolStructureDamageMultiplier" value="0.15" />
@@ -1359,15 +1359,15 @@
 -->
   <Item name="" identifier="ekutility_miningbackpack" scale="0.32" category="Equipment" tags="mediumitem,toolbelt,toolbox,mobilecontainer" waterproof="true" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="engcab" />
-    <PreferredContainer primary="divingcab" minamount="0" maxamount="2" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="3" spawnprobability="0.06" />
-    <PreferredContainer primary="outpostcrewcabinet" minamount="0" maxamount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="divingcab" minamount="0" maxamount="4" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="6" spawnprobability="0.12" />
+    <PreferredContainer primary="outpostcrewcabinet" minamount="0" maxamount="2" spawnprobability="0.2" />
     <Price baseprice="90" soldeverywhere="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -1385,8 +1385,8 @@
     <InventoryIcon texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="656,0,96,160" origin="0.5,0.5" />
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" depth="0.6" sourcerect="656,0,96,160" origin="0.5,0.6" />
     <Body width="95" height="115" density="15" />
-    <ItemContainer capacity="20" depth="0.5">
-      <Containable items="smallitem,explosive,tool,ore" excludeditems="toolbelt,bandolier,toolbox,mobilecontainer,rucksack,backpack,waistbelt" />
+    <ItemContainer capacity="44" depth="0.5">
+      <Containable items="smallitem,explosive,tool,ore,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Holdable slots="RightHand+LeftHand" holdpos="0,-70" handle1="-5,0" handle2="10,-20" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Select" allowswappingwhenpicked="false" />
     <Wearable limbtype="Torso" slots="Bag" msg="ItemMsgEquipSelect" canbeselected="false" canbepicked="true" pickkey="Select" displaycontainedstatus="true">
@@ -1396,11 +1396,11 @@
   </Item>
   <Item name="" identifier="ekutility_medicalbackpack" scale="0.32" category="Equipment" tags="smallitem,bandolier,toolbelt,toolbox,mobilecontainer" waterproof="true" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
     <Price baseprice="80" soldeverywhere="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -1415,8 +1415,8 @@
     <!--<InventoryIcon texture="Mods/EK Utilities/Items/Tools/ekutility_tools.png" sourcerect="768,128,112,112" origin="0.5,0.5" />-->
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" depth="0.6" sourcerect="768,128,112,112" origin="0.5,0.5" />
     <Body width="112" height="98" density="12" />
-    <ItemContainer capacity="16" depth="0.5" displaycontainedstatus="true">
-      <Containable items="smallitem,medical,chem" excludeditems="toolbelt,bandolier,toolbox,mobilecontainer,rucksack,backpack,waistbelt" />
+    <ItemContainer capacity="35" depth="0.5" displaycontainedstatus="true">
+      <Containable items="smallitem,medical,chem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Holdable slots="RightHand+LeftHand" holdpos="0,-70" handle1="-5,0" handle2="10,-20" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Select" allowswappingwhenpicked="false" />
     <Wearable limbtype="Torso" slots="Bag" msg="ItemMsgEquipSelect" canbeselected="false" canbepicked="true" pickkey="Select" displaycontainedstatus="true">
@@ -1430,11 +1430,11 @@
   <Item name="Metallic Foam Grenade" identifier="ekutility_repairgrenade" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,weapon,tool,explosive" scale="0.5" impactsoundtag="impact_metal_heavy">
 
     <Price baseprice="250" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false"/>
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false"/>
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -1503,15 +1503,15 @@
   
   -->
   <Item name="" identifier="ekutility_arcwelder" aliases="arcwelder" category="Equipment" Tags="smallitem,weldingequipment,tool" cargocontaineridentifier="metalcrate" Scale="0.32" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="engcab" minamount="0" maxamount="2" spawnprobability="0.25" />
-    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.125" />
-    <PreferredContainer primary="outpostcrewcabinet" minamount="0" maxamount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" minamount="0" maxamount="4" spawnprobability="0.5" />
+    <PreferredContainer primary="wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.25" />
+    <PreferredContainer primary="outpostcrewcabinet" minamount="0" maxamount="2" spawnprobability="0.2" />
     <Price baseprice="175" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="3" />
     </Price>
     <!--
 	20
@@ -1537,7 +1537,7 @@
     <Sprite texture="%ModDir%/Items/Tools/ekutility_tools.png" sourcerect="672,272,224,96" depth="0.55" origin="0.5,0.5" />
     <Body width="180" height="85" density="30" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" holdpos="40,-5" aimpos="45,0" handle1="-52,-16" handle2="32,-16" holdangle="-40" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="15.0" structurefixamount="3.5" range="125" barrelpos="35,9" particles="weld" repairmultiple="true" repairthroughwalls="false" combatpriority="5">
+    <RepairTool firedamage="15.0" structurefixamount="3.5" range="500" barrelpos="35,9" particles="weld" repairmultiple="true" repairthroughwalls="true" combatpriority="5">
       <RequiredItems identifier="mobilebattery,batterycell,fulguriumbatterycell" type="Contained" msg="ItemMsgBatteryCellRequired" />
       <ParticleEmitter particle="plasma" particlespersecond="25" copyentityangle="true" scalemin="0.4" scalemax="0.4" />
       <ParticleEmitterHitStructure particle="plasmaspark" particlespersecond="45" anglemin="-120" anglemax="120" velocitymin="50" velocitymax="800" />
@@ -1569,7 +1569,7 @@
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5" />
       </LightComponent>
     </RepairTool>
-    <ItemContainer autofill="True" capacity="1" maxstacksize="1" hideitems="false" itempos="-8,-24" itemrotation="90">
+    <ItemContainer autofill="True" capacity="1" maxstacksize="2" hideitems="false" itempos="-8,-24" itemrotation="90">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
       <Containable identifiers="mobilebattery,batterycell,fulguriumbatterycell" />
     </ItemContainer>
@@ -1582,11 +1582,11 @@
   <Item name="" identifier="ekutility_portablepump" aliases="portable pump,portable drain" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,light" Scale="0.32" impactsoundtag="impact_soft" hideinmenus="true">
     <!--
 	<Price baseprice="25" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
 	
     <Deconstruct time="10">
@@ -1624,22 +1624,22 @@
       <PumpInEmitter particle="watersplash" particlespersecond="50" position="7,-51" anglemin="180" anglemax="180" velocitymin="200" velocitymax="400" scalemin="0.5" scalemax="0.6" />
       <PumpOutEmitter particle="bubbles" particlespersecond="5" position="7,-51" anglemin="0" anglemax="360" velocitymin="0" velocitymax="0" scalemin="0.5" scalemax="0.6" />
     </Pump>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
-      <Containable items="mobilebattery">
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekutility_incendiumfuelrod" Tags="smallitem,reactorfuel,fulguriumfuelrod" cargocontaineridentifier="metalcrate" health="150" scale="0.5">
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer primary="wreckreactorcab" minamount="0" maxamount="1" spawnprobability="0.15" />
+    <PreferredContainer primary="wreckreactorcab" minamount="0" maxamount="2" spawnprobability="0.3" />
     <Price baseprice="250" soldeverywhere="false" minleveldifficulty="25">
-      <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1657,7 +1657,7 @@
     <Body radius="6" height="55" density="20" />
     <Holdable handle1="0,0" slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect" />
     <ItemContainer hideitems="true" capacity="1" itemrotation="90" drawinventory="false" canbeselected="false" SpawnWithId="nucleargunbolt" removecontaineditemsondeconstruct="true" showcontainedstateindicator="false">
-      <Containable items="nucleargunbolt" />
+      <Containable items="nucleargunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-20" disabledeltatime="true">
         <SpawnItem identifiers="nucleargunbolt" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -1668,7 +1668,7 @@
   </Item>
   <!--
   <Item name="ekutility_fabricationdebugger" identifier="ekutility_fabricationdebugger" category="Equipment" Tags="smallitem" cargocontaineridentifier="metalcrate" scale="0.3" 
-  description="Debug fabricate recipe use condition" impactsoundtag="impact_metal_light" maxstacksize="4">
+  description="Debug fabricate recipe use condition" impactsoundtag="impact_metal_light" maxstacksize="8">
 
     <Deconstruct time="1">
       <Item identifier="steel" outcondition="0.5" />
@@ -1690,8 +1690,8 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="0,3,152,88" depth="0.55" origin="0.5,0.5" />
     <Body width="150" height="60" density="40" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="50,0" handle1="-62,-16" handle2="-5,-16" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="10.0" structurefixamount="5.0" range="150" barrelpos="35,10" particles="weld" repairmultiple="true" repairthroughwalls="false" combatpriority="10" levelwallfixamount="-0.5" targetforce="10">
-	  <LightComponent LightColor="1.0,0.9,0.7,1.0" Flicker="0.5" range="150">
+    <RepairTool firedamage="10.0" structurefixamount="5.0" range="600" barrelpos="35,10" particles="weld" repairmultiple="true" repairthroughwalls="true" combatpriority="10" levelwallfixamount="-0.5" targetforce="10">
+	  <LightComponent LightColor="1.0,0.9,0.7,1.0" Flicker="0.5" range="600">
         <sprite texture="Mods/EK Utilities/Lights/laserbore_beam.png" origin="-0.027, 0.4" size="1.0,0.3" />
       </LightComponent>
     </RepairTool>
@@ -1699,8 +1699,8 @@
   -->
   <Item name="" identifier="ekutility_supplypouch" category="Equipment" tags="smallitem,ekutility_smallmobilecontainer,tool" cargocontaineridentifier="" showcontentsintooltip="true" Scale="0.32" fireproof="true" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="engcab" />
-    <PreferredContainer secondary="wreckstoragecab" spawnprobability="0.06" />
-    <PreferredContainer primary="outpostcrewcabinet" minamount="0" maxamount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckstoragecab" spawnprobability="0.12" />
+    <PreferredContainer primary="outpostcrewcabinet" minamount="0" maxamount="2" spawnprobability="0.2" />
     <Deconstruct time="7">
       <Item identifier="organicfiber" />
       <Item identifier="plastic" />
@@ -1713,19 +1713,19 @@
     <!-- 30 -->
     <!-- 20 -->
     <Price baseprice="45">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="8" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="24" />
     </Price>
     <!--<InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="640,256,64,64" origin="0.5,0.6" />-->
     <Sprite texture="%ModDir%/Items/Containers/ekutility_containers.png" sourcerect="1,848,86,64" origin="0.5,0.5" />
     <!--<Sprite texture="Content/Items/Containers/crates.png" depth="0.54" sourcerect="1,0,68,39"/>-->
     <Body width="80" height="60" density="10" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="20,-60" handle1="0,-15" holdangle="0" msg="ItemMsgPickUpSelect" canbeselected="false" canbepicked="true" pickkey="Select" allowswappingwhenpicked="false" />
-    <ItemContainer capacity="8" maxstacksize="1" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem,tool,medical,chem" excludeditems="weapon,mediumitem,largeitem,toolbelt,bandolier,toolbox,mobilecontainer,ekutility_smallmobilecontainer,rucksack,backpack,waistbelt,weldingequipment,cuttingequipment,weldingfuel,weldingfueltank,oxygentank,oxygenitetank,refillableoxygensource" />
+    <ItemContainer capacity="18" maxstacksize="2" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,tool,medical,chem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems.xml
index 50a7657e..3087df51 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems.xml	
@@ -5,13 +5,13 @@
     <Item name="" identifier="skyholderartifact" category="Alien" Tags="alien,alienartifact" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy" allowsellingwhenbroken="true" hideconditionbar="true">
       <Upgrade gameversion="0.9.3.1" scale="0.5" />
       <Price baseprice="1250" soldeverywhere="false">
-        <Price storeidentifier="merchantoutpost" multiplier="0.85" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-        <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-        <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+        <Price storeidentifier="merchantoutpost" multiplier="2.55" sold="false" />
+        <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+        <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+        <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="630,0,82,108" origin="0.5,0.5" />
       <Deconstruct time="30">
         <Item identifier="steel" />
@@ -35,13 +35,13 @@
     <Item name="" identifier="thermalartifact" category="Alien" Tags="alien,alienartifact" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy">
       <Upgrade gameversion="0.9.3.1" scale="0.5" />
       <Price baseprice="2000" soldeverywhere="false">
-        <Price storeidentifier="merchantoutpost" multiplier="0.85" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-        <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-        <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+        <Price storeidentifier="merchantoutpost" multiplier="2.55" sold="false" />
+        <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+        <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+        <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="542,112,102,99" origin="0.5,0.5" />
       <Deconstruct time="30">
         <Item identifier="steel" />
@@ -74,13 +74,13 @@
     <Item name="" identifier="faradayartifact" category="Alien" Tags="alien,alienartifact" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy" allowsellingwhenbroken="true" hideconditionbar="true">
       <Upgrade gameversion="0.9.3.1" scale="0.5" />
       <Price baseprice="1750" soldeverywhere="false">
-        <Price storeidentifier="merchantoutpost" multiplier="0.85" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-        <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-        <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+        <Price storeidentifier="merchantoutpost" multiplier="2.55" sold="false" />
+        <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+        <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+        <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="645,108,93,103" origin="0.5,0.5" />
       <Deconstruct time="30">
         <Item identifier="steel" />
@@ -114,13 +114,13 @@
     <Item name="" identifier="nasonovartifact" category="Alien" Tags="alien,nasonov,alienartifact" pickdistance="150" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy" allowsellingwhenbroken="true" hideconditionbar="true">
       <Upgrade gameversion="0.9.3.1" scale="0.5" />
       <Price baseprice="1500" soldeverywhere="false">
-        <Price storeidentifier="merchantoutpost" multiplier="0.85" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-        <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-        <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+        <Price storeidentifier="merchantoutpost" multiplier="2.55" sold="false" />
+        <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+        <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+        <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="718,6,78,102" origin="0.5,0.5" />
       <Deconstruct time="30">
         <Item identifier="steel" />
@@ -153,13 +153,13 @@
     <Item name="" identifier="psychosisartifact" category="Alien" Tags="alien,alienartifact" sonarsize="30" spritecolor="200,200,200,255" scale="0.5" impactsoundtag="impact_metal_heavy">
       <Upgrade gameversion="0.9.3.1" scale="0.5" />
       <Price baseprice="1500" soldeverywhere="false">
-        <Price storeidentifier="merchantoutpost" multiplier="0.85" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.85" sold="false" />
-        <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-        <Price storeidentifier="merchantmine" multiplier="1" sold="false" />
+        <Price storeidentifier="merchantoutpost" multiplier="2.55" sold="false" />
+        <Price storeidentifier="merchantcity" multiplier="2.55" sold="false" />
+        <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+        <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="541,0,88,108" origin="0.5,0.5" />
       <Deconstruct time="30">
         <Item identifier="steel" />
@@ -184,7 +184,7 @@
           <Affliction identifier="psychosis" strength="0.5" />
         </StatusEffect>
       </Holdable>
-      <LightComponent range="150.0" lightcolor="255,56,144,111" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.25" />
+      <LightComponent range="600" lightcolor="255,56,144,111" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.25" />
     </Item>
     <!--
   <Item name="" identifier="shellshield" category="Equipment" tags="smallitem" health="500" cargocontaineridentifier="metalcrate" damagedbyprojectiles="true" impactsoundtag="impact_soft" scale="0.5" allowasextracargo="true">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems_legacy.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems_legacy.xml
index b3eec0e3..78022a4f 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems_legacy.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems_legacy.xml	
@@ -6,13 +6,13 @@
       <!-- <Upgrade gameversion="0.9.3.1" scale="0.5"/> We don't need this junk-->
       <!-- Wheeeeeee Redtext !!! -->
       <Price baseprice="1000" soldeverywhere="false">
-        <Price locationtype="outpost" multiplier="0.85" sold="false" />
-        <Price locationtype="city" multiplier="0.85" sold="false" />
-        <Price locationtype="research" multiplier="1.3" sold="false" />
-        <Price locationtype="military" multiplier="1.25" sold="false" />
-        <Price locationtype="mine" multiplier="1" sold="false" />
+        <Price locationtype="outpost" multiplier="2.55" sold="false" />
+        <Price locationtype="city" multiplier="2.55" sold="false" />
+        <Price locationtype="research" multiplier="3.9" sold="false" />
+        <Price locationtype="military" multiplier="3.75" sold="false" />
+        <Price locationtype="mine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.6" sourcerect="0,0,68,69" origin="0.5,0.5" />
       <!-- central piece -->
       <DecorativeSprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.5" sourcerect="0,0,68,69" origin="0.5,0.5" randomgroupid="1" />
@@ -53,14 +53,14 @@
     <Item name="" identifier="thermalartifact" category="Alien" Tags="alien,alienartifact" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy">
       <!-- Wheeeeeee Redtext !!! -->
       <Price baseprice="1000" soldeverywhere="false">
-        <Price locationtype="outpost" multiplier="0.85" sold="false" />
-        <Price locationtype="city" multiplier="0.85" sold="false" />
-        <Price locationtype="research" multiplier="1.3" sold="false" />
-        <Price locationtype="military" multiplier="1.25" sold="false" />
-        <Price locationtype="mine" multiplier="1" sold="false" />
+        <Price locationtype="outpost" multiplier="2.55" sold="false" />
+        <Price locationtype="city" multiplier="2.55" sold="false" />
+        <Price locationtype="research" multiplier="3.9" sold="false" />
+        <Price locationtype="military" multiplier="3.75" sold="false" />
+        <Price locationtype="mine" multiplier="3" sold="false" />
       </Price>
       <!-- <Upgrade gameversion="0.9.3.1" scale="0.5"/> We don't need this junk-->
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.6" sourcerect="0,0,68,69" origin="0.5,0.5" />
       <!-- central piece -->
       <DecorativeSprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.5" sourcerect="0,0,68,69" origin="0.5,0.5" randomgroupid="1" />
@@ -107,13 +107,13 @@
       <!-- <Upgrade gameversion="0.9.3.1" scale="0.5"/> We don't need this junk-->
       <!-- Wheeeeeee Redtext !!! -->
       <Price baseprice="1000" soldeverywhere="false">
-        <Price locationtype="outpost" multiplier="0.85" sold="false" />
-        <Price locationtype="city" multiplier="0.85" sold="false" />
-        <Price locationtype="research" multiplier="1.3" sold="false" />
-        <Price locationtype="military" multiplier="1.25" sold="false" />
-        <Price locationtype="mine" multiplier="1" sold="false" />
+        <Price locationtype="outpost" multiplier="2.55" sold="false" />
+        <Price locationtype="city" multiplier="2.55" sold="false" />
+        <Price locationtype="research" multiplier="3.9" sold="false" />
+        <Price locationtype="military" multiplier="3.75" sold="false" />
+        <Price locationtype="mine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.6" sourcerect="0,0,68,69" origin="0.5,0.5" />
       <!-- central piece -->
       <DecorativeSprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.5" sourcerect="0,0,68,69" origin="0.5,0.5" randomgroupid="1" />
@@ -161,13 +161,13 @@
       <!-- <Upgrade gameversion="0.9.3.1" scale="0.5"/> We don't need this junk-->
       <!-- Wheeeeeee Redtext !!! -->
       <Price baseprice="1000" soldeverywhere="false">
-        <Price locationtype="outpost" multiplier="0.85" sold="false" />
-        <Price locationtype="city" multiplier="0.85" sold="false" />
-        <Price locationtype="research" multiplier="1.3" sold="false" />
-        <Price locationtype="military" multiplier="1.25" sold="false" />
-        <Price locationtype="mine" multiplier="1" sold="false" />
+        <Price locationtype="outpost" multiplier="2.55" sold="false" />
+        <Price locationtype="city" multiplier="2.55" sold="false" />
+        <Price locationtype="research" multiplier="3.9" sold="false" />
+        <Price locationtype="military" multiplier="3.75" sold="false" />
+        <Price locationtype="mine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.6" sourcerect="0,0,68,69" origin="0.5,0.5" />
       <!-- central piece -->
       <DecorativeSprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.5" sourcerect="0,0,68,69" origin="0.5,0.5" randomgroupid="1" />
@@ -207,13 +207,13 @@
       <!-- <Upgrade gameversion="0.9.3.1" scale="0.5"/> We don't need this junk-->
       <!-- Wheeeeeee Redtext !!! -->
       <Price baseprice="1000" soldeverywhere="false">
-        <Price locationtype="outpost" multiplier="0.85" sold="false" />
-        <Price locationtype="city" multiplier="0.85" sold="false" />
-        <Price locationtype="research" multiplier="1.3" sold="false" />
-        <Price locationtype="military" multiplier="1.25" sold="false" />
-        <Price locationtype="mine" multiplier="1" sold="false" />
+        <Price locationtype="outpost" multiplier="2.55" sold="false" />
+        <Price locationtype="city" multiplier="2.55" sold="false" />
+        <Price locationtype="research" multiplier="3.9" sold="false" />
+        <Price locationtype="military" multiplier="3.75" sold="false" />
+        <Price locationtype="mine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.6" sourcerect="0,0,68,69" origin="0.5,0.5" />
       <!-- central piece -->
       <DecorativeSprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.5" sourcerect="0,0,68,69" origin="0.5,0.5" randomgroupid="1" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems_legacy2.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems_legacy2.xml
index 0004382d..4d451176 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems_legacy2.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_alienitems_legacy2.xml	
@@ -4,13 +4,13 @@
   <Items>
     <Item name="" identifier="skyholderartifact" category="Alien" Tags="alien,alienartifact,ekutility_compatibleartifact" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy" allowsellingwhenbroken="true" HideConditionBar="true">
       <Price baseprice="1250" soldeverywhere="false">
-        <Price locationtype="outpost" multiplier="0.85" sold="false" />
-        <Price locationtype="city" multiplier="0.85" sold="false" />
-        <Price locationtype="research" multiplier="1.3" sold="false" />
-        <Price locationtype="military" multiplier="1.25" sold="false" />
-        <Price locationtype="mine" multiplier="1" sold="false" />
+        <Price locationtype="outpost" multiplier="2.55" sold="false" />
+        <Price locationtype="city" multiplier="2.55" sold="false" />
+        <Price locationtype="research" multiplier="3.9" sold="false" />
+        <Price locationtype="military" multiplier="3.75" sold="false" />
+        <Price locationtype="mine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.6" sourcerect="0,0,68,69" origin="0.5,0.5" />
       <!-- central piece -->
       <DecorativeSprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.5" sourcerect="0,0,68,69" origin="0.5,0.5" randomgroupid="1" />
@@ -52,13 +52,13 @@
     </Item>
     <Item name="" identifier="thermalartifact" category="Alien" Tags="alien,alienartifact,ekutility_compatibleartifact" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy" allowsellingwhenbroken="true" HideConditionBar="true">
       <Price baseprice="2000" soldeverywhere="false">
-        <Price locationtype="outpost" multiplier="0.85" sold="false" />
-        <Price locationtype="city" multiplier="0.85" sold="false" />
-        <Price locationtype="research" multiplier="1.3" sold="false" />
-        <Price locationtype="military" multiplier="1.25" sold="false" />
-        <Price locationtype="mine" multiplier="1" sold="false" />
+        <Price locationtype="outpost" multiplier="2.55" sold="false" />
+        <Price locationtype="city" multiplier="2.55" sold="false" />
+        <Price locationtype="research" multiplier="3.9" sold="false" />
+        <Price locationtype="military" multiplier="3.75" sold="false" />
+        <Price locationtype="mine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.6" sourcerect="0,0,68,69" origin="0.5,0.5" />
       <!-- central piece -->
       <DecorativeSprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.5" sourcerect="0,0,68,69" origin="0.5,0.5" randomgroupid="1" />
@@ -110,13 +110,13 @@
     </Item>
     <Item name="" identifier="faradayartifact" category="Alien" Tags="alien,alienartifact,ekutility_compatibleartifact" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy" allowsellingwhenbroken="true" HideConditionBar="true">
       <Price baseprice="1750" soldeverywhere="false">
-        <Price locationtype="outpost" multiplier="0.85" sold="false" />
-        <Price locationtype="city" multiplier="0.85" sold="false" />
-        <Price locationtype="research" multiplier="1.3" sold="false" />
-        <Price locationtype="military" multiplier="1.25" sold="false" />
-        <Price locationtype="mine" multiplier="1" sold="false" />
+        <Price locationtype="outpost" multiplier="2.55" sold="false" />
+        <Price locationtype="city" multiplier="2.55" sold="false" />
+        <Price locationtype="research" multiplier="3.9" sold="false" />
+        <Price locationtype="military" multiplier="3.75" sold="false" />
+        <Price locationtype="mine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.6" sourcerect="0,0,68,69" origin="0.5,0.5" />
       <!-- central piece -->
       <DecorativeSprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.5" sourcerect="0,0,68,69" origin="0.5,0.5" randomgroupid="1" />
@@ -164,13 +164,13 @@
     </Item>
     <Item name="" identifier="nasonovartifact" category="Alien" Tags="alien,nasonov,alienartifact,ekutility_compatibleartifact" pickdistance="150" indestructible="true" sonarsize="30" scale="0.5" impactsoundtag="impact_metal_heavy" allowsellingwhenbroken="true" HideConditionBar="true">
       <Price baseprice="1500" soldeverywhere="false">
-        <Price locationtype="outpost" multiplier="0.85" sold="false" />
-        <Price locationtype="city" multiplier="0.85" sold="false" />
-        <Price locationtype="research" multiplier="1.3" sold="false" />
-        <Price locationtype="military" multiplier="1.25" sold="false" />
-        <Price locationtype="mine" multiplier="1" sold="false" />
+        <Price locationtype="outpost" multiplier="2.55" sold="false" />
+        <Price locationtype="city" multiplier="2.55" sold="false" />
+        <Price locationtype="research" multiplier="3.9" sold="false" />
+        <Price locationtype="military" multiplier="3.75" sold="false" />
+        <Price locationtype="mine" multiplier="3" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.6" sourcerect="0,0,68,69" origin="0.5,0.5" />
       <!-- central piece -->
       <DecorativeSprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.5" sourcerect="0,0,68,69" origin="0.5,0.5" randomgroupid="1" />
@@ -208,13 +208,13 @@
     </Item>
     <Item name="" identifier="psychosisartifact" category="Alien" Tags="alien,alienartifact,ekutility_compatibleartifact" sonarsize="30" spritecolor="200,200,200,255" scale="0.5" impactsoundtag="impact_metal_heavy" allowsellingwhenbroken="true" HideConditionBar="true">
       <Price baseprice="1500" soldeverywhere="false">
-        <Price locationtype="outpost" multiplier="0.85" sold="false" />
-        <Price locationtype="city" multiplier="1" sold="false" />
-        <Price locationtype="research" multiplier="1.3" sold="false" />
-        <Price locationtype="military" multiplier="1.15" sold="false" />
-        <Price locationtype="mine" multiplier="0.85" sold="false" />
+        <Price locationtype="outpost" multiplier="2.55" sold="false" />
+        <Price locationtype="city" multiplier="3" sold="false" />
+        <Price locationtype="research" multiplier="3.9" sold="false" />
+        <Price locationtype="military" multiplier="3.45" sold="false" />
+        <Price locationtype="mine" multiplier="2.55" sold="false" />
       </Price>
-      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="1" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecksecurearmcab,wreckshuttlecrate" minamount="0" maxamount="2" spawnprobability="0.1" />
       <Sprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.6" sourcerect="0,0,68,69" origin="0.5,0.5" />
       <!-- central piece -->
       <DecorativeSprite texture="Content/Items/Alien/AlienArtifact1.png" depth="0.5" sourcerect="0,0,68,69" origin="0.5,0.5" randomgroupid="1" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_tools.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_tools.xml
index 16eb4e83..cf697716 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_tools.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_tools.xml	
@@ -2,20 +2,20 @@
 <Override>
   <Items>
     <Item name="" identifier="weldingtool" category="Equipment" Tags="smallitem,weldingequipment,tool,mountableweapon" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light">
-      <PreferredContainer primary="engcab" amount="1" spawnprobability="1" notcampaign="true" />
-      <PreferredContainer secondary="supplycab" amount="1" spawnprobability="0.2" notcampaign="true" />
-      <PreferredContainer primary="outpostsupplycab" amount="1" spawnprobability="0.5" />
-      <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
-      <PreferredContainer primary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.05" />
-      <PreferredContainer primary="wreckstoragecab,abandonedstoragecab" amount="1" spawnprobability="0.05" />
-      <PreferredContainer primary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+      <PreferredContainer primary="engcab" amount="2" spawnprobability="1" notcampaign="true" />
+      <PreferredContainer secondary="supplycab" amount="2" spawnprobability="0.4" notcampaign="true" />
+      <PreferredContainer primary="outpostsupplycab" amount="2" spawnprobability="1" />
+      <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
+      <PreferredContainer primary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.1" />
+      <PreferredContainer primary="wreckstoragecab,abandonedstoragecab" amount="2" spawnprobability="0.1" />
+      <PreferredContainer primary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
       <Price baseprice="150">
-        <Price storeidentifier="merchantoutpost" minavailable="3" />
-        <Price storeidentifier="merchantcity" minavailable="2" />
-        <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-        <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="10" />
-        <Price storeidentifier="merchantengineering" minavailable="5" multiplier="0.9" />
+        <Price storeidentifier="merchantoutpost" minavailable="9" />
+        <Price storeidentifier="merchantcity" minavailable="6" />
+        <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="6" />
+        <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="30" />
+        <Price storeidentifier="merchantengineering" minavailable="5" multiplier="2.7" />
       </Price>
       <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,64,64,64" origin="0.5,0.5" />
       <Sprite texture="%ModDir%/Items/overwrite_tools.png" sourcerect="0,3,152,88" depth="0.55" origin="0.5,0.5" />
@@ -33,7 +33,7 @@
       <Body width="150" height="60" density="40" />
       <!-- the character will hold the item 50 pixels in front of him, with his hands at the handle1 and handle2 positions -->
       <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="60,0" handle1="-62,-16" handle2="-10,-6" msg="ItemMsgPickUpSelect" />
-      <RepairTool firedamage="15.0" structurefixamount="3.0" range="150" barrelpos="35,10" particles="weld" repairmultiple="true" repairthroughwalls="false" combatpriority="10" levelwallfixamount="-0.5" targetforce="10">
+      <RepairTool firedamage="15.0" structurefixamount="3.0" range="600" barrelpos="35,10" particles="weld" repairmultiple="true" repairthroughwalls="true" combatpriority="10" levelwallfixamount="-0.5" targetforce="10">
         <!-- the item must contain a welding fuel tank for it to work -->
         <RequiredItems items="weldingtoolfuel,oxygensource" type="Contained" msg="ItemMsgWeldingFuelRequired" />
         <ParticleEmitter particle="weld" particlespersecond="50" copyentityangle="true" />
@@ -85,13 +85,13 @@
       </RepairTool>
       <!-- one welding fuel or oxygen tank can be contained inside the welding tool -->
       <!--
-	<ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="8,-35" containedspritedepth="0.56">
+	<ItemContainer capacity="1" maxstacksize="2" hideitems="false" itempos="8,-35" containedspritedepth="0.56">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
-      <Containable items="weldingtoolfuel,oxygensource" />
+      <Containable items="weldingtoolfuel,oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
 	-->
-      <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="8,-35" containedspritedepth="0.56" containedstateindicatorstyle="tank">
-        <Containable items="weldingtoolfuel,oxygensource" />
+      <ItemContainer capacity="1" maxstacksize="2" hideitems="false" itempos="8,-35" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+        <Containable items="weldingtoolfuel,oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <aitarget sightrange="2000" soundrange="500" fadeouttime="3" />
       <Quality>
@@ -99,17 +99,17 @@
       </Quality>
     </Item>
     <Item name="" identifier="plasmacutter" category="Equipment" Tags="smallitem,cuttingequipment,tool,mountableweapon" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light">
-      <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true" />
-      <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.05" />
-      <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab" amount="1" spawnprobability="0.05" />
+      <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true" />
+      <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.1" />
+      <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab" amount="2" spawnprobability="0.1" />
       <PreferredContainer primary="divingcab" secondary="engcab" />
       <Price baseprice="150">
-        <Price storeidentifier="merchantoutpost" minavailable="3" />
-        <Price storeidentifier="merchantcity" minavailable="2" />
-        <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-        <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="10" />
-        <Price storeidentifier="merchantengineering" minavailable="5" multiplier="0.9" />
+        <Price storeidentifier="merchantoutpost" minavailable="9" />
+        <Price storeidentifier="merchantcity" minavailable="6" />
+        <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="6" />
+        <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="30" />
+        <Price storeidentifier="merchantengineering" minavailable="5" multiplier="2.7" />
       </Price>
       <Deconstruct time="10">
         <Item identifier="steel" />
@@ -124,7 +124,7 @@
       <Sprite texture="%ModDir%/Items/overwrite_tools.png" sourcerect="0,166,159,87" depth="0.55" origin="0.5,0.5" />
       <Body radius="40" width="60" density="40" />
       <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="60,0" handle1="-60,-21" handle2="-21,-20" msg="ItemMsgPickUpSelect" />
-      <RepairTool firedamage="25.0" structurefixamount="-0.25" range="150" barrelpos="45,10" combatpriority="30" repairmultiple="true" repairthroughwalls="false" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-5.0" targetforce="10">
+      <RepairTool firedamage="25.0" structurefixamount="-0.25" range="600" barrelpos="45,10" combatpriority="30" repairmultiple="true" repairthroughwalls="true" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-5.0" targetforce="10">
         <RequiredItems items="oxygensource,weldingtoolfuel" type="Contained" msg="ItemMsgOxygenTankRequired" />
         <StatusEffect type="OnUse" targettype="Contained" targets="oxygentank" Condition="-1.0" />
         <StatusEffect type="OnUse" targettype="Contained" targets="oxygenitetank" Condition="-0.5" />
@@ -168,13 +168,13 @@
         </LightComponent>
       </RepairTool>
       <!--
-	<ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="0,-39" containedspritedepth="0.56">
+	<ItemContainer capacity="1" maxstacksize="2" hideitems="false" itempos="0,-39" containedspritedepth="0.56">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
-      <Containable items="weldingtoolfuel,oxygensource" />
+      <Containable items="weldingtoolfuel,oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
 	-->
-      <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="0,-39" containedspritedepth="0.56" containedstateindicatorstyle="tank">
-        <Containable items="weldingtoolfuel,oxygensource" />
+      <ItemContainer capacity="1" maxstacksize="2" hideitems="false" itempos="0,-39" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+        <Containable items="weldingtoolfuel,oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <aitarget sightrange="2000" soundrange="500" fadeouttime="3" />
       <Quality>
@@ -182,13 +182,13 @@
         <QualityStat stattype="RepairToolDeattachTimeMultiplier" value="0.1" />
       </Quality>
     </Item>
-    <Item name="" identifier="fulguriumfuelrodvolatile" Tags="smallitem,reactorfuel" maxstacksize="8" cargocontaineridentifier="metalcrate" health="400" scale="0.5">
+    <Item name="" identifier="fulguriumfuelrodvolatile" Tags="smallitem,reactorfuel" maxstacksize="16" cargocontaineridentifier="metalcrate" health="400" scale="0.5">
       <Price baseprice="400" soldeverywhere="false">
-        <Price storeidentifier="merchantoutpost" multiplier="1" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" sold="false" />
-        <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.25" sold="false" />
-        <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
+        <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" sold="false" />
+        <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.75" sold="false" />
+        <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
       </Price>
       <Deconstruct time="15">
         <Item identifier="steel" />
@@ -212,7 +212,7 @@
       <InventoryIcon texture="Content/Items/JobGear/TalentGear.png" sourcerect="67,176,62,61" origin="0.5,0.5" />
       <Sprite texture="Content/Items/JobGear/TalentGear.png" depth="0.55" sourcerect="190,60,20,71" origin="0.5,0.5" />
       <Body radius="6" height="55" density="20" />
-      <LightComponent allowingameediting="false" lightcolor="60,200,150,150" canbeselected="false" range="300.0" ison="true" />
+      <LightComponent allowingameediting="false" lightcolor="60,200,150,150" canbeselected="false" range="1200" ison="true" />
       <Holdable handle1="0,0" slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect">
         <!-- Something seems to be wrong with 'and' comparison
 	  <StatusEffect type="Always" target="This,NearbyCharacters" range="250" comparison="and" checkconditionalalways="true">
@@ -236,7 +236,7 @@
         </StatusEffect>
       </Holdable>
       <ItemContainer hideitems="true" capacity="1" itemrotation="90" drawinventory="false" canbeselected="false" SpawnWithId="nucleargunbolt" removecontaineditemsondeconstruct="true" showcontainedstateindicator="false">
-        <Containable items="nucleargunbolt" />
+        <Containable items="nucleargunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
         <StatusEffect type="OnUse" target="This" condition="-20" disabledeltatime="true">
           <SpawnItem identifiers="nucleargunbolt" spawnposition="ThisInventory" />
         </StatusEffect>
@@ -246,21 +246,21 @@
       </Quality>
     </Item>
   </Items>
-  <Item name="" identifier="batterycell" category="Equipment,Electrical" maxstacksize="8" tags="smallitem,loadable,mobilebattery,weldingfuel" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="batterycell" category="Equipment,Electrical" maxstacksize="16" tags="smallitem,loadable,mobilebattery,weldingfuel" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="batterycellrecharger" maxcondition="80" />
-    <PreferredContainer primary="headset,stunbaton,scooter,handheldsonar,sonarbeacon,flashlight,autoinjectorheadset,portablepump,ekutility_arcwelder" spawnprobability="1.0" mincondition="25" />
-    <PreferredContainer secondary="divingcab" minamount="1" maxamount="5" spawnprobability="1" />
-    <PreferredContainer secondary="abandonedsupplycab,abandonedengcab" minamount="1" maxamount="2" spawnprobability="1" />
-    <PreferredContainer secondary="engcab,reactorcab" minamount="0" maxamount="2" spawnprobability="0.5" />
-    <PreferredContainer secondary="outposttrashcan" minamount="0" maxamount="1" spawnprobability="0.15" />
+    <PreferredContainer primary="headset,stunbaton,scooter,handheldsonar,sonarbeacon,flashlight,autoinjectorheadset,portablepump,ekutility_arcwelder" spawnprobability="1" mincondition="25" />
+    <PreferredContainer secondary="divingcab" minamount="2" maxamount="10" spawnprobability="1" />
+    <PreferredContainer secondary="abandonedsupplycab,abandonedengcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="engcab,reactorcab" minamount="0" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="outposttrashcan" minamount="0" maxamount="2" spawnprobability="0.3" />
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <Price baseprice="125" minavailable="7">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantcity" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" minavailable="6" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="6" />
+    <Price baseprice="125" minavailable="21">
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchantcity" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" minavailable="18" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="18" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="zinc" />
@@ -280,17 +280,17 @@
       <QualityStat stattype="Condition" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="fulguriumbatterycell" category="Equipment,Electrical" maxstacksize="8" tags="smallitem,loadable,mobilebattery,weldingfuel" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fulguriumbatterycell" category="Equipment,Electrical" maxstacksize="16" tags="smallitem,loadable,mobilebattery,weldingfuel" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="batterycellrecharger" maxcondition="80" />
     <PreferredContainer secondary="divingcab,engcab,reactorcab" />
-    <Price baseprice="250" minavailable="1">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.25" />
+    <Price baseprice="250" minavailable="3">
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.75" />
       <Price storeidentifier="merchantcity" />
-      <Price storeidentifier="merchantresearch" minavailable="2" />
+      <Price storeidentifier="merchantresearch" minavailable="6" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="zinc" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_tools_legacy.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_tools_legacy.xml
index c767f3ea..e9c58d47 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_tools_legacy.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/1946765892/Items/overwrite_tools_legacy.xml	
@@ -2,8 +2,8 @@
 <Override>
   <Items>
     <Item name="" identifier="weldingtool" category="Equipment" Tags="smallitem,weldingequipment,weldingtool,tool" cargocontaineridentifier="metalcrate" description="" Scale="0.32" impactsoundtag="impact_metal_light">
-      <PreferredContainer primary="engcab" minamount="2" maxamount="4" spawnprobability="1" />
-      <PreferredContainer primary="supplycab" minamount="1" maxamount="1" spawnprobability="0.125" />
+      <PreferredContainer primary="engcab" minamount="4" maxamount="8" spawnprobability="1" />
+      <PreferredContainer primary="supplycab" minamount="2" maxamount="2" spawnprobability="0.25" />
       <Price locationtype="City" buyprice="75" />
       <Price locationtype="Research" buyprice="75" />
       <Price locationtype="Military" buyprice="75" />
@@ -25,7 +25,7 @@
       <Body width="215" height="119" density="40" />
       <!-- the character will hold the item 50 pixels in front of him, with his hands at the handle1 and handle2 positions -->
       <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="50,0" handle1="-85,-35" handle2="0,-27" msg="ItemMsgPickUpSelect" />
-      <RepairTool structurefixamount="0.75" range="150" barrelpos="35,13" particles="weld" repairmultiple="true" repairthroughwalls="false" combatpriority="30">
+      <RepairTool structurefixamount="0.75" range="600" barrelpos="35,13" particles="weld" repairmultiple="true" repairthroughwalls="true" combatpriority="30">
         <!-- structurefixamount="0.18"-->
         <!-- structurefixamount="0.125"-->
         <RequiredItems identifier="weldingfuel,oxygensource" type="Contained" msg="ItemMsgWeldingFuelRequired" />
@@ -78,7 +78,7 @@
       <!-- one welding fuel or oxygen tank can be contained inside the welding tool -->
       <ItemContainer capacity="1" hideitems="false" itempos="18,-32" containedspritedepth="0.56">
         <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
-        <Containable items="weldingfuel,oxygensource" />
+        <Containable items="weldingfuel,oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <!--<Upgrade gameversion="0.9.1000.0">
       <RepairTool>
@@ -88,8 +88,8 @@
       <aitarget sightrange="2000" soundrange="500" fadeouttime="3" />
     </Item>
     <Item name="" identifier="plasmacutter" category="Equipment" Tags="smallitem,cuttingequipment,plasmacutter,tool" cargocontaineridentifier="metalcrate" description="" Scale="0.32" impactsoundtag="impact_metal_light">
-      <PreferredContainer primary="divingcab" minamount="1" maxamount="3" spawnprobability="1" />
-      <PreferredContainer primary="engcab" minamount="1" maxamount="2" spawnprobability="1" />
+      <PreferredContainer primary="divingcab" minamount="2" maxamount="6" spawnprobability="1" />
+      <PreferredContainer primary="engcab" minamount="2" maxamount="4" spawnprobability="1" />
       <Price locationtype="City" buyprice="75" />
       <Price locationtype="Research" buyprice="75" />
       <Price locationtype="Military" buyprice="75" />
@@ -108,7 +108,7 @@
       <Sprite texture="Content/Items/Tools/tools_new.png" sourcerect="0,358,248,136" depth="0.55" origin="0.5,0.5" />
       <Body radius="50" width="180" density="40" />
       <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="50,0" handle1="-85,-25" handle2="-10,-27" msg="ItemMsgPickUpSelect" />
-      <RepairTool structurefixamount="-0.175" range="150" barrelpos="45,10" combatpriority="30" repairthroughholes="true">
+      <RepairTool structurefixamount="-0.175" range="600" barrelpos="45,10" combatpriority="30" repairthroughholes="true">
         <RequiredItems identifier="oxygentank,oxygenitetank,weldingfueltank,incendiumfueltank" type="Contained" msg="ItemMsgOxygenTankRequired" />
         <StatusEffect type="OnUse" targettype="Contained" targets="oxygentank" Condition="-1.0" />
         <StatusEffect type="OnUse" targettype="Contained" targets="oxygenitetank" Condition="-0.5" />
@@ -152,7 +152,7 @@
       </RepairTool>
       <ItemContainer capacity="1" hideitems="false" itempos="20,-30" containedspritedepth="0.56">
         <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,96,120,24" />
-        <Containable items="weldingfuel,oxygensource" />
+        <Containable items="weldingfuel,oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <!--<Upgrade gameversion="0.9.1000.0">
       <RepairTool>
@@ -163,7 +163,7 @@
     </Item>
     <!--<Item name="" identifier="sonarbeacon" category="Equipment" Tags="smallitem,sonar" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="crewcab,supplycab"/>
-    <PreferredContainer primary="divingcab" minamount="1" maxamount="2" spawnprobability="1"/>
+    <PreferredContainer primary="divingcab" minamount="2" maxamount="4" spawnprobability="1"/>
     <Price locationtype="City" buyprice="100" />
     <Price locationtype="Research" buyprice="100" />
     <Price locationtype="Military" buyprice="150" />
@@ -181,7 +181,7 @@
     <Body width="27" height="60" density="12" />
     <Holdable slots="Any,RightHand,LeftHand" holdangle="30" handle1="-10,0" msg="ItemMsgPickUpSelect" />
     <AiTarget soundrange="10000" sonarlabel="entityname.sonarbeacon" />
-    <LightComponent LightColor="0.0,1.0,0.0,1.0" range="50" powerconsumption="10" blinkfrequency="2" IsOn="false" canbeselected="false">
+    <LightComponent LightColor="0.0,1.0,0.0,1.0" range="200" powerconsumption="10" blinkfrequency="2" IsOn="false" canbeselected="false">
       <StatusEffect type="OnActive" targettype="Contained" Condition="-0.1">
         <RequiredItem items="batterycell" type="Contained" />
       </StatusEffect>
@@ -204,7 +204,7 @@
     <!--</CustomInterface>
     <ItemContainer capacity="1" hideitems="true">
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,184,120,32" />
-      <Containable items="mobilebattery">
+      <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
       </Containable>
     </ItemContainer>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2085783214/Items/huskmoditems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2085783214/Items/huskmoditems.xml
index 7add8fcb..36b5fc9b 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2085783214/Items/huskmoditems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2085783214/Items/huskmoditems.xml	
@@ -4,12 +4,12 @@
     <PreferredContainer primary="toxcontainer" />
     <PreferredContainer primary="locker" />
     <Price baseprice="1100" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmedical" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmedical" multiplier="3.6" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="huskeggs" copycondition="true" mincondition="0.1" />
@@ -73,12 +73,12 @@
     <PreferredContainer primary="toxcontainer" />
     <PreferredContainer primary="locker" />
     <Price baseprice="1200" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.0" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.0" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.0" sold="false" />
-      <Price storeidentifier="merchantmedical" multiplier="1.1" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="4.2" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmedical" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="huskeggs" copycondition="true" mincondition="0.1" />
@@ -87,22 +87,22 @@
     <Sprite texture="%ModDir:Improved Husks%/Items/huskmutantembryo.png" sourcerect="0,0,40,76" depth="0.6" origin="0.5,0.5" />
     <Body width="35" height="70" density="0" />
     <Holdable slots="RightHand,LeftHand,Any" holdpos="0,-70" handle1="0,20" handle2="0,0" />
-    <LightComponent range="150" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="155,155,0,100" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="155,155,0,100" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="%ModDir:Improved Husks%/Items/huskmutantembryo.png" sourcerect="0,0,40,76" depth="0.1" origin="0.5,0.5" alpha="0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="calyxinjector" category="Equipment" Tags="smallitem" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" scale="1">
     <PreferredContainer primary="locker,weaponcontainer,medcab" />
-    <PreferredContainer secondary="wrecksecarmcab" minamount="0" maxamount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="wreckarmcab,wreckstoragecab" minamount="0" maxamount="1" spawnprobability="0.2" />
+    <PreferredContainer secondary="wrecksecarmcab" minamount="0" maxamount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="wreckarmcab,wreckstoragecab" minamount="0" maxamount="2" spawnprobability="0.4" />
     <InventoryIcon texture="%ModDir:Improved Husks%/Items/calyxinjectorinventory.png" sourcerect="0,0,64,64" origin="0.49928394,0.5012731" />
     <Price baseprice="2000" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.0" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.0" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.5" sold="true" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.0" sold="false" />
-      <Price storeidentifier="merchantmedical" multiplier="1.0" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="4.5" sold="true" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmedical" multiplier="3" sold="false" />
     </Price>
     <Sprite texture="%ModDir:Improved Husks%/Items/calyxinjector.png" sourcerect="0,13,76,20" depth="0.55" origin="0.5,0.5" />
     <Body width="40" height="17" density="50" />
@@ -132,7 +132,7 @@
         <Remove />
       </StatusEffect>
     </MeleeWeapon>
-    <LightComponent range="150" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="155,155,0,100" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="155,155,0,100" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
   </Item>
   <Item name="" identifier="calyxinjectorbooster" category="Equipment" Tags="smallitem,chem,medical" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" useinhealthinterface="true" scale="1">
     <PreferredContainer primary="locker,weaponcontainer,medcab" />
@@ -157,7 +157,7 @@
         <Remove />
       </StatusEffect>
     </MeleeWeapon>
-    <LightComponent range="150" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="100,200,0,100" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="100,200,0,100" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
   </Item>
   <Item name="" identifier="unstablehuskstinger" category="Equipment" Tags="smallitem" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" scale="0.7">
     <PreferredContainer primary="locker,weaponcontainer" />
@@ -206,7 +206,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="155,255,0,30" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="155,255,0,30" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Characters/Spineling/Spineling.png" sourcerect="0,230,180,23" origin="0.5,0.6" alpha="0.5" />
     </LightComponent>
   </Item>
@@ -251,7 +251,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent range="150" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="255,255,0,60" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="255,255,0,60" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="%ModDir:Improved Husks%/Characters/Endwormhusk/Endwormhusk.png" sourcerect="163,2386,704,414" depth="0" origin="0.5,0.5" alpha="0.5" />
     </LightComponent>
   </Item>
@@ -327,7 +327,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent range="50" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="255,255,0,30" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="255,255,0,30" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="%ModDir:Improved Husks%/Characters/Mudraptor_hatchlinghusk/Mudraptorhatchlinghusk.png" sourcerect="625,214,147,187" depth="0.1" origin="0.5,0.5" alpha="0.5" />
     </LightComponent>
   </Item>
@@ -357,7 +357,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent range="50" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="255,255,0,30" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="255,255,0,30" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="%ModDir:Improved Husks%/Characters/Mudraptor_hatchlinghusk/Mudraptorhatchlinghusk.png" sourcerect="625,214,147,187" depth="0.1" origin="0.5,0.5" alpha="0.5" />
     </LightComponent>
   </Item>
@@ -398,8 +398,8 @@
         <Sound file="Content/Items/Weapons/ShotgunLoad3.ogg" type="OnUse" range="3000" />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" itempos="27,10" iteminterval="0,-4" hideitems="true" containedstateindicatorstyle="bullet">
-      <Containable items="shotgunammo" />
+    <ItemContainer capacity="1" maxstacksize="2" itempos="27,10" iteminterval="0,-4" hideitems="true" containedstateindicatorstyle="bullet">
+      <Containable items="shotgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" hideinmenus="true" identifier="shamblersmg" nameidentifier="" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,weapon,gun,gunsmith" Scale="0.5" impactsoundtag="impact_metal_light">
@@ -430,8 +430,8 @@
         <Remove />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="bullet">
-      <Containable items="smground" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="bullet">
+      <Containable items="smground,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" hideinmenus="true" identifier="shamblerrevolver" nameidentifier="" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,weapon,gun,pistolitem,gunsmith" Scale="0.5" impactsoundtag="impact_metal_light">
@@ -459,8 +459,8 @@
         <Remove />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="bullet">
-      <Containable items="revolverammo" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="bullet">
+      <Containable items="revolverammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" hideinmenus="true" identifier="shamblerharpoongun" nameidentifier="" category="Equipment" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gunsmith" Scale="0.5" impactsoundtag="impact_metal_light">
@@ -486,12 +486,12 @@
         <Remove />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer itempos="27,10" iteminterval="0,-4" hideitems="false" capacity="1" maxstacksize="1" containedstateindicatorstyle="spear" containedspritedepths="0.551,0.552,0.553,0.554,0.555,0.556">
-      <Containable items="harpoonammo" />
+    <ItemContainer itempos="27,10" iteminterval="0,-4" hideitems="false" capacity="1" maxstacksize="2" containedstateindicatorstyle="spear" containedspritedepths="0.551,0.552,0.553,0.554,0.555,0.556">
+      <Containable items="harpoonammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <!-- A copy of the spear that doesn't have a rope and that also disappears after a bit so that you don't get to have an infinite collection of spears by getting shot repeatedly :) -->
-  <Item name="" hideinmenus="true" identifier="shamblerspear" nameidentifier="" category="Equipment" maxstacksize="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" hideinmenus="true" identifier="shamblerspear" nameidentifier="" category="Equipment" maxstacksize="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,968,55,55" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Weapons/weapons_new.png" sourcerect="85,368,168,11" depth="0.55" origin="0.5,0.5" />
     <Body width="160" height="10" density="20" />
@@ -1061,14 +1061,14 @@
   <Item name="" identifier="mediumcrawleregg" nameidentifier="crawleregg" hideinmenus="true" tags="smallitem,ignorebyai" health="40" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" spritecolor="200,205,152,255" scale="0.3" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="1500" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantmedical" multiplier="0.85" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantmedical" multiplier="2.55" sold="false" />
     </Price>
-    <PreferredContainer primary="locker,toxcontainer" spawnprobability="0.01" />
+    <PreferredContainer primary="locker,toxcontainer" spawnprobability="0.02" />
     <Sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.18" sourcerect="8,280,118,145" origin="0.5,0.5" />
     <Deconstruct time="10">
       <Item identifier="alienblood" />
@@ -1088,8 +1088,8 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false">
-      <Containable items="antibloodloss1">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" showcontainedstateindicator="false">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <!-- increase scale -->
         <StatusEffect type="OnContaining" target="This" Scale="0.006" />
         <StatusEffect type="OnContaining" target="Contained" Condition="-1" />
@@ -1107,14 +1107,14 @@
   <Item name="" identifier="mediumthresheregg" nameidentifier="tigerthresheregg" hideinmenus="true" tags="smallitem,ignorebyai" health="60" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" spritecolor="165,200,200,255" scale="0.3" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="1800" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantmedical" multiplier="0.85" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantmedical" multiplier="2.55" sold="false" />
     </Price>
-    <PreferredContainer primary="locker,toxcontainer" spawnprobability="0.01" />
+    <PreferredContainer primary="locker,toxcontainer" spawnprobability="0.02" />
     <Sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.18" sourcerect="165,280,114,145" origin="0.5,0.5" />
     <Deconstruct time="10">
       <Item identifier="alienblood" />
@@ -1134,8 +1134,8 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false">
-      <Containable items="antibloodloss1">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" showcontainedstateindicator="false">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <!-- increase scale -->
         <StatusEffect type="OnContaining" target="This" Scale="0.003" />
         <StatusEffect type="OnContaining" target="Contained" Condition="-1" />
@@ -1153,14 +1153,14 @@
   <Item name="" identifier="mediummodmudraptoregg" nameidentifier="mudraptoregg" hideinmenus="true" tags="smallitem,ignorebyai,mudraptoregg" health="50" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="1600" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.85" sold="false" />
-      <Price storeidentifier="merchantmedical" multiplier="0.85" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.55" sold="false" />
+      <Price storeidentifier="merchantmedical" multiplier="2.55" sold="false" />
     </Price>
-    <PreferredContainer primary="locker,toxcontainer" spawnprobability="0.01" />
+    <PreferredContainer primary="locker,toxcontainer" spawnprobability="0.02" />
     <Sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.18" sourcerect="235,156,67,82" origin="0.5,0.5" />
     <Deconstruct time="10">
       <Item identifier="alienblood" />
@@ -1181,8 +1181,8 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
-      <Containable items="antibloodloss1">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+      <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <!-- increase scale -->
         <StatusEffect type="OnContaining" target="This" Scale="0.005" />
         <StatusEffect type="OnContaining" target="Contained" Condition="-1" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2085783214/Items/medical.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2085783214/Items/medical.xml
index 4f162fb3..763f63f8 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2085783214/Items/medical.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2085783214/Items/medical.xml	
@@ -4,20 +4,20 @@
     <!-- Name: Calyxanide -->
     <!-- An antiparasitic drug used in the treatment of husk parasite infections. Will cure the infection regardless of its progress, unless it is at 100 strength. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Calyxanide name="" identifier="calyxanide" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <Calyxanide name="" identifier="calyxanide" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.03" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.06" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
       <Price baseprice="510">
-        <Price storeidentifier="merchantoutpost" minavailable="5" />
-        <Price storeidentifier="merchantcity" minavailable="5" />
-        <Price storeidentifier="merchantresearch" minavailable="7" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="5" />
-        <Price storeidentifier="merchantmine" multiplier="1.1" minavailable="5" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="7" />
-        <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="5">
+        <Price storeidentifier="merchantoutpost" minavailable="15" />
+        <Price storeidentifier="merchantcity" minavailable="15" />
+        <Price storeidentifier="merchantresearch" minavailable="21" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="15" />
+        <Price storeidentifier="merchantmine" multiplier="3.3" minavailable="15" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="21" />
+        <Price storeidentifier="merchanthusk" minavailable="9" maxavailable="5">
           <Reputation faction="huskcult" min="30" />
         </Price>
       </Price>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2183524355/UpgradeModules.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2183524355/UpgradeModules.xml
index 2c975ee1..e45921c6 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2183524355/UpgradeModules.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2183524355/UpgradeModules.xml	
@@ -2,119 +2,119 @@
 <Override>
   <UpgradeModules>
     <!-- WALLS -->
-    <UpgradeModule identifier="increasewallhealth" maxlevel="15" categories="walls" increaseontooltip="20">
+    <UpgradeModule identifier="increasewallhealth" maxlevel="15" categories="walls" increaseontooltip="40">
       <Price baseprice="2500" increaselow="+10%" increasehigh="+10%" />
-      <Structure maxhealth="+20%" crushdepth="+14%" />
+      <Structure maxhealth="+40%" crushdepth="+14%" />
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="640,640,128,128" origin="0.5,0.5" />
     </UpgradeModule>
     <!-- FABRICATOR -->
-    <UpgradeModule identifier="increasefabricationspeed" maxlevel="4" categories="fabricators" increaseontooltip="30">
+    <UpgradeModule identifier="increasefabricationspeed" maxlevel="4" categories="fabricators" increaseontooltip="60">
       <Price baseprice="2000" increaselow="+25%" increasehigh="+25%" />
-      <Fabricator fabricationspeed="+30%" />
+      <Fabricator fabricationspeed="+60%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,768,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="0,768,128,128" origin="0.5,0.5" />
     </UpgradeModule>
-    <UpgradeModule identifier="decreasefabricationskillrequirement" maxlevel="5" categories="fabricators" increaseontooltip="15">
+    <UpgradeModule identifier="decreasefabricationskillrequirement" maxlevel="5" categories="fabricators" increaseontooltip="30">
       <Price baseprice="2000" increaselow="+25%" increasehigh="+25%" />
-      <Fabricator skillrequirementmultiplier="-15%" />
+      <Fabricator skillrequirementmultiplier="-30%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="128,448,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="128,768,128,128" origin="0.5,0.5" />
     </UpgradeModule>
     <!-- DECONSTRUCTOR -->
-    <UpgradeModule identifier="decreasedeconstructiontime" maxlevel="4" categories="deconstructors" increaseontooltip="20">
+    <UpgradeModule identifier="decreasedeconstructiontime" maxlevel="4" categories="deconstructors" increaseontooltip="40">
       <Price baseprice="1500" increaselow="+20%" increasehigh="+20%" />
-      <Deconstructor deconstructionspeed="+20%" />
+      <Deconstructor deconstructionspeed="+40%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,192,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="768,640,128,128" origin="0.5,0.5" />
     </UpgradeModule>
     <!-- TURRET -->
-    <UpgradeModule identifier="turretdecreasepowerconsumption" maxlevel="5" categories="weapons" increaseontooltip="10">
+    <UpgradeModule identifier="turretdecreasepowerconsumption" maxlevel="5" categories="weapons" increaseontooltip="20">
       <Price baseprice="1500" increaselow="+20%" increasehigh="+20%" />
       <Turret powerconsumption="-10%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,384,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,896,128,128" origin="0.5,0.5" />
     </UpgradeModule>
-    <UpgradeModule identifier="turretincreaserotationlowskill" maxlevel="5" categories="weapons" increaseontooltip="15">
+    <UpgradeModule identifier="turretincreaserotationlowskill" maxlevel="5" categories="weapons" increaseontooltip="30">
       <Price baseprice="2000" increaselow="+20%" increasehigh="+20%" />
-      <Turret rotationspeedlowskill="+15%" />
+      <Turret rotationspeedlowskill="+30%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,384,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="256,768,128,128" origin="0.5,0.5" />
     </UpgradeModule>
-    <UpgradeModule identifier="turretincreaseoffsetonselected" maxlevel="5" categories="weapons" increaseontooltip="7">
+    <UpgradeModule identifier="turretincreaseoffsetonselected" maxlevel="5" categories="weapons" increaseontooltip="14">
       <Price baseprice="2500" increaselow="+20%" increasehigh="+20%" />
-      <Item offsetonselectedmultiplier="+7%" />
-      <LightComponent range="+16%" />
+      <Item offsetonselectedmultiplier="+14%" />
+      <LightComponent range="+32%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="768,320,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="384,768,128,128" origin="0.5,0.5" />
     </UpgradeModule>
     <!-- REACTOR -->
-    <UpgradeModule identifier="increasereactoroutput" maxlevel="5" categories="reactors" increaseontooltip="10">
+    <UpgradeModule identifier="increasereactoroutput" maxlevel="5" categories="reactors" increaseontooltip="20">
       <Price baseprice="2500" increaselow="+20%" increasehigh="+20%" />
-      <Reactor maxpoweroutput="+10%" />
+      <Reactor maxpoweroutput="+20%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="576,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,640,128,128" origin="0.5,0.5" />
     </UpgradeModule>
-    <UpgradeModule identifier="decreasefuelconsumption" maxlevel="4" categories="reactors" increaseontooltip="-20">
+    <UpgradeModule identifier="decreasefuelconsumption" maxlevel="4" categories="reactors" increaseontooltip="-40">
       <Price baseprice="2000" increaselow="+25%" increasehigh="+25%" />
       <Reactor fuelconsumptionrate="-20%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="384,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="256,640,128,128" origin="0.5,0.5" />
     </UpgradeModule>
-    <UpgradeModule identifier="increasemeltdowndelay" maxlevel="5" categories="reactors" increaseontooltip="20">
+    <UpgradeModule identifier="increasemeltdowndelay" maxlevel="5" categories="reactors" increaseontooltip="40">
       <Price baseprice="2000" increaselow="+10%" increasehigh="+10%" />
-      <Reactor meltdowndelay="+20%" fireDelay="+20%" />
+      <Reactor meltdowndelay="+40%" fireDelay="+20%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="640,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="384,640,128,128" origin="0.5,0.5" />
     </UpgradeModule>
     <!-- PUMP -->
-    <UpgradeModule identifier="increasemaxpumpflow" maxlevel="5" categories="pumps" increaseontooltip="20">
+    <UpgradeModule identifier="increasemaxpumpflow" maxlevel="5" categories="pumps" increaseontooltip="40">
       <Price baseprice="2500" increaselow="+25%" increasehigh="+25%" />
-      <Pump maxflow="+20%" />
+      <Pump maxflow="+40%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="896,256,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="896,768,128,128" origin="0.5,0.5" />
     </UpgradeModule>
     <!-- ENGINE -->
-    <UpgradeModule identifier="increaseenginemaxforce" maxlevel="10" categories="engines" increaseontooltip="12">
+    <UpgradeModule identifier="increaseenginemaxforce" maxlevel="10" categories="engines" increaseontooltip="24">
       <Price baseprice="2500" increaselow="+20%" increasehigh="+20%" />
-      <Engine maxforce="+15%" />
+      <Engine maxforce="+30%" />
       <!-- Venture Moment -->
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="256,128,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="896,640,128,128" origin="0.5,0.5" />
     </UpgradeModule>
     <!-- BATTERIES -->
-    <UpgradeModule identifier="increasebatterycapacity" maxlevel="10" categories="batteries" increaseontooltip="20">
+    <UpgradeModule identifier="increasebatterycapacity" maxlevel="10" categories="batteries" increaseontooltip="40">
       <Price baseprice="2500" increaselow="+10%" increasehigh="+10%" />
-      <PowerContainer capacity="+20%" />
+      <PowerContainer capacity="+40%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="832,0,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,768,128,128" origin="0.5,0.5" />
     </UpgradeModule>
-    <UpgradeModule identifier="increasesupercapacitorcapacity" maxlevel="5" categories="supercapacitors" increaseontooltip="20">
+    <UpgradeModule identifier="increasesupercapacitorcapacity" maxlevel="5" categories="supercapacitors" increaseontooltip="40">
       <Price baseprice="2500" increaselow="+20%" increasehigh="+20%" />
-      <PowerContainer capacity="+20%" />
+      <PowerContainer capacity="+40%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="832,0,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,768,128,128" origin="0.5,0.5" />
     </UpgradeModule>
-    <UpgradeModule identifier="increasebatteryrechargespeed" maxlevel="5" categories="supercapacitors,batteries" increaseontooltip="20">
+    <UpgradeModule identifier="increasebatteryrechargespeed" maxlevel="5" categories="supercapacitors,batteries" increaseontooltip="40">
       <Price baseprice="2000" increaselow="+25%" increasehigh="+25%" />
-      <PowerContainer maxrechargespeed="+20%" />
+      <PowerContainer maxrechargespeed="+40%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="640,768,128,128" origin="0.5,0.5" />
     </UpgradeModule>
     <!-- JUNCTION BOXES -->
-    <UpgradeModule identifier="decreasefireprobability" maxlevel="5" categories="junctionboxes" increaseontooltip="18">
+    <UpgradeModule identifier="decreasefireprobability" maxlevel="5" categories="junctionboxes" increaseontooltip="36">
       <Price baseprice="1000" increaselow="+25%" increasehigh="+25%" />
       <PowerTransfer fireprobability="-18%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="63,320,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="128,640,128,128" origin="0.5,0.5" />
     </UpgradeModule>
-    <UpgradeModule identifier="increaseovervoltageresistance" maxlevel="10" categories="junctionboxes" increaseontooltip="20">
+    <UpgradeModule identifier="increaseovervoltageresistance" maxlevel="10" categories="junctionboxes" increaseontooltip="40">
       <Price baseprice="2000" increaselow="+10%" increasehigh="+10%" />
-      <PowerTransfer overloadvoltage="+20%" />
+      <PowerTransfer overloadvoltage="+40%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="128,128,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="0,640,128,128" origin="0.5,0.5" />
     </UpgradeModule>
     <!-- POWER CONSUMPTION -->
-    <UpgradeModule identifier="decreasepowerconsumption" maxlevel="10" categories="fabricators,medicalfabricator,pumps,oxygengenerators,deconstructors,engines" increaseontooltip="5">
+    <UpgradeModule identifier="decreasepowerconsumption" maxlevel="10" categories="fabricators,medicalfabricator,pumps,oxygengenerators,deconstructors,engines" increaseontooltip="10">
       <Price baseprice="1000" increaselow="+25%" increasehigh="+25%" />
       <Engine powerconsumption="-5%" />
       <Fabricator powerconsumption="-6%" />
@@ -125,29 +125,29 @@
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,896,128,128" origin="0.5,0.5" />
     </UpgradeModule>
     <!-- MACHINE REPAIRS -->
-    <UpgradeModule identifier="increasedeteriorationdelay" maxlevel="10" categories="electricaldevices,mechanicaldevices" increaseontooltip="15">
+    <UpgradeModule identifier="increasedeteriorationdelay" maxlevel="10" categories="electricaldevices,mechanicaldevices" increaseontooltip="30">
       <Price baseprice="2000" increaselow="+10%" increasehigh="+10%" />
       <Repairable mindeteriorationdelay="+15%" maxdeteriorationdelay="+15%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,0,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="0,896,128,128" origin="0.5,0.5" />
     </UpgradeModule>
-    <UpgradeModule identifier="decreasedeteriorationspeed" maxlevel="10" categories="electricaldevices,mechanicaldevices" increaseontooltip="8">
+    <UpgradeModule identifier="decreasedeteriorationspeed" maxlevel="10" categories="electricaldevices,mechanicaldevices" increaseontooltip="16">
       <Price baseprice="2500" increaselow="+10%" increasehigh="+10%" />
       <Repairable deteriorationspeed="-8%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,0,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="128,896,128,128" origin="0.5,0.5" />
     </UpgradeModule>
-    <UpgradeModule identifier="decreaselowskillfixduration" maxlevel="5" categories="electricaldevices,mechanicaldevices" increaseontooltip="12">
+    <UpgradeModule identifier="decreaselowskillfixduration" maxlevel="5" categories="electricaldevices,mechanicaldevices" increaseontooltip="24">
       <Price baseprice="1000" increaselow="+25%" increasehigh="+25%" />
-      <Repairable fixdurationlowskill="-12%" fixdurationhighskill="-12%" />
+      <Repairable fixdurationlowskill="-24%" fixdurationhighskill="-12%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="256,896,128,128" origin="0.5,0.5" />
     </UpgradeModule>
-    <UpgradeModule identifier="decreaserequiredskilllevel" maxlevel="5" categories="electricaldevices,mechanicaldevices" increaseontooltip="12">
+    <UpgradeModule identifier="decreaserequiredskilllevel" maxlevel="5" categories="electricaldevices,mechanicaldevices" increaseontooltip="24">
       <Price baseprice="1500" increaselow="+25%" increasehigh="+25%" />
-      <Repairable skillrequirementmultiplier="-12%" />
+      <Repairable skillrequirementmultiplier="-24%" />
       <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="576,0,64,64" depth="0.75" origin="0.5,0.5"/>-->
       <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="384,896,128,128" origin="0.5,0.5" />
     </UpgradeModule>/
-	<!-- MONITORS --><UpgradeModule identifier="enablemineralscanner" maxlevel="1" categories="monitors" increaseontooltip="100"><Price baseprice="2000" increaselow="+100%" increasehigh="+200%" /><Sonar hasmineralscanner="True" /><!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="576,0,64,64" depth="0.75" origin="0.5,0.5"/>--><Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="896,896,128,128" origin="0.5,0.5" /></UpgradeModule></UpgradeModules>
+	<!-- MONITORS --><UpgradeModule identifier="enablemineralscanner" maxlevel="1" categories="monitors" increaseontooltip="200"><Price baseprice="2000" increaselow="+100%" increasehigh="+200%" /><Sonar hasmineralscanner="True" /><!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="576,0,64,64" depth="0.75" origin="0.5,0.5"/>--><Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="896,896,128,128" origin="0.5,0.5" /></UpgradeModule></UpgradeModules>
 </Override>
\ No newline at end of file
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2184257427/specialitems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2184257427/specialitems.xml
index 7e96de31..05a78d7b 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2184257427/specialitems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2184257427/specialitems.xml	
@@ -8,8 +8,8 @@
         <Use />
       </Statuseffect>
     </Controller>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="1" itempos="40,-40" containedspritedepth="0.831" canbeselected="True" autointeractwithcontained="true" msg="">
-      <Containable items="smallitem,mediumitem,bigitem,crate" />
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="1" itempos="40,-40" containedspritedepth="0.831" canbeselected="True" autointeractwithcontained="true" msg="">
+      <Containable items="smallitem,mediumitem,bigitem,crate,ammobox,deepdiving,largeitem" />
       <!-- makes itself invisible + you can't see inside inventory on startup. Needed to make this useable in subeditor -->
       <Statuseffect type="Always" target="This" oneshot="true" spritecolor="0,0,0,0" drawinventory="false" setvalue="True" />
       <!-- makes the item delete itself IF ACTUALLY EMPTY, not just when interacting with it. Needed to prevent items from being deleted if inventory is full -->
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2184257427/wreckeditems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2184257427/wreckeditems.xml
index 80d55dcb..b81cafbf 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2184257427/wreckeditems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2184257427/wreckeditems.xml	
@@ -65,12 +65,12 @@
       <Sprite texture="Content/Items/Shipwrecks/MiscWrecked.png" sourcerect="1745,1025,113,209" depth="0.94" origin="0.5,0.5" scale="2" />
       <trigger x="0" y="0" width="114" height="31" />
       <trigger x="0" y="-179" width="114" height="31" />
-      <LightComponent range="10.0" lightcolor="255,0,0,0" scale="1" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,0,0,0" scale="1" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
         <Upgrade gameversion="0.9.9000.0" lightcolor="255,0,0,0" />
         <IsActive targetitemcomponent="DockingPort" docked="false" />
         <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="0,0,113,209" depth="0.9" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
-      <LightComponent range="10.0" lightcolor="0,255,0,0" scale="1" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="0,255,0,0" scale="1" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
         <Upgrade gameversion="0.9.9000.0" lightcolor="0,255,0,0" />
         <IsActive targetitemcomponent="DockingPort" docked="true" />
         <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="0,0,113,209" depth="0.9" origin="0.5,0.5" alpha="1.0" />
@@ -81,12 +81,12 @@
       <Sprite texture="Content/Items/Shipwrecks/MiscWrecked.png" sourcerect="1595,1402,129,115" depth="0.94" origin="0.5,0.5" scale="2" />
       <trigger x="0" y="0" width="32" height="116" />
       <trigger x="98" y="0" width="32" height="116" />
-      <LightComponent range="10.0" lightcolor="255,0,0,0" scale="1" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,0,0,0" scale="1" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
         <Upgrade gameversion="0.9.9000.0" lightcolor="255,0,0,0" />
         <IsActive targetitemcomponent="DockingPort" docked="false" />
         <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="126,2,128,112" depth="0.9" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
-      <LightComponent range="10.0" lightcolor="0,255,0,0" scale="1" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="0,255,0,0" scale="1" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
         <Upgrade gameversion="0.9.9000.0" lightcolor="0,255,0,0" />
         <IsActive targetitemcomponent="DockingPort" docked="true" />
         <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="126,2,128,112" depth="0.9" origin="0.5,0.5" alpha="1.0" />
@@ -229,9 +229,9 @@
     <Item name="" identifier="railgunshellrackwrecked" nameidentifier="railgunshellrack" variantof="railgunshellrack" tags="container,wreckrailgunammocontainer" category="Wrecked">
       <Upgrade gameversion="0.20.4.0" scale="0.5" condition="0" />
       <Sprite texture="Content/Items/Shipwrecks/MiscWrecked.png" sourcerect="936,1869,182,176" />
-      <ItemContainer hideitems="false" drawinventory="true" capacity="4" slotsperrow="4" itempos="42,-60" iteminterval="32,0" itemrotation="90" containedspritedepth="0.845" canbeselected="true" msg="ItemMsgInteractSelect">
+      <ItemContainer hideitems="false" drawinventory="true" capacity="9" slotsperrow="3" itempos="42,-60" iteminterval="32,0" itemrotation="90" containedspritedepth="0.845" canbeselected="true" msg="ItemMsgInteractSelect">
         <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-        <Containable items="railgunammo" />
+        <Containable items="railgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
     <!-- added brokensprite to big railgun loader, updated wrecked variant -->
@@ -240,9 +240,9 @@
       <SwappableItem canbebought="false" origin="149,276" />
       <Sprite texture="Content/Items/Weapons/LegacyLoaders.png" depth="0.8" sourcerect="0,0,298,276" origin="0.5,0.5" />
       <BrokenSprite texture="Content/Map/Outposts/AbandonedOutpost/RustedDecalItem.png" sourcerect="463,269,289,286" offset="0,0" depth="0.8" origin="0.5,0.5" scale="true" fadein="true" maxcondition="80" />
-      <ItemContainer hideitems="false" drawinventory="true" capacity="5" slotsperrow="6" itempos="53,-140" iteminterval="48,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect">
+      <ItemContainer hideitems="false" drawinventory="true" capacity="11" slotsperrow="4" itempos="53,-140" iteminterval="48,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect">
         <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-        <Containable items="railgunammo" />
+        <Containable items="railgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="20" mindeteriorationdelay="5" maxdeteriorationdelay="15" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
         <StatusEffect type="InWater" target="This" condition="-0.25" />
@@ -277,7 +277,7 @@
       <BrokenSprite texture="Content/Items/Shipwrecks/TurretsWrecked.png" sourcerect="1030,265,84,236" depth="0.8" origin="0.5,0.5" scale="true" fadein="true" maxcondition="80" />
       <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="42,-112" iteminterval="0,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect">
         <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-        <Containable items="railgunammo" />
+        <Containable items="railgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="20" mindeteriorationdelay="5" maxdeteriorationdelay="15" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
         <StatusEffect type="InWater" target="This" condition="-0.25" />
@@ -301,7 +301,7 @@
       <BrokenSprite texture="Content/Items/Shipwrecks/TurretsWrecked.png" sourcerect="462,420,241,86" depth="0.8" origin="0.5,0.5" scale="true" fadein="true" maxcondition="80" />
       <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="112,-42" iteminterval="0,0" itemrotation="180" canbeselected="true" msg="ItemMsgInteractSelect">
         <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-        <Containable items="railgunammo" />
+        <Containable items="railgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="20" mindeteriorationdelay="5" maxdeteriorationdelay="15" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
         <StatusEffect type="InWater" target="This" condition="-0.25" />
@@ -323,11 +323,11 @@
       <Sprite texture="Content/Items/Labels/labels.png" depth="0.85" sourcerect="0,0,126,48" />
       <Price baseprice="200">
         <Price storeidentifier="merchantoutpost" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
-        <Price storeidentifier="merchantresearch" multiplier="1.25" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
+        <Price storeidentifier="merchantresearch" multiplier="3.75" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantengineering" multiplier="0.9" />
+        <Price storeidentifier="merchantengineering" multiplier="2.7" />
       </Price>
       <PreferredContainer primary="reactorcab,engcab" />
       <Deconstruct time="10">
@@ -346,7 +346,7 @@
       <ItemLabel scrollable="true" padding="10,5,10,12" textcolor="1,1,1,1">
         <Upgrade gameversion="0.12.0.0" padding="10,5,10,12" />
       </ItemLabel>
-      <LightComponent range="0.0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false">
+      <LightComponent range="0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false">
         <Upgrade gameversion="0.17.15.0" range="0" />
         <sprite texture="Content/Items/Labels/labels.png" sourcerect="0,48,126,48" depth="0.025" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Command/ekgunnery_command.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Command/ekgunnery_command.xml
index 8d69be51..174a2e6d 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Command/ekgunnery_command.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Command/ekgunnery_command.xml	
@@ -4,7 +4,7 @@
     <UpgradePreviewSprite scale="2.5" texture="Content/UI/WeaponUI.png" sourcerect="128,960,64,64" origin="0.5,0.45" />
     <Sprite texture="%ModDir%/Items/Command/ekgunnery_periscopes.png" depth="0.8" sourcerect="0,0,160,208" origin="0.6,0.5" />
     <aitarget sightrange="200" soundrange="10000" staticsight="true" fadeouttime="5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Command/ekgunnery_periscopes.png" depth="0.025" sourcerect="160,0,64,128" origin="0.75,0.715" alpha="1.0" />
     </LightComponent>
     <Controller UserPos="-35.0, -50.0" direction="Right" canbeselected="true" msg="ItemMsgInteractSelect">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Containers/ekgunnery_containers.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Containers/ekgunnery_containers.xml
index 0a90c01c..556a2417 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Containers/ekgunnery_containers.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Containers/ekgunnery_containers.xml	
@@ -2,33 +2,33 @@
 <Items>
   <Item name="" identifier="ekgunnery_magazinestoragesmall" tags="container,ekgunnery_mediumammo_container,railgunammocontainer,coilgunammocontainer,ammocontainer" category="Legacy" pickdistance="150" scale="0.5" waterproof="true" fireproof="true" explosiondamagemultiplier="0.1" spritecolor="200,200,200,255">
     <Sprite texture="%ModDir%/Items/Containers/ekgunnery_containers.png" depth="0.84" sourcerect="0,0,208,208" origin="0.5,0.5" />
-    <ItemContainer autofill="False" capacity="9" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer autofill="False" capacity="20" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.15,0.35" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem,ekgunnery_mediumammo,railgunammo,railgunshell,coilgunammo,coilgunammobox,chaingunammo,pulselaserammo,ammobox,depthchargeammo" />
+      <Containable items="smallitem,mediumitem,ekgunnery_mediumammo,railgunammo,railgunshell,coilgunammo,coilgunammobox,chaingunammo,pulselaserammo,ammobox,depthchargeammo,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekgunnery_magazinestoragemedium" tags="container,ekgunnery_mediumammo_container,railgunammocontainer,coilgunammocontainer,ammocontainer" category="Legacy" pickdistance="150" scale="0.5" waterproof="true" fireproof="true" explosiondamagemultiplier="0.1" spritecolor="200,200,200,255">
     <Sprite texture="%ModDir%/Items/Containers/ekgunnery_containers.png" depth="0.84" sourcerect="208,0,320,208" origin="0.5,0.5" />
-    <ItemContainer autofill="False" capacity="18" slotsperrow="6" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer autofill="False" capacity="40" slotsperrow="7" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.35" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem,ekgunnery_mediumammo,railgunammo,railgunshell,coilgunammo,coilgunammobox,chaingunammo,pulselaserammo,ammobox,depthchargeammo" />
+      <Containable items="smallitem,mediumitem,ekgunnery_mediumammo,railgunammo,railgunshell,coilgunammo,coilgunammobox,chaingunammo,pulselaserammo,ammobox,depthchargeammo,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekgunnery_loadingelevatormedium" tags="container,ekgunnery_mediumammo_container,railgunammocontainer,coilgunammocontainer,ammocontainer" category="Legacy" linkable="true" displaysidebysidewhenlinked="true" allowedlinks="ekgunnery_loadingelevatormedium" pickdistance="150" scale="0.5" waterproof="true" fireproof="true" explosiondamagemultiplier="0.1" spritecolor="200,200,200,255">
     <Sprite texture="%ModDir%/Items/Containers/ekgunnery_containers.png" depth="0.84" sourcerect="528,0,400,208" origin="0.5,0.5" />
-    <ItemContainer autofill="False" capacity="9" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer autofill="False" capacity="20" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.15,0.35" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem,ekgunnery_mediumammo,railgunammo,railgunshell,coilgunammo,coilgunammobox,chaingunammo,pulselaserammo,ammobox,depthchargeammo" />
+      <Containable items="smallitem,mediumitem,ekgunnery_mediumammo,railgunammo,railgunshell,coilgunammo,coilgunammobox,chaingunammo,pulselaserammo,ammobox,depthchargeammo,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekgunnery_mediumsslrocket_cargocontainer" pickdistance="75" scale="0.5">
     <!--
     <Price baseprice="75" >
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="2"/>
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.3" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="6"/>
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.9" minavailable="3" />
     </Price>
 	-->
     <!--
@@ -49,7 +49,7 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="52,-86" holdangle="20" handle1="-73,80" handle2="-73,80" aimable="false" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.3" setvalue="true" />
     </Holdable>
-    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="8" slotsperrow="4" maxstacksize="1" itempos="-28,-5" iteminterval="19,0.5" itemrotation="90" itemsperrow="4" canbeselected="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer autofill="False" hideitems="false" drawinventory="true" capacity="18" slotsperrow="5" maxstacksize="2" itempos="-28,-5" iteminterval="19,0.5" itemrotation="90" itemsperrow="4" canbeselected="true" msg="ItemMsgInteractSelect" keepopenwhenequipped="true" movableframe="true">
       <!--<GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />-->
       <Containable identifiers="ekgunnery_tagsmallshell,ekgunnery_mediumsslammo,ekgunnery_cannonammo">
         <!--<StatusEffect type="OnContaining" target="Character" SpeedMultiplier="0.5" setvalue="true" />-->
@@ -58,16 +58,16 @@
   </Item>
   <Item name="" identifier="ekgunnery_heavyrailgunshellrack1" tags="container,heavyrailgunammocontainer,ekgunnery_heavyrailguncontainer_compact" pickdistance="120" scale="0.5" canflipx="false" canflipy="false">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_loaders.png" depth="0.84" sourcerect="912,496,96,208" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="3" slotsperrow="3" itempos="48,-40" iteminterval="0,-64" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="7" slotsperrow="3" itempos="48,-40" iteminterval="0,-64" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="heavyrailgunammo,ekgunnery_largeshell" />
+      <Containable items="heavyrailgunammo,ekgunnery_largeshell,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekgunnery_heavyrailgunshellrack2" tags="container,heavyrailgunammocontainer,ekgunnery_heavyrailguncontainer_compact" pickdistance="120" scale="0.5" canflipx="false" canflipy="false">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_loaders.png" depth="0.84" sourcerect="1008,496,96,336" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="5" slotsperrow="5" itempos="48,-40" iteminterval="0,-64" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="11" slotsperrow="4" itempos="48,-40" iteminterval="0,-64" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="heavyrailgunammo,ekgunnery_largeshell" />
+      <Containable items="heavyrailgunammo,ekgunnery_largeshell,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Electricity/ekgunnery_devices.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Electricity/ekgunnery_devices.xml
index d5bf7684..006347be 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Electricity/ekgunnery_devices.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Electricity/ekgunnery_devices.xml	
@@ -3,9 +3,9 @@
   <Item name="" identifier="ekgunnery_warheadsmall1" category="Equipment" Tags="logic,detonator" Scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/ekgunnery_warheads.png" depth="0.8" sourcerect="0,0,96,80" origin="0.5,0.5" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/ekgunnery_warheads.png" depth="0.8" sourcerect="0,80,96,80" maxcondition="10" origin="0.5,0.5" />
-    <ItemContainer canbeselected="true" hideitems="true" capacity="1" maxstacksize="1" itempos="0,0" containedstateindicatorstyle="explosive" msg="ItemMsgInteractSelect">
+    <ItemContainer canbeselected="true" hideitems="true" capacity="1" maxstacksize="2" itempos="0,0" containedstateindicatorstyle="explosive" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="uex">
+      <Containable items="uex,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" Condition="100.0" disabledeltatime="true" allowwhenbroken="true" />
         <StatusEffect type="OnContaining" target="Contained" disabledeltatime="true" allowwhenbroken="true">
           <Remove />
@@ -75,9 +75,9 @@
   <Item name="" identifier="ekgunnery_warheadsmall2" category="Equipment" Tags="logic,detonator" Scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/ekgunnery_warheads.png" depth="0.8" sourcerect="112,0,128,48" origin="0.5,0.5" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/ekgunnery_warheads.png" depth="0.8" sourcerect="112,48,128,48" maxcondition="10" origin="0.5,0.5" />
-    <ItemContainer canbeselected="true" hideitems="true" capacity="1" maxstacksize="1" itempos="0,0" containedstateindicatorstyle="explosive" msg="ItemMsgInteractSelect">
+    <ItemContainer canbeselected="true" hideitems="true" capacity="1" maxstacksize="2" itempos="0,0" containedstateindicatorstyle="explosive" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="uex">
+      <Containable items="uex,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" Condition="100.0" disabledeltatime="true" allowwhenbroken="true" />
         <StatusEffect type="OnContaining" target="Contained" disabledeltatime="true" allowwhenbroken="true">
           <Remove />
@@ -133,9 +133,9 @@
   <Item name="" identifier="ekgunnery_warheadmedium1" category="Equipment" Tags="logic,detonator" Scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/ekgunnery_warheads.png" depth="0.8" sourcerect="256,0,128,128" origin="0.5,0.5" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/ekgunnery_warheads.png" depth="0.8" sourcerect="256,128,128,128" maxcondition="10" origin="0.5,0.5" />
-    <ItemContainer canbeselected="true" hideitems="true" capacity="1" maxstacksize="1" itempos="0,0" containedstateindicatorstyle="explosive" msg="ItemMsgInteractSelect">
+    <ItemContainer canbeselected="true" hideitems="true" capacity="1" maxstacksize="2" itempos="0,0" containedstateindicatorstyle="explosive" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="c4block">
+      <Containable items="c4block,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" Condition="100.0" disabledeltatime="true" allowwhenbroken="true" />
         <StatusEffect type="OnContaining" target="Contained" disabledeltatime="true" allowwhenbroken="true">
           <Remove />
@@ -190,9 +190,9 @@
   <Item name="" identifier="ekgunnery_warheadmedium2" category="Equipment" Tags="logic,detonator" Scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/ekgunnery_warheads.png" depth="0.8" sourcerect="112,96,144,128" origin="0.5,0.5" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/ekgunnery_warheads.png" depth="0.8" sourcerect="112,224,144,128" maxcondition="10" origin="0.5,0.5" />
-    <ItemContainer canbeselected="true" hideitems="true" capacity="1" maxstacksize="1" itempos="0,0" containedstateindicatorstyle="explosive" msg="ItemMsgInteractSelect">
+    <ItemContainer canbeselected="true" hideitems="true" capacity="1" maxstacksize="2" itempos="0,0" containedstateindicatorstyle="explosive" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="c4block">
+      <Containable items="c4block,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" Condition="100.0" disabledeltatime="true" allowwhenbroken="true" />
         <StatusEffect type="OnContaining" target="Contained" disabledeltatime="true" allowwhenbroken="true">
           <Remove />
@@ -247,9 +247,9 @@
   <Item name="" identifier="ekgunnery_warheadnuclear1" category="Equipment" Tags="logic,detonator" Scale="0.5" spritecolor="200,200,200,255">
     <Sprite texture="%ModDir%/Items/Electricity/ekgunnery_warheads.png" depth="0.8" sourcerect="384,0,160,160" origin="0.5,0.5" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/ekgunnery_warheads.png" depth="0.8" sourcerect="384,160,160,160" maxcondition="10" origin="0.5,0.5" />
-    <ItemContainer canbeselected="true" hideitems="true" capacity="1" maxstacksize="1" itempos="0,0" containedstateindicatorstyle="explosive" msg="ItemMsgInteractSelect">
+    <ItemContainer canbeselected="true" hideitems="true" capacity="1" maxstacksize="2" itempos="0,0" containedstateindicatorstyle="explosive" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="nucleardepthcharge">
+      <Containable items="nucleardepthcharge,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" Condition="100.0" disabledeltatime="true" allowwhenbroken="true" />
         <StatusEffect type="OnContaining" target="Contained" disabledeltatime="true" allowwhenbroken="true">
           <Remove />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_ammunition.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_ammunition.xml
index 348db65a..ab61113b 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_ammunition.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_ammunition.xml	
@@ -5,7 +5,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_new_loaders.png" depth="0.8" sourcerect="0,0,112,112" origin="0.5,0.5" />
     <Body width="50" height="50" density="10.5" />
     <AiTarget sightrange="6000.0" maxsoundrange="8000" minsoundrange="0" fadeouttime="15" sonardisruption="0.4" />
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q4.png" origin="0.0,0.0" size="1.1,1.1" />
       <sound file="Content/Items/Tools/FlareLoop.ogg" type="OnActive" range="2048.0" loop="true" />
       <StatusEffect type="OnActive" target="This" Condition="-1">
@@ -15,13 +15,13 @@
         <ParticleEmitter particle="ekgunneryflarebubbles" particlespersecond="6" />
       </StatusEffect>
     </LightComponent>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q3.png" origin="1.0,0.0" size="1.1,1.1" />
     </LightComponent>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q2.png" origin="0.0,1.0" size="1.1,1.1" />
     </LightComponent>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.4" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q1.png" origin="1.0,1.0" size="1.1,1.1" />
     </LightComponent>
     <ItemComponent>
@@ -34,7 +34,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_new_loaders.png" depth="0.8" sourcerect="0,0,112,112" origin="0.5,0.5" />
     <Body width="50" height="50" density="10.7" />
     <AiTarget sightrange="6000.0" maxsoundrange="8000" minsoundrange="0" fadeouttime="15" sonardisruption="5" />
-    <LightComponent characterusable="false" LightColor="255,200,165,255" Flicker="0.2" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,200,165,255" Flicker="0.2" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q4.png" origin="0.0,0.0" size="1.1,1.1" />
       <sound file="Content/Items/Tools/FlareLoop.ogg" type="OnActive" range="2048.0" loop="true" />
       <StatusEffect type="OnActive" target="This" Condition="-1">
@@ -43,13 +43,13 @@
         <ParticleEmitter particle="ekgunneryflarebubbles" particlespersecond="6" />
       </StatusEffect>
     </LightComponent>
-    <LightComponent characterusable="false" LightColor="255,200,165,255" Flicker="0.2" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,200,165,255" Flicker="0.2" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q3.png" origin="1.0,0.0" size="1.1,1.1" />
     </LightComponent>
-    <LightComponent characterusable="false" LightColor="255,200,165,255" Flicker="0.2" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,200,165,255" Flicker="0.2" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q2.png" origin="0.0,1.0" size="1.1,1.1" />
     </LightComponent>
-    <LightComponent characterusable="false" LightColor="255,200,165,255" Flicker="0.2" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,200,165,255" Flicker="0.2" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q1.png" origin="1.0,1.0" size="1.1,1.1" />
     </LightComponent>
     <ItemComponent>
@@ -64,7 +64,7 @@
     <Sprite texture="Mods/EK Gunnery/Items/Weapons/ekgunnery_new_loaders.png" depth="0.8" sourcerect="0,0,112,112" origin="0.5,0.5" />
     <Body width="50" height="50" density="10.5" />
 	<AiTarget sightrange="6000.0" maxsoundrange="8000" minsoundrange="0" fadeouttime="15" sonardisruption="0.4"/>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <StatusEffect type="OnActive" target="This" Condition="-1">
         <Conditional PhysicsBodyActive="eq true" />
         <ParticleEmitter particle="ekgunnery_hdimpactmedium" particlespersecond="2" scalemin="1.0" scalemax="1.0" velocitymin="0" velocitymax="35" distancemin="0" distancemax="32"/>
@@ -80,7 +80,7 @@
     <Sprite texture="Mods/EK Gunnery/Items/Weapons/ekgunnery_new_loaders.png" depth="0.8" sourcerect="0,0,112,112" origin="0.5,0.5" />
     <Body width="50" height="50" density="10.5" />
 	<AiTarget sightrange="6000.0" maxsoundrange="8000" minsoundrange="0" fadeouttime="15" sonardisruption="0.4"/>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <StatusEffect type="OnActive" target="This" Condition="-1">
         <Conditional PhysicsBodyActive="eq true" />
         <ParticleEmitter particle="ekgunneryimpactlarge" particlespersecond="2" scalemin="1.0" scalemax="1.0" velocitymin="0" velocitymax="35" distancemin="0" distancemax="32"/>
@@ -96,7 +96,7 @@
     <Sprite texture="Mods/EK Gunnery/Items/Weapons/ekgunnery_new_loaders.png" depth="0.8" sourcerect="0,0,112,112" origin="0.5,0.5" />
     <Body width="50" height="50" density="10.5" />
 	<AiTarget sightrange="6000.0" maxsoundrange="8000" minsoundrange="0" fadeouttime="15" sonardisruption="0.4"/>
-    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="2048" IsOn="true" shadows="false" drawbehindsubs="true">
+    <LightComponent characterusable="false" LightColor="255,50,50,255" Flicker="0.5" range="8192" IsOn="true" shadows="false" drawbehindsubs="true">
       <StatusEffect type="OnActive" target="This" Condition="-1">
         <Conditional PhysicsBodyActive="eq true" />
         <ParticleEmitter particle="flare" particlespersecond="5" scalemin="5" scalemax="5"/>
@@ -114,11 +114,11 @@
   <Item name="" identifier="ekgunnery_heavyrailgunshell" tags="heavyrailgunammo,ekgunnery_largeshell,largeammo,ammobox,crate" showcontentsintooltip="true" category="Misc,Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="heavyrailgunammocontainer" />
     <Price baseprice="125" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
@@ -206,19 +206,19 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="2" maxstacksize="1" canbeselected="false">
+    <ItemContainer hideitems="true" capacity="4" maxstacksize="2" canbeselected="false">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem,ekshared_largeshellexplosive" />
+      <Containable items="smallitem,ekshared_largeshellexplosive,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekgunnery_heavyrailgunflechetteshell" tags="heavyrailgunammo,ekgunnery_largeshell,largeammo,ammobox,crate" showcontentsintooltip="true" category="Misc,Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="heavyrailgunammocontainer,ekgunnery_heavyrailgunammosource" />
     <Price baseprice="160" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
@@ -265,7 +265,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer autofill="False" hideitems="true" capacity="2" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="4" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ekgunnery_heavyrailgunflechettepellet" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,0,1,1" />
     </ItemContainer>
@@ -343,11 +343,11 @@
     <PreferredContainer primary="heavyrailgunammocontainer,ekgunnery_heavyrailgunammosource" />
     <Price baseprice="675" soldeverywhere="false">
       <!-- 675 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20
@@ -440,11 +440,11 @@
     <PreferredContainer primary="ekgunnery_chaingunammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="60">
       <!-- 38 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" minavailable="6" />
     </Price>
     <!--
 	11
@@ -533,11 +533,11 @@
     <PreferredContainer primary="ekgunnery_chaingunammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="150" soldeverywhere="false">
       <!-- 80 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -631,11 +631,11 @@
     <PreferredContainer primary="ekgunnery_chaingunammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="300" soldeverywhere="false">
       <!-- 217 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -729,11 +729,11 @@
     <PreferredContainer primary="ekgunnery_chaingunammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="250" soldeverywhere="false">
       <!-- 160 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -845,11 +845,11 @@
     <PreferredContainer primary="ekgunnery_autocannonammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="150">
       <!-- 70 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	22
@@ -969,11 +969,11 @@
     <PreferredContainer primary="ekgunnery_autocannonammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="300">
       <!-- 170 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	22
@@ -1091,11 +1091,11 @@
     <PreferredContainer primary="ekgunnery_autocannonammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="200">
       <!-- 120 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	22
@@ -1215,11 +1215,11 @@
     <PreferredContainer primary="ekgunnery_autocannonammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="200">
       <!-- 120 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	22
@@ -1305,7 +1305,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer autofill="False" hideitems="true" capacity="3" maxstacksize="1" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
+    <ItemContainer autofill="False" hideitems="true" capacity="7" maxstacksize="2" removecontaineditemsondeconstruct="true" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true">
       <Containable identifiers="ekgunnery_autocannonflechettepellet" />
       <ContainedStateIndicator texture="Content/UI/ContainerIndicators.png" sourcerect="0,0,1,1" />
     </ItemContainer>
@@ -1343,11 +1343,11 @@
     <PreferredContainer primary="ekgunnery_autocannonammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="310">
       <!-- 192 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	22
@@ -1482,11 +1482,11 @@
     <PreferredContainer primary="ekgunnery_autocannonammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="350">
       <!-- 232 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	22
@@ -1627,11 +1627,11 @@
     <PreferredContainer primary="ekgunnery_autocannonammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="350">
       <!-- 250 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	22
@@ -1751,11 +1751,11 @@
     <PreferredContainer primary="ekgunnery_autocannonammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="425">
       <!-- 250 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.0" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	22
@@ -1887,11 +1887,11 @@
     <PreferredContainer primary="ekgunnery_autocannonammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="100">
       <!-- 124 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	22
@@ -2002,11 +2002,11 @@
     <PreferredContainer primary="ekgunnery_microsslammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="110">
       <!-- 113 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -2091,11 +2091,11 @@
     <PreferredContainer primary="ekgunnery_microsslammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="165">
       <!-- 158 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -2185,11 +2185,11 @@
     <PreferredContainer primary="ekgunnery_microsslammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="300">
       <!-- 293 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -2279,11 +2279,11 @@
     <PreferredContainer primary="ekgunnery_microsslammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="275">
       <!-- 238 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -2346,11 +2346,11 @@
   <Item name="" identifier="ekgunnery_smallsslammo" aliases="Small SSL Ammo Box" scale="0.5" tags="ammobox,crate,ekgunnery_smallsslequipment,ekgunnery_smallsslammo" category="Equipment,Weapon" linkable="false" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="ekgunnery_smallsslammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="120">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -2461,11 +2461,11 @@
     <PreferredContainer primary="ekgunnery_smallsslammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="175">
       <!-- 38 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -2575,11 +2575,11 @@
   <Item name="" identifier="ekgunnery_smallsslexplosiveammo" aliases="Small SSL Explosive Ammo Box" scale="0.5" tags="ammobox,crate,ekgunnery_smallsslequipment,ekgunnery_smallsslammo" category="Equipment,Weapon" linkable="false" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="ekgunnery_smallsslammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="200">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -2693,11 +2693,11 @@
     <PreferredContainer primary="ekgunnery_smallsslammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="335">
       <!-- 293 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -2808,11 +2808,11 @@
     <PreferredContainer primary="ekgunnery_smallsslammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="450">
       <!-- 285 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" sold="false" />
     </Price>
     <!--
 	11
@@ -2936,11 +2936,11 @@
   <Item name="" identifier="ekgunnery_mediumsslrocket_he" tags="ekgunnery_mediumsslammo,railgunshell,railgunammo,ekgunnery_tagsmallshell" cargocontaineridentifier="ekgunnery_mediumsslrocket_cargocontainer" category="Misc,Weapon" sonarsize="5" scale="0.4" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="ekgunnery_mediumsslammosource,railgunammocontainer" />
     <Price baseprice="65" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="16" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="48" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	10
@@ -3025,11 +3025,11 @@
   <Item name="" identifier="ekgunnery_mediumsslrocket_ap" tags="ekgunnery_mediumsslammo,railgunshell,railgunammo,ekgunnery_tagsmallshell" cargocontaineridentifier="ekgunnery_mediumsslrocket_cargocontainer" category="Misc,Weapon" sonarsize="5" scale="0.4" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="ekgunnery_mediumsslammosource,railgunammocontainer" />
     <Price baseprice="90" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="36" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	10
@@ -3153,11 +3153,11 @@
 	<PreferredContainer primary="ekgunnery_mediumsslammosource,railgunammocontainer" />
 
     <Price baseprice="75" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="16" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="48" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
 	
     <Deconstruct time="10">
@@ -3234,7 +3234,7 @@
 	  
     </Projectile>
 	
-    <LightComponent characterusable="false" LightColor="255,200,45,60" range="100" IsOn="false">
+    <LightComponent characterusable="false" LightColor="255,200,45,60" range="400" IsOn="false">
 	  
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" Condition="-200.0" Comparison="and">
         <Conditional MotionDetected="true" />
@@ -3262,11 +3262,11 @@
     <PreferredContainer primary="ekgunnery_mediumsslammosource,railgunammocontainer" />
     <!--
     <Price baseprice="75" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="16" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="48" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
 	-->
     <!--
@@ -3361,7 +3361,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent characterusable="false" LightColor="255,0,0,255" range="400" blinkfrequency="10" IsOn="false">
+    <LightComponent characterusable="false" LightColor="255,0,0,255" range="1600" blinkfrequency="10" IsOn="false">
       <!--
 	  <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" Condition="-2.5" checkconditionalalways="true" Comparison="And">
         <Conditional targetitemcomponent="MotionSensor" MotionDetected="eq true" />
@@ -3391,11 +3391,11 @@
     <PreferredContainer primary="ekgunnery_mediumsslammosource,railgunammocontainer" />
     <Price baseprice="75" soldeverywhere="false">
       <!-- 73.5 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20 10
@@ -3495,11 +3495,11 @@
     <PreferredContainer primary="ekgunnery_mediumsslammosource,railgunammocontainer" />
     <Price baseprice="95" soldeverywhere="false">
       <!-- 93.5 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" sold="false" />
     </Price>
     <!--
 	20 10
@@ -3673,11 +3673,11 @@
         <Remove />
       </StatusEffect>
     </Holdable>
-    <ItemContainer hideitems="true" capacity="10" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="tank" spawnwithid="ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet">
+    <ItemContainer hideitems="true" capacity="22" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="tank" spawnwithid="ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet,ekgunnery_vortexringpellet">
       <StatusEffect type="Always" target="This">
         <SpawnItem identifiers="ekgunnery_vortexringpellet" spawnposition="ThisInventory" />
       </StatusEffect>
-      <Containable items="ekgunnery_vortexringpellet" />
+      <Containable items="ekgunnery_vortexringpellet,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <!-- Auxiliary Unique Ammo -->
@@ -3743,11 +3743,11 @@
   <Item name="Mining Laser Cell" identifier="ekgunnery_mininglaserammo" scale="0.5" tags="ammobox,crate,ekgunnery_mininglaserammo" description="Heavy non-rechargable capacitor which supplies the isolated power modulation needed to drive an acoustic laser system. The casing includes large heatsinks to accommodate the unit's tendancy to heat up during extended use." category="Equipment,Weapon" linkable="false" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="ekgunnery_mininglaserammosource,coilgunammocontainer,ammocontainer" />
     <Price baseprice="190" soldeverywhere="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.0" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" minavailable="6" />
     </Price>
     <!-- 194
 	20
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_auxiliary.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_auxiliary.xml
index 06192550..870a0096 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_auxiliary.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_auxiliary.xml	
@@ -11,7 +11,7 @@
     <UpgradePreviewSprite scale="2" texture="%ModDir%/UI/ekgunnery_auxiliaryturretui1.png" sourcerect="8,208,56,32" origin="0.5,0.5" />
     <StaticBody width="80" radius="80" />
     <Turret canbeselected="false" characterusable="false" linkable="true" barrelpos="96,-48">
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="5120" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="20480" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/alphaOne.png" />
       </LightComponent>
     </Turret>
@@ -48,10 +48,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="1536" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="6144" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnery_newchaingunflame" particleamount="1" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -95,10 +95,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnery_newmediumsslflame" particleamount="1" velocitymin="50" velocitymax="150" />
@@ -149,10 +149,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="1536" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="6144" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="FlareBubbles" scalemin="1.4" scalemax="1.8" particleamount="2" anglemin="-10" anglemax="10" distancemin="0" distancemax="150" velocitymin="50" velocitymax="300" />
@@ -194,7 +194,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
 	  <ParticleEmitter particle="FlareBubbles" scalemin="1.4" scalemax="1.8" particleamount="3" anglemin="90" anglemax="90" velocitymin="0" velocitymax="50"/>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_heavyturrets.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_heavyturrets.xml
index 1e8644bd..c77c178e 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_heavyturrets.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_heavyturrets.xml	
@@ -12,7 +12,7 @@
     <UpgradePreviewSprite scale="3.0" texture="%ModDir%/UI/ekgunnery_heavyturretui1.png" sourcerect="0,208,80,32" origin="0.5,0.5" Scale="1" />
     <StaticBody width="80" radius="80" />
     <Turret canbeselected="false" characterusable="false" linkable="true" barrelpos="240,-150">
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="5120" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="20480" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/alphaOne.png" />
       </LightComponent>
     </Turret>
@@ -53,7 +53,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="5120" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="20480" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_verythin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnery_newheavyrailgunflash" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -95,7 +95,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="3072" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="12288" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnery_newautocannonflame" particleamount="1" velocitymin="50" velocitymax="50" scalemin="1" scalemax="1" distancemin="20" distancemax="25" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_loaders.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_loaders.xml
index 67b27e60..af78c4b0 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_loaders.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_loaders.xml	
@@ -19,9 +19,9 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="81,-270" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="6" itempos="81,-270" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="coilgunammo" excludeditems="extendedcoilgunammo" />
+      <Containable items="coilgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!-- when the coilgun is fired, it triggers this statuseffect, causing contained ammunition boxes to spawn new ammo -->
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="coilgunammo" type="Contained" />
@@ -54,7 +54,7 @@
     </Repairable>
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="6" itempos="80,-234" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="ekgunnery_chaingunammo" />
+      <Containable items="ekgunnery_chaingunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="ekgunnery_chaingunammo" type="Contained" />
         <Use />
@@ -84,9 +84,9 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="2" slotsperrow="6" itempos="56,-234" iteminterval="80,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="4" slotsperrow="2" itempos="56,-234" iteminterval="80,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="ekgunnery_chaingunammo" />
+      <Containable items="ekgunnery_chaingunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="ekgunnery_chaingunammo" type="Contained" />
         <Use />
@@ -118,7 +118,7 @@
     </Repairable>
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="6" itempos="81,-265" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="ekgunnery_microsslammo" />
+      <Containable items="ekgunnery_microsslammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="ekgunnery_microsslammo" type="Contained" />
         <Use />
@@ -150,7 +150,7 @@
     </Repairable>
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="6" itempos="81,-265" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="ekgunnery_smallsslammo" />
+      <Containable items="ekgunnery_smallsslammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="ekgunnery_smallsslammo" type="Contained" />
         <Use />
@@ -182,7 +182,7 @@
     </Repairable>
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="6" itempos="84,-236" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="ekgunnery_autocannonammo" />
+      <Containable items="ekgunnery_autocannonammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="ekgunnery_autocannonammo" type="Contained" disabledeltatime="true" stackable="false" />
         <Use />
@@ -224,7 +224,7 @@
     </Repairable>
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="6" itempos="84,-236" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="ekgunnery_autocannonammo" />
+      <Containable items="ekgunnery_autocannonammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
 		<RequiredItem items="ekgunnery_autocannonammo" type="Contained" disabledeltatime="true" stackable="false"/>
 		<Use />
@@ -255,9 +255,9 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="12" slotsperrow="6" itempos="46,-160" iteminterval="40,-40" itemsperrow="3" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="26" slotsperrow="6" itempos="46,-160" iteminterval="40,-40" itemsperrow="3" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="ekgunnery_mediumsslammo" />
+      <Containable items="ekgunnery_mediumsslammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -282,9 +282,9 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="true" drawinventory="false" capacity="1" maxstacksize="1" slotsperrow="6" itempos="81,-270" iteminterval="0,0" itemrotation="0" canbeselected="false" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="true" drawinventory="false" capacity="1" maxstacksize="2" slotsperrow="6" itempos="81,-270" iteminterval="0,0" itemrotation="0" canbeselected="false" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="ekgunnery_vortexringprojectile" />
+      <Containable items="ekgunnery_vortexringprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!-- spawn a new canister projectile in case we somehow lose ours -->
       <StatusEffect type="Always" target="This">
         <SpawnItem identifiers="ekgunnery_vortexringprojectile" spawnposition="ThisInventory" />
@@ -324,9 +324,9 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="4" slotsperrow="2" itempos="48,-97" iteminterval="64,-48" itemsperrow="2" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.779">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="9" slotsperrow="3" itempos="48,-97" iteminterval="64,-48" itemsperrow="2" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.779">
       <GuiFrame relativesize="0.3,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="ekgunnery_mediumsslammo" />
+      <Containable items="ekgunnery_mediumsslammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -354,7 +354,7 @@
     </Repairable>
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="80,-104" itemsperrow="1" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="ekgunnery_chaingunammo" />
+      <Containable items="ekgunnery_chaingunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="ekgunnery_chaingunammo" type="Contained" />
         <Use />
@@ -386,7 +386,7 @@
     </Repairable>
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="80,-115" itemsperrow="1" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="ekgunnery_mininglaserammo" />
+      <Containable items="ekgunnery_mininglaserammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="ekgunnery_mininglaserammo" type="Contained" />
         <Use />
@@ -420,7 +420,7 @@
       </StatusEffect>
     </Repairable>
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" msg="ItemMsgInteractSelect" ShowConditionInContainedStateIndicator="true" SpawnWithId="ekgunnery_grapplinghookammo" >
-      <Containable items="ekgunnery_grapplinghookammo" />
+      <Containable items="ekgunnery_grapplinghookammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="Always" target="This" disabledeltatime="true">
         <SpawnItem identifiers="ekgunnery_grapplinghookammo" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -457,9 +457,9 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="3" slotsperrow="3" itempos="40,-188" iteminterval="48,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="7" slotsperrow="3" itempos="40,-188" iteminterval="48,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="railgunshell,railgunammo,heavyrailgunammo" />
+      <Containable items="railgunshell,railgunammo,heavyrailgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -485,9 +485,9 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="6" slotsperrow="6" itempos="192,-52" iteminterval="0,-56" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="13" slotsperrow="4" itempos="192,-52" iteminterval="0,-56" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="railgunshell,railgunammo,heavyrailgunammo" />
+      <Containable items="railgunshell,railgunammo,heavyrailgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -513,9 +513,9 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="2" slotsperrow="2" itempos="128,-224" iteminterval="128,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="4" slotsperrow="2" itempos="128,-224" iteminterval="128,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="ekgunnery_autocannonammo" />
+      <Containable items="ekgunnery_autocannonammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="ekgunnery_autocannonammo" type="Contained" disabledeltatime="true" stackable="false" />
         <Use />
@@ -556,9 +556,9 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="6" slotsperrow="6" itempos="160,-184" iteminterval="0,28" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="13" slotsperrow="4" itempos="160,-184" iteminterval="0,28" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="railgunshell,railgunammo" />
+      <Containable items="railgunshell,railgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -587,7 +587,7 @@
     <!-- itempos="104,-142" -->
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="2" itempos="160,-142" iteminterval="113,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="pulselaserammo" />
+      <Containable items="pulselaserammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="pulselaserammo" type="Contained" />
         <Use />
@@ -617,9 +617,9 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="4" slotsperrow="4" itempos="160,-214" iteminterval="0,56" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="9" slotsperrow="3" itempos="160,-214" iteminterval="0,56" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="railgunshell,railgunammo,heavyrailgunammo" />
+      <Containable items="railgunshell,railgunammo,heavyrailgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -645,9 +645,9 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="20" slotsperrow="5" itempos="80,-76" iteminterval="40,-40" itemsperrow="5" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="44" slotsperrow="7" itempos="80,-76" iteminterval="40,-40" itemsperrow="5" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.4" anchor="Center" style="ItemUI" />
-      <Containable items="ekgunnery_mediumsslammo" />
+      <Containable items="ekgunnery_mediumsslammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_loaders_legacy.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_loaders_legacy.xml
index 60cc4f50..c2c521cb 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_loaders_legacy.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_loaders_legacy.xml	
@@ -19,7 +19,7 @@
     </Repairable>
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="6" itempos="72,-76" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="coilgunammo" excludeditems="extendedcoilgunammo" />
+      <Containable items="coilgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="coilgunammo" type="Contained" />
         <Use />
@@ -45,7 +45,7 @@
     </Repairable>
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="6" itempos="64,-98" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="ekgunnery_chaingunammo" />
+      <Containable items="ekgunnery_chaingunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="ekgunnery_chaingunammo" type="Contained" />
         <Use />
@@ -70,7 +70,7 @@
     </Repairable>
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="6" itempos="72,-155" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="ekgunnery_autocannonammo" />
+      <Containable items="ekgunnery_autocannonammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="ekgunnery_autocannonammo" type="Contained" />
         <Use />
@@ -95,7 +95,7 @@
     </Repairable>
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="6" itempos="68,-96" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="ekgunnery_microsslammo" />
+      <Containable items="ekgunnery_microsslammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <RequiredItem items="ekgunnery_microsslammo" type="Contained" />
         <Use />
@@ -106,9 +106,9 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_loaders.png" depth="0.8" sourcerect="152,8,240,320" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Weapons/ekgunnery_loaders.png" depth="0.78" sourcerect="400,0,32,288" origin="0.5,0.5" offset="57,0" />
     <DecorativeSprite texture="%ModDir%/Items/Weapons/ekgunnery_loaders.png" depth="0.78" sourcerect="432,0,32,288" origin="0.5,0.5" offset="-57,0" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="8" slotsperrow="8" itempos="120,-48" iteminterval="0,-32" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="18" slotsperrow="5" itempos="120,-48" iteminterval="0,-32" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="mediumsslammo" />
+      <Containable items="mediumsslammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="5" mindeteriorationdelay="120" maxdeteriorationdelay="600" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.25" />
@@ -127,9 +127,9 @@
   </Item>
   <Item name="" identifier="ekgunnery_medium_ssl_loadercompact1" tags="mediumsslcontainer_compact,ekgunnery_mediumsslequipment,ekgunnery_mediumsslammosource" category="Legacy" linkable="true" allowedlinks="ekgunnery_medium_ssl" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_loaders.png" depth="0.8" sourcerect="472,8,240,128" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="8" slotsperrow="8" itempos="60,-44" iteminterval="40,-40" itemsperrow="4" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="18" slotsperrow="5" itempos="60,-44" iteminterval="40,-40" itemsperrow="4" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="mediumsslammo" />
+      <Containable items="mediumsslammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="5" mindeteriorationdelay="120" maxdeteriorationdelay="600" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.25" />
@@ -148,9 +148,9 @@
   </Item>
   <Item name="" identifier="ekgunnery_medium_ssl_loadercompact2" tags="mediumsslcontainer_compact,ekgunnery_mediumsslequipment,ekgunnery_mediumsslammosource" category="Legacy" linkable="true" allowedlinks="ekgunnery_medium_ssl" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_loaders.png" depth="0.8" sourcerect="728,8,160,208" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="8" slotsperrow="8" itempos="60,-44" iteminterval="40,-40" itemsperrow="2" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="18" slotsperrow="5" itempos="60,-44" iteminterval="40,-40" itemsperrow="2" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="mediumsslammo" />
+      <Containable items="mediumsslammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="5" mindeteriorationdelay="120" maxdeteriorationdelay="600" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.25" />
@@ -169,9 +169,9 @@
   </Item>
   <Item name="" identifier="ekgunnery_medium_ssl_loadercompact3" tags="mediumsslcontainer_compact,ekgunnery_mediumsslequipment,ekgunnery_mediumsslammosource" category="Legacy" linkable="true" allowedlinks="ekgunnery_medium_ssl" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_loaders.png" depth="0.8" sourcerect="472,152,240,208" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="16" slotsperrow="8" itempos="60,-44" iteminterval="40,-40" itemsperrow="4" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="35" slotsperrow="6" itempos="60,-44" iteminterval="40,-40" itemsperrow="4" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="mediumsslammo" />
+      <Containable items="mediumsslammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="5" mindeteriorationdelay="120" maxdeteriorationdelay="600" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.25" />
@@ -191,9 +191,9 @@
   <Item name="" identifier="ekgunnery_heavyrailgunloader" tags="ekgunnery_heavyrailgunequipment,ekgunnery_heavyrailgunammosource" category="Legacy" linkable="true" allowedlinks="ekgunnery_heavyrailgun" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_loaders.png" depth="0.8" sourcerect="144,496,384,400" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Weapons/ekgunnery_loaders.png" depth="0.78" sourcerect="528,496,384,400" origin="0.5,0.5" offset="0,0" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="5" slotsperrow="5" itempos="195,-76" iteminterval="0,-64" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="11" slotsperrow="4" itempos="195,-76" iteminterval="0,-64" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="railgunshell,railgunammo,heavyrailgunammo" />
+      <Containable items="railgunshell,railgunammo,heavyrailgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="5" mindeteriorationdelay="120" maxdeteriorationdelay="600" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.25" />
@@ -215,7 +215,7 @@
     <DecorativeSprite texture="%ModDir%/Items/Weapons/ekgunnery_loaders.png" depth="0.78" sourcerect="528,896,384,144" origin="0.5,0.5" offset="0,0" />
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="195,-76" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="railgunshell,railgunammo,heavyrailgunammo" />
+      <Containable items="railgunshell,railgunammo,heavyrailgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="5" mindeteriorationdelay="120" maxdeteriorationdelay="600" MinDeteriorationCondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.25" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_melee.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_melee.xml
index a35ad2c6..6a18fe71 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_melee.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_melee.xml	
@@ -18,7 +18,7 @@
   tags="dischargecoil" category="Machine" Scale="0.5">
     <Sprite texture="Content/Items/Weapons/Turrets.png" depth="0.01" sourcerect="560,948,464,76" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -99,7 +99,7 @@
   <Item name="" identifier="ekgunnery_acousticpulse_style1" tags="dischargecoil" category="Machine,Weapon" interactthroughwalls="true" Scale="0.5" interactdistance="10" focusonselected="true" offsetonselected="750" linkable="false">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_audiokineticpulse_style1.png" depth="0.01" sourcerect="0,0,448,80" origin="0.5, 0.1" />
     <ItemContainer hideitems="true" drawinventory="true" capacity="1" canbeselected="false" characterusable="true" SpawnWithId="ekgunnery_dummyprojectile">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="Always" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -136,7 +136,7 @@
   <Item name="" identifier="ekgunnery_acousticpulse_style2" tags="dischargecoil" category="Legacy" interactthroughwalls="true" Scale="0.5" interactdistance="10" focusonselected="true" offsetonselected="750" linkable="false">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_audiokineticpulse_style1.png" depth="0.01" sourcerect="0,88,448,104" origin="0.5, 0.25" />
     <ItemContainer hideitems="true" drawinventory="true" capacity="1" canbeselected="false" characterusable="true" SpawnWithId="ekgunnery_dummyprojectile">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="Always" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -172,7 +172,7 @@
   <Item name="" identifier="ekgunnery_acousticpulse_style3" tags="dischargecoil" category="Legacy" interactthroughwalls="true" Scale="0.5" interactdistance="10" focusonselected="true" offsetonselected="750" linkable="false">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_audiokineticpulse_style1.png" depth="0.01" sourcerect="0,200,448,64" origin="0.5, 0.1" />
     <ItemContainer hideitems="true" drawinventory="true" capacity="1" canbeselected="false" characterusable="true" SpawnWithId="ekgunnery_dummyprojectile">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="Always" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -208,7 +208,7 @@
   <Item name="" identifier="ekgunnery_acousticpulse_style4" tags="dischargecoil" category="Legacy" interactthroughwalls="true" Scale="1.0" interactdistance="10" focusonselected="true" offsetonselected="750" linkable="false">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_audiokineticpulse_style1.png" depth="0.01" sourcerect="0,272,256,64" origin="0.5, 0.1" />
     <ItemContainer hideitems="true" drawinventory="true" capacity="1" canbeselected="false" characterusable="true" SpawnWithId="ekgunnery_dummyprojectile">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="Always" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -666,7 +666,7 @@
         <Conditional Condition="gt 90" />
       </StatusEffect>
     </ItemComponent>
-    <LightComponent range="2" lightcolor="0,0,0,2" IsOn="true" castshadows="false" allowingameediting="false" flicker="0" flickerspeed="0" pulsefrequency="0" pulseamount="0" />
+    <LightComponent range="8" lightcolor="0,0,0,2" IsOn="true" castshadows="false" allowingameediting="false" flicker="0" flickerspeed="0" pulsefrequency="0" pulseamount="0" />
     <TriggerComponent triggeredby="Human, Creature" force="0" radius="75">
       <IsActive targetitemcomponent="LightComponent" IsOn="eq True" />
       <Attack>
@@ -695,7 +695,7 @@
         <Conditional Condition="gt 90" />
       </StatusEffect>
     </ItemComponent>
-    <LightComponent range="2" lightcolor="0,0,0,2" IsOn="true" castshadows="false" allowingameediting="false" flicker="0" flickerspeed="0" pulsefrequency="0" pulseamount="0" />
+    <LightComponent range="8" lightcolor="0,0,0,2" IsOn="true" castshadows="false" allowingameediting="false" flicker="0" flickerspeed="0" pulsefrequency="0" pulseamount="0" />
     <TriggerComponent triggeredby="Human, Creature" force="0" radius="75">
       <IsActive targetitemcomponent="LightComponent" IsOn="eq True" />
       <Attack>
@@ -765,7 +765,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekgunnery_meleerammingprow1_projectile" />
+      <Containable items="ekgunnery_meleerammingprow1_projectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_meleerammingprow1_projectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -811,7 +811,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekgunnery_meleerammingprow1creatures_projectile" />
+      <Containable items="ekgunnery_meleerammingprow1creatures_projectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_meleerammingprow1creatures_projectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -861,7 +861,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekgunnery_meleerammingprow2_projectile" />
+      <Containable items="ekgunnery_meleerammingprow2_projectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_meleerammingprow2_projectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -907,7 +907,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekgunnery_meleerammingprow2creatures_projectile" />
+      <Containable items="ekgunnery_meleerammingprow2creatures_projectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_meleerammingprow2creatures_projectile" spawnposition="ThisInventory" />
       </StatusEffect>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_modularmissile.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_modularmissile.xml
index ede072e7..8f13eb03 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_modularmissile.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_modularmissile.xml	
@@ -5,7 +5,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -31,7 +31,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -57,7 +57,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -83,7 +83,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -109,7 +109,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -135,7 +135,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -161,7 +161,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -187,7 +187,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -213,7 +213,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -239,7 +239,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -265,7 +265,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -291,7 +291,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -317,7 +317,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -344,7 +344,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -371,7 +371,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -398,7 +398,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -425,7 +425,7 @@
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
     <BrokenSprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,0,1,1" origin="0.5,0.5" maxcondition="90" />
     <ItemContainer hideitems="true" drawinventory="false" capacity="1" canbeselected="false" characterusable="false">
-      <Containable items="ekgunnery_dummyprojectile" />
+      <Containable items="ekgunnery_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -449,7 +449,7 @@
   </Item>
   <Item name="" identifier="ekgunnery_modularmissile_soundemitter1" category="Legacy" Tags="sound" scale="0.5" invulnerabletodamage="true" hiddeningame="true">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="224,256,32,32" />
-    <LightComponent canbeselected="false" lightcolor="0,0,0,2" castshadows="false" range="1">
+    <LightComponent canbeselected="false" lightcolor="0,0,0,2" castshadows="false" range="4">
       <sound file="%ModDir%/Items/Weapons/ekgunnery_rocketmotor1_mono.ogg" type="OnActive" range="8000.0" loop="true" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
@@ -461,7 +461,7 @@
   </Item>
   <Item name="" identifier="ekgunnery_modularmissile_soundemitter2" category="Legacy" Tags="sound" scale="0.5" invulnerabletodamage="true" hiddeningame="true">
     <Sprite texture="%ModDir%/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="224,256,32,32" />
-    <LightComponent canbeselected="false" lightcolor="0,0,0,2" castshadows="false" range="1">
+    <LightComponent canbeselected="false" lightcolor="0,0,0,2" castshadows="false" range="4">
       <sound file="%ModDir%/Items/Weapons/ekgunnery_largetorpedomotor1_mono.ogg" type="OnActive" range="8000.0" loop="true" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
@@ -664,7 +664,7 @@
   <Item name="Forcer Test 1" identifier="ekgunnery_forcertest1" category="Legacy" focusonselected="false" linkable="false" Scale="1.0" nonplayerteaminteractable="True" spritecolor="255,255,255,255" 
   description="Component of modular shuttle-based munitions" >
     <Sprite texture="Mods/EK Gunnery/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
-    <LightComponent range="600" lightcolor="140,197,180,111" IsOn="true" castshadows="true" allowingameediting="false" flicker="0.2" flickerspeed="5.0" pulsefrequency="0.2" pulseamount="0.4">
+    <LightComponent range="2400" lightcolor="140,197,180,111" IsOn="true" castshadows="true" allowingameediting="false" flicker="0.2" flickerspeed="5.0" pulsefrequency="0.2" pulseamount="0.4">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This">
         <sound file="Content/Items/Alien/ALIEN_gravitySphereLoop.ogg" range="500.0" loop="true" />
@@ -686,7 +686,7 @@
   <Item name="Forcer Test 2" identifier="ekgunnery_forcertest2" category="Legacy" focusonselected="false" linkable="false" Scale="1.0" nonplayerteaminteractable="True" spritecolor="255,255,255,255" 
   description="Component of modular shuttle-based munitions" >
     <Sprite texture="Mods/EK Gunnery/Items/Weapons/ekgunnery_rotationhelper.png" depth="0.8" sourcerect="0,192,96,96" canflipy="false" />
-    <LightComponent range="600" lightcolor="140,197,180,111" IsOn="true" castshadows="true" allowingameediting="false" flicker="0.2" flickerspeed="5.0" pulsefrequency="0.2" pulseamount="0.4">
+    <LightComponent range="2400" lightcolor="140,197,180,111" IsOn="true" castshadows="true" allowingameediting="false" flicker="0.2" flickerspeed="5.0" pulsefrequency="0.2" pulseamount="0.4">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This">
         <sound file="Content/Items/Alien/ALIEN_gravitySphereLoop.ogg" range="500.0" loop="true" />
@@ -713,7 +713,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekgunnery_modularmissile_thrusterforcer100" />
+      <Containable items="ekgunnery_modularmissile_thrusterforcer100,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_modularmissile_thrusterforcer100" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -751,7 +751,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekgunnery_modularmissile_thrusterforcer050" />
+      <Containable items="ekgunnery_modularmissile_thrusterforcer050,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekgunnery_modularmissile_thrusterforcer050" spawnposition="ThisInventory" />
       </StatusEffect>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_spinalweapons.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_spinalweapons.xml
index 6f98a447..c0c996aa 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_spinalweapons.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_spinalweapons.xml	
@@ -11,7 +11,7 @@
     <UpgradePreviewSprite scale="3.0" texture="%ModDir%/UI/ekgunnery_spinalweaponui1.png" sourcerect="0,136,72,72" origin="0.5,0.5" />
     <StaticBody width="80" radius="80" />
     <Turret canbeselected="false" characterusable="false" linkable="true" barrelpos="48,112" rotationlimits="-15,15">
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2560" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10240" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/alphaOne.png" />
       </LightComponent>
     </Turret>
@@ -48,7 +48,7 @@
       <Crosshair texture="Content/Items/Weapons/Crosshairs.png" sourcerect="256,0,256,256" />
       <CrosshairPointer texture="Content/Items/Weapons/Crosshairs.png" sourcerect="0,0,256,256" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2560" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10240" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.1,1.1" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashrailgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -89,7 +89,7 @@
       <CrosshairPointer texture="Content/Items/Weapons/Crosshairs.png" sourcerect="0,0,256,256" />
       <ChargeSound file="Content/Items/Weapons/WEAPONS_chargeUp.ogg" range="10000" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2560" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10240" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.1,1.1" />
       </LightComponent>
       <ParticleEmitter particle="FlareBubbles" scalemin="1.4" scalemax="1.8" particleamount="14" anglemin="0" anglemax="360" velocitymin="0" velocitymax="50" />
@@ -132,7 +132,7 @@
       <Crosshair texture="Content/Items/Weapons/Crosshairs.png" sourcerect="256,0,256,256" />
       <CrosshairPointer texture="Content/Items/Weapons/Crosshairs.png" sourcerect="0,0,256,256" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="5120" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="20480" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_verythin.png" origin="-0.01, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnery_newheavyrailgunflash" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -171,7 +171,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2560" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10240" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.1,1.1" />
       </LightComponent>
       <!--
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_turrets.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_turrets.xml
index 362b3a0d..bbfe9983 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_turrets.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_turrets.xml	
@@ -27,7 +27,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashcoilgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -69,10 +69,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="1536" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="6144" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnery_newchaingunflame" particleamount="1" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -121,10 +121,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <!--
@@ -175,10 +175,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnery_newmicrosslflame" particleamount="2" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" distancemin="-40" distancemax="-20" />
@@ -223,10 +223,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnery_newsmallsslflame" particleamount="2" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -272,7 +272,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnery_newautocannonflame" particleamount="1" velocitymin="50" velocitymax="50" scalemin="1" scalemax="1" distancemin="20" distancemax="25" />
@@ -321,7 +321,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunneryautocannonflame" particleamount="1" velocitymin="50" velocitymax="50" scalemin="1" scalemax="1" />
@@ -364,10 +364,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnery_newmediumsslflame" particleamount="1" velocitymin="50" velocitymax="150" />
@@ -418,7 +418,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnery_newautocannonbubbles" particleamount="3" anglemin="-25" anglemax="25" velocitymin="0" velocitymax="1500" scalemin="0.5" scalemax="1.0" distancemin="-100" distancemax="200" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_turrets_legacy.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_turrets_legacy.xml
index a89045f3..0adf4081 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_turrets_legacy.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_turrets_legacy.xml	
@@ -19,7 +19,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashrailgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -53,7 +53,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashrailgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -84,7 +84,7 @@
       <Crosshair texture="Content/Items/Weapons/Crosshairs.png" sourcerect="256,0,256,256" />
       <CrosshairPointer texture="Content/Items/Weapons/Crosshairs.png" sourcerect="0,0,256,256" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2560" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10240" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashrailgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -115,7 +115,7 @@
       <Crosshair texture="Content/Items/Weapons/Crosshairs.png" sourcerect="256,0,256,256" />
       <CrosshairPointer texture="Content/Items/Weapons/Crosshairs.png" sourcerect="0,0,256,256" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2560" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10240" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashrailgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -146,7 +146,7 @@
       <Crosshair texture="Content/Items/Weapons/Crosshairs.png" sourcerect="256,0,256,256" />
       <CrosshairPointer texture="Content/Items/Weapons/Crosshairs.png" sourcerect="0,0,256,256" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2560" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10240" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashrailgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -181,7 +181,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="5120" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="20480" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_verythin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerymuzzleflashrailgunheavy" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -217,7 +217,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="5120" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="20480" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_verythin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerymuzzleflashrailgunheavy" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -253,7 +253,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="5120" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="20480" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_verythin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerymuzzleflashrailgunheavy" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -285,7 +285,7 @@
       <Crosshair texture="Content/Items/Weapons/Crosshairs.png" sourcerect="256,0,256,256" />
       <CrosshairPointer texture="Content/Items/Weapons/Crosshairs.png" sourcerect="0,0,256,256" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="5120" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="20480" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_verythin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerymuzzleflashrailgunheavy" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -317,7 +317,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashcoilgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -351,7 +351,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashcoilgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -383,10 +383,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="1536" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="6144" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerychaingunflame" particleamount="1" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -421,10 +421,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="1536" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="6144" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerychaingunflame" particleamount="1" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -459,10 +459,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="1536" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="6144" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerychaingunflame" particleamount="1" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -497,10 +497,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="1536" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="6144" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerychaingunflameshort" particleamount="1" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -535,10 +535,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunneryminigunflame" particleamount="1" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -572,10 +572,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="1536" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="6144" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunneryminigunflameshort" particleamount="1" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -609,10 +609,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="1536" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="6144" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunneryquadgunflame1" particleamount="1" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -650,10 +650,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunneryautocannonflame" particleamount="1" velocitymin="50" velocitymax="50" scalemin="1" scalemax="1" />
@@ -687,7 +687,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunneryautocannonflame" particleamount="1" velocitymin="50" velocitymax="50" scalemin="1" scalemax="1" />
@@ -721,7 +721,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunneryautocannonflame" particleamount="1" velocitymin="50" velocitymax="50" scalemin="1" scalemax="1" />
@@ -758,10 +758,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_thin.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerymicrosslflame" particleamount="2" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -790,7 +790,7 @@
     <StaticBody width="80" radius="80" />
     <ItemContainer hideitems="true" drawinventory="true" capacity="1" slotsperrow="6" canbeselected="true" characterusable="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="ekgunnery_chaingunammo" />
+      <Containable items="ekgunnery_chaingunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
 		<RequiredItem items="ekgunnery_chaingunammo" type="Contained" />
         <Use />
@@ -810,7 +810,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerymicrosslflame" particleamount="2" velocitymin="50" velocitymax="100" scalemin="1" scalemax="1" />
@@ -844,10 +844,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerymediumsslflame" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -880,10 +880,10 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <!--<LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="Mods/EK Gunnery/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>-->
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_gigantic.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="ekgunnerymediumsslflame2" particleamount="1" velocitymin="50" velocitymax="100" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_uniqueturrets.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_uniqueturrets.xml
index b45f91a2..656ade21 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_uniqueturrets.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390126010/Items/Weapons/ekgunnery_uniqueturrets.xml	
@@ -33,7 +33,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashcoilgun" particleamount="1" velocitymin="50" velocitymax="100" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Command/custom_commandterminal.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Command/custom_commandterminal.xml
index 65a6c5d8..1a17d56e 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Command/custom_commandterminal.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Command/custom_commandterminal.xml	
@@ -6,7 +6,7 @@
     <!--
 	<BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,256,288,240" depth="0.8" maxcondition="80" fadein="true" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,512,288,240" depth="0.8" maxcondition="0" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="256,320,288,240" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
 	-->
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Command/lazy_navterminal.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Command/lazy_navterminal.xml
index 3f790045..e8a05181 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Command/lazy_navterminal.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Command/lazy_navterminal.xml	
@@ -12,11 +12,11 @@
       <MaintainPosIndicator texture="Content/Items/Command/NavUI.png" sourcerect="50,0,60,61" />
       <MaintainPosOriginIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,0,50,54" />
       <SteeringIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,135,362,16" origin="0,0.5" />
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,0,384,304" origin="0.5,0.6" alpha="1.0" />
       </LightComponent>
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" blinkfrequency="1" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" blinkfrequency="1" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="400,0,384,304" origin="0.5,0.6" alpha="1.0" />
       </LightComponent>
@@ -113,11 +113,11 @@
       <MaintainPosIndicator texture="Content/Items/Command/NavUI.png" sourcerect="50,0,60,61" />
       <MaintainPosOriginIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,0,50,54" />
       <SteeringIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,135,362,16" origin="0,0.5" />
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,0,384,304" origin="0.5,0.6" alpha="1.0" />
       </LightComponent>
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" blinkfrequency="1" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" blinkfrequency="1" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="400,0,384,304" origin="0.5,0.6" alpha="1.0" />
       </LightComponent>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Containers/custom_storagecontainers.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Containers/custom_storagecontainers.xml
index 631529d5..1023d2aa 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Containers/custom_storagecontainers.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Containers/custom_storagecontainers.xml	
@@ -23,9 +23,9 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="power_in" displayname="connection.powerin" />
     </ConnectionPanel>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="5" maxstacksize="1" slotsperrow="5" itempos="132,-44" iteminterval="0,-65" itemrotation="0" containedspritedepth="0.83" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="11" maxstacksize="2" slotsperrow="4" itempos="132,-44" iteminterval="0,-65" itemrotation="0" containedspritedepth="0.83" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="deepdiving,divingsuit,abyssdivingsuit,combatdivingsuit,pucs,slipsuit" />
+      <Containable items="deepdiving,divingsuit,abyssdivingsuit,combatdivingsuit,pucs,slipsuit,ammobox,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekdockyard_divingsuitlocker_secure" tags="container,divingsuitcontainer,divingsuitcontainerwindow" pickdistance="50" scale="0.5">
@@ -49,48 +49,48 @@
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="0,0" iteminterval="0,0" canbeselected="true" msg="ItemMsgInteractSelect">
       <RequiredItem items="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="deepdiving,divingsuit,abyssdivingsuit,combatdivingsuit,pucs,slipsuit" />
+      <Containable items="deepdiving,divingsuit,abyssdivingsuit,combatdivingsuit,pucs,slipsuit,ammobox,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <!-- Cargo Logistics -->
   <Item name="" identifier="ekdockyard_cargocompartment_style1" tags="container,crateshelf,cargocontainer" linkable="true" pickdistance="150" scale="0.5">
     <Sprite texture="%ModDir%/Items/Containers/variants_cargocompartments.png" depth="0.8" sourcerect="0,0,320,416" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Containers/variants_cargocompartments.png" depth="0.85" sourcerect="336,0,288,416" origin="0.5,0.5" />
-    <ItemContainer capacity="8" maxstacksize="1" slotsperrow="4" canbeselected="true" hideitems="false" itempos="92,-368" iteminterval="136,105" itemsperrow="2" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
+    <ItemContainer capacity="18" maxstacksize="2" slotsperrow="5" canbeselected="true" hideitems="false" itempos="92,-368" iteminterval="136,105" itemsperrow="2" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
       <GuiFrame relativesize="0.25,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource" />
+      <Containable items="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekdockyard_cargocompartment_style2" tags="container,crateshelf,cargocontainer" linkable="true" pickdistance="150" scale="0.5">
     <Sprite texture="%ModDir%/Items/Containers/variants_cargocompartments.png" depth="0.8" sourcerect="0,0,320,208" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Containers/variants_cargocompartments.png" depth="0.85" sourcerect="640,208,288,208" origin="0.5,0.5" />
-    <ItemContainer capacity="4" maxstacksize="1" slotsperrow="4" canbeselected="true" hideitems="false" itempos="92,-158" iteminterval="136,105" itemsperrow="2" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82">
+    <ItemContainer capacity="9" maxstacksize="2" slotsperrow="3" canbeselected="true" hideitems="false" itempos="92,-158" iteminterval="136,105" itemsperrow="2" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82">
       <GuiFrame relativesize="0.25,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource" />
+      <Containable items="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekdockyard_cargocompartment_style3" tags="container,crateshelf,cargocontainer" linkable="true" pickdistance="150" scale="0.5">
     <Sprite texture="%ModDir%/Items/Containers/variants_cargocompartments.png" depth="0.8" sourcerect="640,0,624,208" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Containers/variants_cargocompartments.png" depth="0.85" sourcerect="640,208,592,208" origin="0.5,0.5" />
-    <ItemContainer capacity="8" maxstacksize="1" slotsperrow="4" canbeselected="true" hideitems="false" itempos="86,-158" iteminterval="150,105" itemsperrow="4" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
+    <ItemContainer capacity="18" maxstacksize="2" slotsperrow="5" canbeselected="true" hideitems="false" itempos="86,-158" iteminterval="150,105" itemsperrow="4" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
       <GuiFrame relativesize="0.25,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource" />
+      <Containable items="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekdockyard_cargocompartment_style4" tags="container,crateshelf,cargocontainer" linkable="true" pickdistance="150" scale="0.5">
     <Sprite texture="%ModDir%/Items/Containers/variants_cargocompartments.png" depth="0.8" sourcerect="640,0,624,104" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Containers/variants_cargocompartments.png" depth="0.85" sourcerect="640,208,592,104" origin="0.5,0.5" />
-    <ItemContainer capacity="4" maxstacksize="1" slotsperrow="4" canbeselected="true" hideitems="false" itempos="86,-54" iteminterval="150,0" itemsperrow="4" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
+    <ItemContainer capacity="9" maxstacksize="2" slotsperrow="3" canbeselected="true" hideitems="false" itempos="86,-54" iteminterval="150,0" itemsperrow="4" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
       <GuiFrame relativesize="0.25,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource" />
+      <Containable items="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekdockyard_cargocompartment_style5" tags="container,crateshelf,cargocontainer" linkable="true" pickdistance="150" scale="0.5">
     <Sprite texture="%ModDir%/Items/Containers/variants_cargocompartments.png" depth="0.8" sourcerect="0,0,320,104" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Containers/variants_cargocompartments.png" depth="0.85" sourcerect="640,208,288,104" origin="0.5,0.5" />
-    <ItemContainer capacity="2" maxstacksize="1" slotsperrow="2" canbeselected="true" hideitems="false" itempos="92,-54" iteminterval="136,0" itemsperrow="2" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82">
+    <ItemContainer capacity="4" maxstacksize="2" slotsperrow="2" canbeselected="true" hideitems="false" itempos="92,-54" iteminterval="136,0" itemsperrow="2" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82">
       <GuiFrame relativesize="0.25,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource" />
+      <Containable items="crate,ek_ammocrate_small,coilgunammobox,coilgunammo,chaingunammo,pulselaserammo,ammobox,depthchargeammo,ita_cratebulk,duffelbag,ita_duffelbag1,ek_densifiedresource,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekdockyard_cargocompartment_freezer1" tags="container,crateshelf,cargocontainer" linkable="true" pickdistance="150" scale="0.5" waterproof="true">
@@ -104,12 +104,12 @@
       <AnimationConditional IsActive="True" targetitemcomponent="LightComponent" />
       <AnimationConditional Voltage="gt 0.5" targetitemcomponent="LightComponent" />
     </DecorativeSprite>
-    <ItemContainer capacity="8" maxstacksize="1" slotsperrow="4" canbeselected="true" hideitems="false" itempos="98,-368" iteminterval="138,105" itemsperrow="2" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
+    <ItemContainer capacity="18" maxstacksize="2" slotsperrow="5" canbeselected="true" hideitems="false" itempos="98,-368" iteminterval="138,105" itemsperrow="2" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
       <GuiFrame relativesize="0.25,0.3" anchor="Center" style="ItemUI" />
       <Containable identifiers="crate,ita_cratebulk,cratetall,ita_eggcrate,ita_eggcrate2,ek_crateperishable" />
       <StatusEffect type="Always" targettype="Contained" targets="ita_eggcrate2" Condition="12.5" />
     </ItemContainer>
-    <LightComponent range="10.0" lightcolor="10,10,10,0" powerconsumption="400" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="10,10,10,0" powerconsumption="400" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Containers/variants_cargocompartments.png" depth="0.025" sourcerect="0,418,1,1" origin="0.5,0.5" alpha="1.0" />
       <StatusEffect type="OnActive" targettype="Contained" targets="ek_crateperishable,ita_eggcrate" Condition="0.15" />
       <StatusEffect type="OnActive" targettype="Contained" targets="ita_eggcrate2" Condition="2.55" />
@@ -139,10 +139,10 @@
   <Item name="" identifier="ekdockyard_weaponholder_secure" tags="weaponholder" scale="0.5">
     <Sprite texture="%ModDir%/Items/Containers/containers1.png" depth="0.85" sourcerect="0,64,86,86" canflipx="false" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Containers/containers1.png" depth="0.5" sourcerect="0,0,128,48" canflipx="false" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="1" itempos="46,-47" iteminterval="0,0" itemrotation="90" containedspritedepth="0.84" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="1" itempos="46,-47" iteminterval="0,0" itemrotation="90" containedspritedepth="0.84" canbeselected="true" msg="ItemMsgInteractSelect">
       <RequiredItem items="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="mountableweapon" />
+      <Containable items="mountableweapon,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <!-- Logistics System -->
@@ -151,9 +151,9 @@
 		description="" 
 		linkable="true" displaysidebysidewhenlinked="true" allowedlinks="ekdockyard_ioport_logistics" pickdistance="150" scale="0.5" waterproof="true" fireproof="true" explosiondamagemultiplier="0.1" spritecolor="200,200,200,255">
     <Sprite texture="Mods/EK Gunnery/Items/Containers/ekgunnery_containers.png" depth="0.84" sourcerect="528,0,400,208" origin="0.5,0.5" />
-    <ItemContainer autofill="False" capacity="2" slotsperrow="2" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer autofill="False" capacity="4" slotsperrow="2" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.15,0.35" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem" />
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   -->
@@ -161,9 +161,9 @@
   <Item name="" identifier="ekdockyard_fuelstoragetank1" tags="container" scale="0.5">
     <Sprite texture="Content/Items/Containers/containers.png" depth="0.85" sourcerect="116,546,86,86" canflipx="false" origin="0.5,0.5"/>
 	  
-    <PowerContainer capacity="100.0" maxrechargespeed="0" maxoutput="0" canbeselected="false" msg="ItemMsgInteractSelect" charge="0" />
+    <PowerContainer capacity="220" maxrechargespeed="0" maxoutput="0" canbeselected="false" msg="ItemMsgInteractSelect" charge="0" />
 	  
-	<ItemContainer autofill="False" hideitems="true" drawinventory="true" capacity="2" maxstacksize="1" canbeselected="true" msg="ItemMsgInteractSelect" >
+	<ItemContainer autofill="False" hideitems="true" drawinventory="true" capacity="4" maxstacksize="2" canbeselected="true" msg="ItemMsgInteractSelect" >
       <Containable identifiers="ekdockyard_generatorfuel" />
       <SlotIcon slotindex="0" texture="%ModDir%/UI/ekdockyard_sloticons.png" sourcerect="0,0,64,64" origin="0.5,0.45" />
       <SlotIcon slotindex="1" texture="%ModDir%/UI/ekdockyard_sloticons.png" sourcerect="64,0,64,64" origin="0.5,0.45" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Door/custom_dockingports.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Door/custom_dockingports.xml
index 238f2153..bf52ae1a 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Door/custom_dockingports.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Door/custom_dockingports.xml	
@@ -18,11 +18,11 @@
     </DockingPort>
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
-    <LightComponent range="10.0" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="0,0,113,209" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="0,0,113,209" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -59,11 +59,11 @@
     </DockingPort>
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
-    <LightComponent range="10.0" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="126,2,128,112" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="126,2,128,112" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -148,11 +148,11 @@
     </DockingPort>
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
-    <LightComponent range="10.0" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="168,136,80,208" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="168,136,80,208" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -184,11 +184,11 @@
     </DockingPort>
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
-    <LightComponent range="10.0" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="560,2,136,88" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="560,2,136,88" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -219,11 +219,11 @@
     </DockingPort>
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
-    <LightComponent range="10.0" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="168,136,80,208" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="168,136,80,208" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -254,11 +254,11 @@
     </DockingPort>
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
-    <LightComponent range="10.0" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="560,2,136,88" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="560,2,136,88" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -337,11 +337,11 @@
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
     <!--
-    <LightComponent range="10.0" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="168,136,80,208" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="168,136,80,208" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -375,11 +375,11 @@
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
     <!--
-	<LightComponent range="10.0" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+	<LightComponent range="40" lightcolor="255,0,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="560,2,136,88" depth="0.9" origin="0.5,0.5" alpha="1.0"  />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="%ModDir%/Items/Door/dockingports_custom.png" sourcerect="560,2,136,88" depth="0.9" origin="0.5,0.5" alpha="1.0"  />
     </LightComponent>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_devices.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_devices.xml
index 5323a4e9..35f37317 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_devices.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_devices.xml	
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="ekdockyard_customwire_pipe1" category="Electrical" Tags="smallitem,wire" maxstacksize="8" spritecolor="175,175,175,255" InventoryIconColor="175,175,175,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ekdockyard_customwire_pipe1" category="Electrical" Tags="smallitem,wire" maxstacksize="16" spritecolor="175,175,175,255" InventoryIconColor="175,175,175,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="13">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
     <!--
@@ -38,13 +38,13 @@
   <Item name="" identifier="ekdockyard_customwire_pipe1orange" variantof="ekdockyard_customwire_pipe1" spritecolor="200,125,50,255" InventoryIconColor="200,125,50,255"></Item>
   <Item name="" identifier="ekdockyard_customwire_pipe1green" variantof="ekdockyard_customwire_pipe1" spritecolor="50,125,100,255" InventoryIconColor="50,125,100,255"></Item>
   <Item name="" identifier="ekdockyard_customwire_pipe1black" variantof="ekdockyard_customwire_pipe1" spritecolor="75,75,75,255" InventoryIconColor="75,75,75,255"></Item>
-  <Item name="" identifier="ekdockyard_customwire_pipe1bracket" category="Electrical" Tags="smallitem,logic" maxstacksize="8" spritecolor="125,125,125,255" InventoryIconColor="125,125,125,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ekdockyard_customwire_pipe1bracket" category="Electrical" Tags="smallitem,logic" maxstacksize="16" spritecolor="125,125,125,255" InventoryIconColor="125,125,125,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="3">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
     <!--
@@ -63,16 +63,16 @@
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
   </Item>
-  <Item name="" identifier="ekdockyard_portablesprinkler" aliases="ekdockyard_portablespinkler" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="1">
+  <Item name="" identifier="ekdockyard_portablesprinkler" aliases="ekdockyard_portablespinkler" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="2">
     <Sprite texture="%ModDir%/Items/Electricity/devices1.png" sourcerect="0,0,96,128" depth="0.55" origin="0.5,0.5" />
-    <RepairTool wateramount="10.0" extinguishamount="30.0" range="350" powerconsumption="25" barrelpos="0,0" barrelrotation="270" spread="45" unskilledspread="45" targetstructures="false" hititems="false" characterusable="false" requireaimtouse="false" usablein="air">
+    <RepairTool wateramount="10.0" extinguishamount="30.0" range="1400" powerconsumption="25" barrelpos="0,0" barrelrotation="270" spread="45" unskilledspread="45" targetstructures="false" hititems="false" characterusable="false" requireaimtouse="false" usablein="air">
       <!--
       <ParticleEmitter particle="waterdrop" velocitymin="0.0" velocitymax="700.0" particlespersecond="50" anglemin="-45" anglemax="45" />
 	  -->
       <ParticleEmitter particle="ekdockyard_sprinklerdrops" velocitymin="0.0" velocitymax="700.0" particlespersecond="50" anglemin="-45" anglemax="45" />
       <sound file="%ModDir%/Items/Electricity/sprinkler_loop.ogg" type="OnUse" range="500" loop="true" />
     </RepairTool>
-    <LightComponent lightcolor="255,255,255,0" range="10.0" powerconsumption="25" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent lightcolor="255,255,255,0" range="40" powerconsumption="25" IsOn="false" castshadows="false" allowingameediting="false">
       <StatusEffect type="OnActive" target="This">
         <UseItem />
       </StatusEffect>
@@ -85,9 +85,9 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_vacuumpumpsmall" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="1">
+  <Item name="" identifier="ekdockyard_vacuumpumpsmall" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="2">
     <Sprite texture="%ModDir%/Items/Electricity/devices1.png" depth="0.91" sourcerect="0,128,112,112" />
-    <LightComponent lightcolor="2,2,2,2" range="2.0" minvoltage="0.5" powerconsumption="100" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent lightcolor="2,2,2,2" range="8" minvoltage="0.5" powerconsumption="100" IsOn="false" castshadows="false" allowingameediting="false">
       <StatusEffect type="OnActive" target="Hull" Oxygen="-10000"></StatusEffect>
       <StatusEffect type="OnActive" targettype="This">
         <sound file="%ModDir%/Items/Electricity/vacuumpump_small.ogg" type="OnActive" range="500" loop="true" />
@@ -102,9 +102,9 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_vacuumpumplarge" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="1">
+  <Item name="" identifier="ekdockyard_vacuumpumplarge" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="2">
     <Sprite texture="%ModDir%/Items/Electricity/devices1.png" depth="0.91" sourcerect="0,128,112,112" />
-    <LightComponent lightcolor="2,2,2,2" range="2.0" minvoltage="0.5" powerconsumption="200" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent lightcolor="2,2,2,2" range="8" minvoltage="0.5" powerconsumption="200" IsOn="false" castshadows="false" allowingameediting="false">
       <StatusEffect type="OnActive" target="Hull" Oxygen="-20000"></StatusEffect>
       <StatusEffect type="OnActive" targettype="This">
         <sound file="%ModDir%/Items/Electricity/vacuumpump_large.ogg" type="OnActive" range="750.0" loop="true" />
@@ -119,7 +119,7 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_firejet" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="1">
+  <Item name="" identifier="ekdockyard_firejet" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="2">
     <Sprite texture="%ModDir%/Items/Electricity/devices1.png" sourcerect="96,0,96,128" depth="0.55" origin="0.5,0.5" />
     <!-- Debug
 	<BrokenSprite texture="%ModDir%/Items/Electricity/devices1.png" sourcerect="96,0,96,112" depth="0.55" maxcondition="75" />
@@ -136,7 +136,7 @@
         <Conditional condition="lt 90" />
       </StatusEffect>
     </ItemComponent>
-    <RepairTool firedamage="30.0" range="350" powerconsumption="125" barrelpos="0,0" fireprobability="0.15" barrelrotation="270" spread="35" unskilledspread="35" targetstructures="false" hititems="false" characterusable="false" requireaimtouse="false" usablein="air">
+    <RepairTool firedamage="30.0" range="1400" powerconsumption="125" barrelpos="0,0" fireprobability="0.15" barrelrotation="270" spread="35" unskilledspread="35" targetstructures="false" hititems="false" characterusable="false" requireaimtouse="false" usablein="air">
       <!--
       <ParticleEmitter particle="flamethrower" particlespersecond="10" anglemin="0" anglemax="0" velocitymin="500" velocitymax="700" highqualitycollisiondetection="true"/>
       <ParticleEmitter particle="flamethrowersmoke" particlespersecond="10" anglemin="0" anglemax="0" velocitymin="200" velocitymax="500"/>
@@ -150,7 +150,7 @@
       </StatusEffect>
       <StatusEffect type="OnUse" target="Hull" Oxygen="-10000" />
     </RepairTool>
-    <LightComponent lightcolor="255,125,50,150" range="200.0" flicker="0.6" flickerspeed="0.4" powerconsumption="125" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent lightcolor="255,125,50,150" range="800" flicker="0.6" flickerspeed="0.4" powerconsumption="125" IsOn="false" castshadows="false" allowingameediting="false">
       <StatusEffect type="OnActive" target="This">
         <UseItem />
       </StatusEffect>
@@ -164,7 +164,7 @@
       <output name="condition_out" displayname="connection.conditionout" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_firejet_radial" category="Equipment" Tags="signal" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="1">
+  <Item name="" identifier="ekdockyard_firejet_radial" category="Equipment" Tags="signal" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="2">
     <Sprite texture="%ModDir%/Items/Electricity/devices1.png" sourcerect="448,128,128,128" depth="0.55" origin="0.5,0.5" />
     <ItemComponent>
       <StatusEffect type="InWater" target="This" condition="0" setvalue="true" />
@@ -174,7 +174,7 @@
         <Conditional condition="lt 90" />
       </StatusEffect>
     </ItemComponent>
-    <LightComponent lightcolor="255,125,50,150" range="200.0" flicker="0.6" flickerspeed="0.4" powerconsumption="125" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent lightcolor="255,125,50,150" range="800" flicker="0.6" flickerspeed="0.4" powerconsumption="125" IsOn="false" castshadows="false" allowingameediting="false">
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="ekdockyard_flamejet_radial_glow" particlespersecond="20" anglemin="0" anglemax="360" velocitymin="0" velocitymax="250" scalemin="0.4" scalemax="0.6" distancemin="0" distancemax="25" />
         <ParticleEmitter particle="ekdockyard_flamejet_radial_flame" particlespersecond="30" anglemin="0" anglemax="360" velocitymin="0" velocitymax="500" scalemin="0.2" scalemax="0.3" distancemin="10" distancemax="35" />
@@ -199,7 +199,7 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_steamjet" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="1">
+  <Item name="" identifier="ekdockyard_steamjet" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="2">
     <Sprite texture="%ModDir%/Items/Electricity/devices1.png" sourcerect="480,0,96,128" depth="0.55" origin="0.5,0.5" />
     <ItemComponent>
       <StatusEffect type="InWater" target="This" condition="0" setvalue="true" />
@@ -209,7 +209,7 @@
         <Conditional condition="lt 90" />
       </StatusEffect>
     </ItemComponent>
-    <RepairTool firedamage="15.0" range="350" powerconsumption="125" barrelpos="0,0" fireprobability="0" barrelrotation="270" spread="35" unskilledspread="35" targetstructures="false" hititems="false" characterusable="false" requireaimtouse="false" usablein="air">
+    <RepairTool firedamage="15.0" range="1400" powerconsumption="125" barrelpos="0,0" fireprobability="0" barrelrotation="270" spread="35" unskilledspread="35" targetstructures="false" hititems="false" characterusable="false" requireaimtouse="false" usablein="air">
       <!--
       <ParticleEmitter particle="flamethrower" particlespersecond="10" anglemin="0" anglemax="0" velocitymin="500" velocitymax="700" highqualitycollisiondetection="true"/>
       <ParticleEmitter particle="flamethrowersmoke" particlespersecond="10" anglemin="0" anglemax="0" velocitymin="200" velocitymax="500"/>
@@ -225,7 +225,7 @@
         <ReduceAffliction type="alieninfection" amount="0.75" />
       </StatusEffect>
     </RepairTool>
-    <LightComponent lightcolor="255,255,255,0" range="10.0" powerconsumption="125" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent lightcolor="255,255,255,0" range="40" powerconsumption="125" IsOn="false" castshadows="false" allowingameediting="false">
       <StatusEffect type="OnActive" target="This">
         <UseItem />
       </StatusEffect>
@@ -238,7 +238,7 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_steamjet_radial" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="1">
+  <Item name="" identifier="ekdockyard_steamjet_radial" category="Equipment" Tags="signal" requireaimtouse="false" characterusable="false" Scale="0.32" impactsoundtag="impact_metal_light" maxstacksize="2">
     <Sprite texture="%ModDir%/Items/Electricity/devices1.png" sourcerect="448,256,128,128" depth="0.55" origin="0.5,0.5" />
     <ItemComponent>
       <StatusEffect type="InWater" target="This" condition="0" setvalue="true" />
@@ -248,7 +248,7 @@
         <Conditional condition="lt 90" />
       </StatusEffect>
     </ItemComponent>
-    <LightComponent lightcolor="255,255,255,0" range="10.0" powerconsumption="125" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent lightcolor="255,255,255,0" range="40" powerconsumption="125" IsOn="false" castshadows="false" allowingameediting="false">
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="ekdockyard_steamjet_radial_spray" particlespersecond="20" anglemin="0" anglemax="360" velocitymin="0" velocitymax="500" scalemin="0.4" scalemax="0.5" distancemin="0" distancemax="25" />
         <ParticleEmitter particle="extinguisher" particlespersecond="30" copyentityangle="true" anglemin="0" anglemax="360" velocitymin="250.0" velocitymax="750.0" />
@@ -282,7 +282,7 @@
       <Conditional target="LightComponent" IsOn="true" />
     </DecorativeSprite>
 	-->
-    <LightComponent lightcolor="255,255,255,0" range="10.0" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent lightcolor="255,255,255,0" range="40" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <!--<Sprite texture="%ModDir%/Items/Electricity/devices1.png" depth="0.90" sourcerect="112,128,88,88"/>-->
     </LightComponent>
     <Vent>
@@ -317,7 +317,7 @@
       <Conditional target="LightComponent" IsOn="true" />
     </DecorativeSprite>
 	-->
-    <LightComponent lightcolor="255,255,255,0" range="10.0" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent lightcolor="255,255,255,0" range="40" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <!--<Sprite texture="%ModDir%/Items/Electricity/devices1.png" depth="0.90" sourcerect="112,128,88,88"/>-->
     </LightComponent>
     <Vent>
@@ -340,7 +340,7 @@
     </ConnectionPanel>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="ekdockyard_switchboard" tags="logic,command" scale="0.5" category="Machine" linkable="true" allowedlinks="command">
@@ -510,7 +510,7 @@
   <Item name="Text Display (Long)" identifier="ekdockyard_textdisplaylong" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/devices1.png" depth="0.85" sourcerect="0,424,280,56" />
     <ItemLabel scrollable="true" padding="10,5,10,12" textcolor="1,1,1,1">
-      <LightComponent range="10.0" lightcolor="1.0,1.0,1.0,0.1" IsOn="true" castshadows="false">
+      <LightComponent range="40" lightcolor="1.0,1.0,1.0,0.1" IsOn="true" castshadows="false">
         <sprite texture="%ModDir%/Items/Electricity/devices1.png" sourcerect="0,480,280,56" depth="0.025" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
     </ItemLabel>
@@ -522,16 +522,16 @@
       <input name="set_text_color" displayname="connection.settextcolor" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_emergencysiren_legacy1" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_emergencysiren_legacy1" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -547,7 +547,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.66" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.66" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="%ModDir%/Items/Electricity/warningsiren_legacy1.ogg" type="OnActive" range="2000.0" loop="true" volume="0.75" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -561,16 +561,16 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_emergencysiren_legacy2" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_emergencysiren_legacy2" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -586,7 +586,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.0" pulsefrequency="3.5" pulseamount="1" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.0" pulsefrequency="3.5" pulseamount="1" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="%ModDir%/Items/Electricity/warningsiren_legacy2.ogg" type="OnActive" range="2000.0" loop="true" volume="0.75" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -600,16 +600,16 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_emergencysiren_legacy3" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_emergencysiren_legacy3" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -625,7 +625,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.76" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.76" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="%ModDir%/Items/Electricity/warningsiren_legacy3.ogg" type="OnActive" range="2000.0" loop="true" volume="0.75" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -640,16 +640,16 @@
     </ConnectionPanel>
   </Item>
   <!-- New siren sounds -->
-  <Item name="" identifier="ekdockyard_emergencysiren_ek1" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_emergencysiren_ek1" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -669,7 +669,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.66" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.66" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="%ModDir%/Items/Electricity/warningsiren_new1.ogg" type="OnActive" range="2000.0" loop="true" volume="0.75" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -683,16 +683,16 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_emergencysiren_ek2" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_emergencysiren_ek2" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -712,7 +712,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.66" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.66" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="%ModDir%/Items/Electricity/warningsiren_new2.ogg" type="OnActive" range="2000.0" loop="true" volume="0.75" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -726,16 +726,16 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_alarmbuzzer_ek1" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_alarmbuzzer_ek1" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -755,7 +755,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.66" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.66" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="%ModDir%/Items/Electricity/alarmbuzzer_new1.ogg" type="OnActive" range="2000.0" loop="true" volume="0.75" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -769,16 +769,16 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_emergencywarning_ek1" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_emergencywarning_ek1" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -808,16 +808,16 @@
       </input>
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_emergencywarning_ek2" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_emergencywarning_ek2" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -847,16 +847,16 @@
       </input>
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_emergencywarning_ek3" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_emergencywarning_ek3" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -886,16 +886,16 @@
       </input>
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_emergencywarning_ek4" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_emergencywarning_ek4" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -925,16 +925,16 @@
       </input>
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_emergencywarning_ek5" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_emergencywarning_ek5" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -964,16 +964,16 @@
       </input>
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_emergencywarning_ek6" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_emergencywarning_ek6" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -1003,16 +1003,16 @@
       </input>
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_beepwarning_ek1" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_beepwarning_ek1" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -1032,7 +1032,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.5" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.5" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="%ModDir%/Items/Electricity/warningsmall_new1.ogg" type="OnActive" range="500.0" loop="true" volume="0.5" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -1051,16 +1051,16 @@
       </input>
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_beepwarning_ek2" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_beepwarning_ek2" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -1080,7 +1080,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="1" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="1" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="%ModDir%/Items/Electricity/warningsmall_new2.ogg" type="OnActive" range="500" loop="true" volume="0.5" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -1099,16 +1099,16 @@
       </input>
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_beepwarning_ek3" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_beepwarning_ek3" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -1128,7 +1128,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.5" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.5" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="%ModDir%/Items/Electricity/warningsmall_new3.ogg" type="OnActive" range="500" loop="true" volume="0.5" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -1147,16 +1147,16 @@
       </input>
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_beepwarning_ek4" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_beepwarning_ek4" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -1176,7 +1176,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="1" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="1" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="%ModDir%/Items/Electricity/warningsmall_new4.ogg" type="OnActive" range="500" loop="true" volume="0.5" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -1195,16 +1195,16 @@
       </input>
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ekdockyard_beepwarning_ek5" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="ekdockyard_beepwarning_ek5" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" />
-      <Price storeidentifier="merchantmine" multiplier="1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" />
+      <Price storeidentifier="merchantmine" multiplier="3" />
     </Price>
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckreactorcab,wreckstoragecab,abandonedreactorcab" minamount="0" maxamount="2" spawnprobability="0.06" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="steel" />
@@ -1224,7 +1224,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.5" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" castshadows="false" blinkfrequency="0.5" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="%ModDir%/Items/Electricity/warningsmall_new5.ogg" type="OnActive" range="500" loop="true" volume="0.5" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -1246,10 +1246,10 @@
   <Item name="" identifier="ekdockyard_integraldetonator" category="Equipment" Tags="detonator" Scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <Sprite texture="%ModDir%/Items/Electricity/devices1.png" depth="0.8" sourcerect="352,0,64,64" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Electricity/devices1.png" depth="0.78" sourcerect="416,0,48,80" />
-    <ItemContainer canbeselected="true" capacity="1" maxstacksize="1" itempos="32,-32" hideitems="false" containedstateindicatorstyle="explosive">
+    <ItemContainer canbeselected="true" capacity="1" maxstacksize="2" itempos="32,-32" hideitems="false" containedstateindicatorstyle="explosive">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <RequiredItem items="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
-      <Containable items="explosive" />
+      <Containable items="explosive,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -1264,7 +1264,7 @@
   <!-- Remote Operation Terminals -->
   <Item name="" identifier="ekdockyard_ioterminal_reactor" tags="container" category="Machine" linkable="true" displaysidebysidewhenlinked="false" allowedlinks="reactor,generator" pickdistance="150" scale="0.5" spritecolor="245,240,230,255">
     <Sprite texture="%ModDir%/Items/Electricity/machineterminals1.png" depth="0.8" sourcerect="0,0,256,160" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Electricity/machineterminals1.png" depth="0.025" sourcerect="259,4,218,104" origin="0.5,0.65" alpha="1.0" />
     </LightComponent>
     <CustomInterface msg="ItemMsgInteractSelect" selectkey="Select" canbeselected="true" allowuioverlap="true">
@@ -1286,7 +1286,7 @@
   </Item>
   <Item name="" identifier="ekdockyard_ioterminal_fabricator" tags="container" category="Machine" linkable="true" displaysidebysidewhenlinked="false" allowedlinks="fabricator,medicalfabricator" pickdistance="150" scale="0.5" spritecolor="200,200,200,255">
     <Sprite texture="%ModDir%/Items/Electricity/machineterminals1.png" depth="0.8" sourcerect="0,160,256,160" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Electricity/machineterminals1.png" depth="0.025" sourcerect="260,164,104,64" origin="1.04,0.92" alpha="1.0" />
     </LightComponent>
     <CustomInterface msg="ItemMsgInteractSelect" selectkey="Select" canbeselected="true" allowuioverlap="true">
@@ -1308,7 +1308,7 @@
   </Item>
   <Item name="" identifier="ekdockyard_ioterminal_deconstructor" tags="container" category="Machine" linkable="true" displaysidebysidewhenlinked="false" allowedlinks="deconstructor" pickdistance="150" scale="0.5" spritecolor="190,210,200,255">
     <Sprite texture="%ModDir%/Items/Electricity/machineterminals1.png" depth="0.8" sourcerect="368,160,144,160" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Electricity/machineterminals1.png" depth="0.025" sourcerect="260,236,56,56" origin="0.5,0.4" alpha="1.0" />
     </LightComponent>
     <CustomInterface msg="ItemMsgInteractSelect" selectkey="Select" canbeselected="true" allowuioverlap="true">
@@ -1367,7 +1367,7 @@
       <MaintainPosIndicator texture="Content/Items/Command/NavUI.png" sourcerect="50,0,60,61" />
       <MaintainPosOriginIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,0,50,54" />
       <SteeringIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,135,362,16" origin="0,0.5" />
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
         <sprite texture="%ModDir%/Items/Electricity/devices2.png" depth="0.025" sourcerect="160,16,96,64" origin="0.5,0.8" alpha="1.0" />
       </LightComponent>
       <!-- <RequiredSkill identifier="weapons" level="50" /> -->
@@ -1481,10 +1481,10 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="ekdockyard_shockcoil1" category="Equipment" Tags="dischargecoil" requireaimtouse="false" characterusable="false" Scale="0.5" impactsoundtag="impact_metal_light" maxstacksize="1">
+  <Item name="" identifier="ekdockyard_shockcoil1" category="Equipment" Tags="dischargecoil" requireaimtouse="false" characterusable="false" Scale="0.5" impactsoundtag="impact_metal_light" maxstacksize="2">
     <Sprite texture="%ModDir%/Items/Electricity/devices1.png" depth="0.91" sourcerect="336,192,96,96" />
     <ItemContainer hideitems="true" drawinventory="true" capacity="1" canbeselected="false" characterusable="true" SpawnWithId="ekdockyard_dummyprojectile">
-      <Containable items="ekdockyard_dummyprojectile" />
+      <Containable items="ekdockyard_dummyprojectile,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="Always" target="Contained">
         <SpawnItem identifier="ekdockyard_dummyprojectile" spawnposition="ThisInventory" />
       </StatusEffect>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_gauges.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_gauges.xml
index c63de777..a0776274 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_gauges.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_gauges.xml	
@@ -69,7 +69,7 @@
   <Item name="" identifier="ekdockyard_customgauge_engine1a" category="Electrical,Decorative" tags="smallitem" focusonselected="false" linkable="false" Scale="0.5" spritecolor="165,160,150,255">
     <Sprite texture="%ModDir%/Items/Electricity/gauges2_engine.png" depth="0.8" sourcerect="0,0,128,128" origin="0.5, 0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Electricity/gauges2_engine.png" sourcerect="0,128,96,96" depth="0.815" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Electricity/gauges2_engine.png" depth="0.025" sourcerect="0,224,96,96" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Turret canbeselected="false" characterusable="false" linkable="false" barrelpos="64,64" reload="999999999" rotationlimits="0,360" powerconsumption="10000.0" showchargeindicator="false" showprojectileindicator="false" springstiffnesslowskill="25" springstiffnesshighskill="25" springdampinglowskill="10" springdampinghighskill="10" rotationspeedlowskill="90" rotationspeedhighskill="90">
@@ -85,7 +85,7 @@
   <Item name="" identifier="ekdockyard_customgauge_engine1b" category="Electrical,Decorative" tags="smallitem" focusonselected="false" linkable="false" Scale="0.5" spritecolor="165,160,150,255">
     <Sprite texture="%ModDir%/Items/Electricity/gauges2_engine.png" depth="0.8" sourcerect="128,0,128,128" origin="0.5, 0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Electricity/gauges2_engine.png" sourcerect="0,128,96,96" depth="0.815" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Electricity/gauges2_engine.png" depth="0.025" sourcerect="128,224,96,96" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Turret canbeselected="false" characterusable="false" linkable="false" barrelpos="64,64" reload="999999999" rotationlimits="0,360" powerconsumption="10000.0" showchargeindicator="false" showprojectileindicator="false" springstiffnesslowskill="25" springstiffnesshighskill="25" springdampinglowskill="10" springdampinghighskill="10" rotationspeedlowskill="90" rotationspeedhighskill="90">
@@ -110,7 +110,7 @@
   <Item name="" identifier="ekdockyard_customgauge_turret1a" category="Electrical,Decorative" tags="smallitem" focusonselected="false" linkable="false" Scale="0.5" spritecolor="165,160,150,255">
     <Sprite texture="%ModDir%/Items/Electricity/gauges2_turretclock.png" depth="0.8" sourcerect="0,0,128,128" origin="0.5, 0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Electricity/gauges2_turretclock.png" sourcerect="0,128,96,96" depth="0.815" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Electricity/gauges2_turretclock.png" depth="0.025" sourcerect="0,224,96,96" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Turret canbeselected="false" characterusable="false" linkable="false" barrelpos="64,64" reload="999999999" rotationlimits="0,360" powerconsumption="10000.0" showchargeindicator="false" showprojectileindicator="false" springstiffnesslowskill="25" springstiffnesshighskill="25" springdampinglowskill="10" springdampinghighskill="10" rotationspeedlowskill="90" rotationspeedhighskill="90">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_lights.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_lights.xml
index d96fbbf9..ea903aa0 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_lights.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_lights.xml	
@@ -4,7 +4,7 @@
   <Item name="Advanced Emergency Light" identifier="ekdockyard_emergencylightadvanced" category="Legacy" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="0,64,96,24" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,0.0,0.0,0.1" range="250.0" IsOn="true" powerconsumption="0" castlights="false">
+    <LightComponent lightcolor="1.0,0.0,0.0,0.1" range="1000" IsOn="true" powerconsumption="0" castlights="false">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="0,64,96,24" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -21,7 +21,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_vanillalightadvanced01" category="Legacy" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="0,0,112,64" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="0,0,112,64" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -38,7 +38,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_vanillalightadvanced02" category="Legacy" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="112,0,112,88" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="112,0,112,88" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -55,7 +55,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_vanillalightadvanced03" category="Legacy" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="0,88,64,96" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="0,88,64,96" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -72,7 +72,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_vanillalightadvanced04" category="Legacy" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="64,88,64,96" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="64,88,64,96" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -89,7 +89,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_vanillalightadvanced05" category="Legacy" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="128,88,64,96" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="128,88,64,96" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -106,7 +106,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_lightadvanced01" category="Legacy" Tags="smallitem,light" scale="0.25">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced2.png" sourcerect="0,0,128,128" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced2light.png" sourcerect="0,0,128,128" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -123,7 +123,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_lightadvanced02" category="Legacy" Tags="smallitem,light" scale="0.25">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced2.png" sourcerect="0,128,192,64" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced2light.png" sourcerect="0,128,192,64" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -140,7 +140,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_lightadvanced03" category="Legacy" Tags="smallitem,light" scale="0.25">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced2.png" sourcerect="0,192,192,48" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced2light.png" sourcerect="0,192,192,48" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -157,7 +157,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_lightadvanced04" category="Legacy" Tags="smallitem,light" scale="0.25">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced2.png" sourcerect="192,192,96,48" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced2light.png" sourcerect="192,192,96,48" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -174,7 +174,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_lightadvanced05" category="Legacy" Tags="smallitem,light" scale="0.25">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced2.png" sourcerect="0,240,288,48" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced2light.png" sourcerect="0,240,288,48" alpha="1.0" origin="0.5,0.4" />
     </LightComponent>
@@ -193,7 +193,7 @@
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" depth="0.01" sourcerect="0,192,64,64" />
     <Turret canbeselected="true" linkable="false" barrelpos="32,32" reload="999999999" rotationlimits="180,360" powerconsumption="10000.0" showchargeindicator="false" showprojectileindicator="false" springstiffnesslowskill="25" springstiffnesshighskill="25" springdampinglowskill="5" springdampinghighskill="5" rotationspeedlowskill="0.5" rotationspeedhighskill="0.5">
       <BarrelSprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="64,192,32,40" origin="0.5, 0.5" />
-      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="500" IsOn="true" powerconsumption="5" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="2000" IsOn="true" powerconsumption="5" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_siren.png" origin="0.5,0.5" size="1.0,1.0" />
       </LightComponent>
     </Turret>
@@ -209,7 +209,7 @@
   <!-- Custom Indicator Lights -->
   <Item name="Indicator Light" identifier="ekdockyard_lightindicator1" category="Electrical" Tags="light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_indicators1.png" depth="0.8" sourcerect="0,0,48,48" origin="0.5,0.5" />
-    <LightComponent range="20" canbeselected="true" color="255,255,255,255" castshadows="false">
+    <LightComponent range="80" canbeselected="true" color="255,255,255,255" castshadows="false">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_indicators1.png" sourcerect="0,48,48,48" origin="0.5,0.5" />
     </LightComponent>
@@ -223,7 +223,7 @@
   </Item>
   <Item name="Indicator Light" identifier="ekdockyard_lightindicator2" category="Electrical" Tags="light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_indicators1.png" depth="0.8" sourcerect="48,0,112,48" origin="0.5,0.5" />
-    <LightComponent range="20" canbeselected="true" color="255,255,255,255" castshadows="false">
+    <LightComponent range="80" canbeselected="true" color="255,255,255,255" castshadows="false">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_indicators1.png" sourcerect="48,48,112,48" origin="0.5,0.5" />
     </LightComponent>
@@ -237,7 +237,7 @@
   </Item>
   <Item name="Indicator Light" identifier="ekdockyard_lightindicator3" category="Electrical" Tags="light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_indicators1.png" depth="0.8" sourcerect="160,0,48,48" origin="0.5,0.5" />
-    <LightComponent range="20" canbeselected="true" color="255,255,255,255" castshadows="false">
+    <LightComponent range="80" canbeselected="true" color="255,255,255,255" castshadows="false">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_indicators1.png" sourcerect="160,48,48,48" origin="0.5,0.5" />
     </LightComponent>
@@ -252,7 +252,7 @@
   <!-- Outpost Lights -->
   <Item name="" identifier="ekdockyard_opdeco_surgicallights" nameidentifier="opdeco_surgicallights" width="272" height="128" texturescale="1.0,1.0" scale="0.5" noninteractable="true" category="Decorative">
     <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="752,0,272,128" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,255" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,255" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="480,0,272,128" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
@@ -265,7 +265,7 @@
   </Item>
   <Item name="" identifier="ekdockyard_opdeco_lighttower" nameidentifier="op_lighttower" width="176" height="352" texturescale="1.0,1.0" scale="0.5" category="Decorative" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/TunnelWalls.png" sourcerect="849,1697,176,352" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="160.0" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="640" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/TunnelWalls.png" sourcerect="671,1697,176,352" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
@@ -278,7 +278,7 @@
   </Item>
   <Item name="" identifier="ekdockyard_opdeco_lighttower2" nameidentifier="op_lighttower" width="176" height="352" texturescale="1.0,1.0" scale="0.5" category="Decorative" noninteractable="true">
     <sprite texture="Content/Map/Outposts/Art/TunnelWalls.png" sourcerect="849,1697,176,52" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="160.0" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="640" lightcolor="255,234,181,200" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/TunnelWalls.png" sourcerect="671,1697,176,52" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_lights_outputtest.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_lights_outputtest.xml
index 688ecd12..90471993 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_lights_outputtest.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_lights_outputtest.xml	
@@ -3,7 +3,7 @@
   <Item name="Advanced Emergency Light" identifier="ekdockyard_emergencylightadvanced" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="0,64,96,24" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,0.0,0.0,0.1" range="250.0" IsOn="true" powerconsumption="0" castlights="false">
+    <LightComponent lightcolor="1.0,0.0,0.0,0.1" range="1000" IsOn="true" powerconsumption="0" castlights="false">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="0,64,96,24" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -20,7 +20,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_vanillalightadvanced01" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="0,0,112,64" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="0,0,112,64" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -37,7 +37,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_vanillalightadvanced02" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="112,0,112,88" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="112,0,112,88" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -54,7 +54,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_vanillalightadvanced03" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="0,88,64,96" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="0,88,64,96" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -71,7 +71,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_vanillalightadvanced04" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="64,88,64,96" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="64,88,64,96" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -88,7 +88,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_vanillalightadvanced05" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" sourcerect="128,88,64,96" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced1light.png" sourcerect="128,88,64,96" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -105,7 +105,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_lightadvanced01" category="Electrical" Tags="smallitem,light" scale="0.25">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced2.png" sourcerect="0,0,128,128" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced2light.png" sourcerect="0,0,128,128" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -122,7 +122,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_lightadvanced02" category="Electrical" Tags="smallitem,light" scale="0.25">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced2.png" sourcerect="0,128,192,64" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced2light.png" sourcerect="0,128,192,64" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -139,7 +139,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_lightadvanced03" category="Electrical" Tags="smallitem,light" scale="0.25">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced2.png" sourcerect="0,192,192,48" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced2light.png" sourcerect="0,192,192,48" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -156,7 +156,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_lightadvanced04" category="Electrical" Tags="smallitem,light" scale="0.25">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced2.png" sourcerect="192,192,96,48" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced2light.png" sourcerect="192,192,96,48" alpha="1.0" origin="0.5,0.5" />
     </LightComponent>
@@ -173,7 +173,7 @@
   <Item name="Advanced Lamp" identifier="ekdockyard_lightadvanced05" category="Electrical" Tags="smallitem,light" scale="0.25">
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced2.png" sourcerect="0,240,288,48" depth="0.8" origin="0.5,0.5" />
     <PowerTransfer canbeselected="false" msg="ItemMsgInteractSelect" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" IsOn="true" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" IsOn="true" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="%ModDir%/Items/Electricity/lamps_advanced2light.png" sourcerect="0,240,288,48" alpha="1.0" origin="0.5,0.4" />
     </LightComponent>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_submarine_function.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_submarine_function.xml
index 30d50a8f..10f94eba 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_submarine_function.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/custom_submarine_function.xml	
@@ -9,7 +9,7 @@
         <Conditional Condition="gt 90" />
       </StatusEffect>
     </ItemComponent>
-    <LightComponent range="2" lightcolor="0,0,0,2" IsOn="true" castshadows="false" allowingameediting="false" flicker="0" flickerspeed="0" pulsefrequency="0" pulseamount="0">
+    <LightComponent range="8" lightcolor="0,0,0,2" IsOn="true" castshadows="false" allowingameediting="false" flicker="0" flickerspeed="0" pulsefrequency="0" pulseamount="0">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.25">
         <Explosion range="350.0" levelwalldamage="75" force="0" severlimbsprobability="0" camerashake="0" camerashakerange="0" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" ignorecover="true" applyfireeffects="false"></Explosion>
       </StatusEffect>
@@ -36,7 +36,7 @@
         <Conditional Condition="gt 90" />
       </StatusEffect>
     </ItemComponent>
-    <LightComponent range="2" lightcolor="0,0,0,2" IsOn="true" castshadows="false" allowingameediting="false" flicker="0" flickerspeed="0" pulsefrequency="0" pulseamount="0">
+    <LightComponent range="8" lightcolor="0,0,0,2" IsOn="true" castshadows="false" allowingameediting="false" flicker="0" flickerspeed="0" pulsefrequency="0" pulseamount="0">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.25">
         <Explosion range="475.0" levelwalldamage="100" force="0" severlimbsprobability="0" camerashake="0" camerashakerange="0" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" ignorecover="true" applyfireeffects="false"></Explosion>
       </StatusEffect>
@@ -63,7 +63,7 @@
         <Conditional Condition="gt 90" />
       </StatusEffect>
     </ItemComponent>
-    <LightComponent range="2" lightcolor="0,0,0,2" IsOn="true" castshadows="false" allowingameediting="false" flicker="0" flickerspeed="0" pulsefrequency="0" pulseamount="0">
+    <LightComponent range="8" lightcolor="0,0,0,2" IsOn="true" castshadows="false" allowingameediting="false" flicker="0" flickerspeed="0" pulsefrequency="0" pulseamount="0">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.25">
         <Explosion range="600.0" levelwalldamage="125" force="0" severlimbsprobability="0" camerashake="0" camerashakerange="0" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" ignorecover="true" applyfireeffects="false"></Explosion>
       </StatusEffect>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/poweritem_variants.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/poweritem_variants.xml
index 52e1ad8f..97c7ba3f 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/poweritem_variants.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Electricity/poweritem_variants.xml	
@@ -14,11 +14,11 @@
         <Conditional currPowerConsumption="lt -10" />
       </StatusEffect>
     </PowerTransfer>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="264,186,110,176" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq False" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1.5">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1.5">
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="376,186,110,176" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq True" />
     </LightComponent>
@@ -66,12 +66,12 @@
         <Conditional currPowerConsumption="lt -10" />
       </StatusEffect>
     </PowerTransfer>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Electricity/variants_junctions1.png" sourcerect="580,4,184,264" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq False" />
       <!-- sourcerect 576,0,192,272 -->
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="3">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="3">
       <sprite texture="%ModDir%/Items/Electricity/variants_junctions1.png" sourcerect="772,4,184,264" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq True" />
       <!-- sourcerect 768,0,192,272 -->
@@ -120,22 +120,22 @@
         <Conditional currPowerConsumption="lt -10" />
       </StatusEffect>
     </PowerTransfer>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Electricity/variants_junctions1.png" sourcerect="580,500,184,200" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq False" />
       <!-- sourcerect 576,496,192,208 -->
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" blinkfrequency="0.4">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" blinkfrequency="0.4">
       <sprite texture="%ModDir%/Items/Electricity/variants_junctions1.png" sourcerect="964,292,56,200" depth="0.1" origin="-0.65,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq False" />
       <!-- sourcerect 960,288,64,208 -->
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" blinkfrequency="0.3">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" blinkfrequency="0.3">
       <sprite texture="%ModDir%/Items/Electricity/variants_junctions1.png" sourcerect="964,500,56,200" depth="0.1" origin="-0.65,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq False" />
       <!-- sourcerect 960,496,64,208 -->
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="3">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="3">
       <sprite texture="%ModDir%/Items/Electricity/variants_junctions1.png" sourcerect="772,500,184,200" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq True" />
       <!-- sourcerect 768,496,192,208 -->
@@ -184,12 +184,12 @@
         <Conditional currPowerConsumption="lt -10" />
       </StatusEffect>
     </PowerTransfer>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Electricity/variants_junctions1.png" sourcerect="580,276,184,104" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq False" />
       <!-- sourcerect 576,272,192,112 -->
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="3">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="3">
       <sprite texture="%ModDir%/Items/Electricity/variants_junctions1.png" sourcerect="772,276,184,104" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq True" />
       <!-- sourcerect 768,272,192,112 -->
@@ -242,12 +242,12 @@
         <Conditional currPowerConsumption="lt -10" />
       </StatusEffect>
     </PowerTransfer>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir%/Items/Electricity/variants_junctions1.png" sourcerect="580,388,184,104" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq False" />
       <!-- sourcerect 576,384,192,112 -->
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="3">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="3">
       <sprite texture="%ModDir%/Items/Electricity/variants_junctions1.png" sourcerect="772,388,184,104" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq True" />
       <!-- sourcerect 768,384,192,112 -->
@@ -291,7 +291,7 @@
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="64,961,32,22" origin="0.5,0.45" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="128,0,128,160" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="128,0,128,160" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="2000.0" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="4400" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnActive" targettype="Contained" targets="loadable" Condition="2.0">
         <Conditional ChargePercentage="gt 0.01" targetcontainer="true" targetitemcomponent="PowerContainer" />
@@ -315,9 +315,9 @@
       <output name="charge_rate" displayname="connection.batteryrechargespeedout" />
       <output name="condition_out" displayname="connection.conditionout" />
     </ConnectionPanel>
-    <ItemContainer capacity="3" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
+    <ItemContainer capacity="7" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
-      <Containable items="loadable" />
+      <Containable items="loadable,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="120" maxdeteriorationdelay="240" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.3" />
@@ -340,7 +340,7 @@
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="64,961,32,22" origin="0.5,0.45" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="128,160,128,160" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="128,160,128,160" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="2000.0" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="45,40" indicatorsize="36,45" ishorizontal="false" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="4400" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="45,40" indicatorsize="36,45" ishorizontal="false" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnActive" targettype="Contained" targets="loadable" Condition="2.0">
         <Conditional ChargePercentage="gt 0.01" targetcontainer="true" targetitemcomponent="PowerContainer" />
@@ -364,9 +364,9 @@
       <output name="charge_rate" displayname="connection.batteryrechargespeedout" />
       <output name="condition_out" displayname="connection.conditionout" />
     </ConnectionPanel>
-    <ItemContainer capacity="3" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
+    <ItemContainer capacity="7" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
-      <Containable items="loadable" />
+      <Containable items="loadable,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="120" maxdeteriorationdelay="240" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.3" />
@@ -389,7 +389,7 @@
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="64,961,32,22" origin="0.5,0.45" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="128,320,128,96" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="128,320,128,96" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="2000.0" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="35,30" indicatorsize="59,12" ishorizontal="true" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="4400" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="35,30" indicatorsize="59,12" ishorizontal="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnActive" targettype="Contained" targets="loadable" Condition="2.0">
         <Conditional ChargePercentage="gt 0.01" targetcontainer="true" targetitemcomponent="PowerContainer" />
@@ -413,9 +413,9 @@
       <output name="charge_rate" displayname="connection.batteryrechargespeedout" />
       <output name="condition_out" displayname="connection.conditionout" />
     </ConnectionPanel>
-    <ItemContainer capacity="3" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
+    <ItemContainer capacity="7" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
-      <Containable items="loadable" />
+      <Containable items="loadable,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="120" maxdeteriorationdelay="240" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.3" />
@@ -438,7 +438,7 @@
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="64,961,32,22" origin="0.5,0.45" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="112,416,112,168" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="112,416,112,168" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="2000.0" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="33,43" indicatorsize="46,12" ishorizontal="true" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="4400" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="33,43" indicatorsize="46,12" ishorizontal="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnActive" targettype="Contained" targets="loadable" Condition="2.0">
         <Conditional ChargePercentage="gt 0.01" targetcontainer="true" targetitemcomponent="PowerContainer" />
@@ -462,9 +462,9 @@
       <output name="charge_rate" displayname="connection.batteryrechargespeedout" />
       <output name="condition_out" displayname="connection.conditionout" />
     </ConnectionPanel>
-    <ItemContainer capacity="3" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
+    <ItemContainer capacity="7" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
-      <Containable items="loadable" />
+      <Containable items="loadable,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="120" maxdeteriorationdelay="240" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.3" />
@@ -487,7 +487,7 @@
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="64,961,32,22" origin="0.5,0.45" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="352,0,96,376" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="448,0,96,376" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="2000.0" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="34,156" indicatorsize="27,25" ishorizontal="true" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="4400" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="34,156" indicatorsize="27,25" ishorizontal="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnActive" targettype="Contained" targets="loadable" Condition="2.0">
         <Conditional ChargePercentage="gt 0.01" targetcontainer="true" targetitemcomponent="PowerContainer" />
@@ -511,9 +511,9 @@
       <output name="charge_rate" displayname="connection.batteryrechargespeedout" />
       <output name="condition_out" displayname="connection.conditionout" />
     </ConnectionPanel>
-    <ItemContainer capacity="3" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
+    <ItemContainer capacity="7" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
-      <Containable items="loadable" />
+      <Containable items="loadable,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="120" maxdeteriorationdelay="240" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <StatusEffect type="InWater" target="This" condition="-0.3" />
@@ -537,7 +537,7 @@
     <Sprite texture="%ModDir%/Items/Electricity/crankshaft_equipment1.png" depth="0.8" sourcerect="0,0,320,208" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/crankshaft_equipment1.png" sourcerect="0,208,320,208" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/crankshaft_equipment1.png" sourcerect="0,416,320,208" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="1000.0" maxrechargespeed="3000.0" maxoutput="2000000.0" efficiency="0.75" rechargeadjustspeed="0.05" rechargewarningindicatorlow="0.34" rechargewarningindicatorhigh="0.67" canbeselected="true" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="2200" maxrechargespeed="3000.0" maxoutput="2000000.0" efficiency="0.75" rechargeadjustspeed="0.05" rechargewarningindicatorlow="0.34" rechargewarningindicatorhigh="0.67" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" />
       <!-- maxsize="420,300"-->
     </PowerContainer>
@@ -559,7 +559,7 @@
       <input name="set_rate" displayname="connection.batterysetrechargespeed" />
       <output name="condition_out" displayname="connection.conditionout" />
     </ConnectionPanel>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" pulsefrequency="0.4" pulseamount="0.4" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" pulsefrequency="0.4" pulseamount="0.4" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="358,334,154,160" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerContainer" rechargeratio="gt 0.7" />
       <IsActive targetitemcomponent="PowerContainer" currpowerconsumption="gt 500" />
@@ -586,7 +586,7 @@
     <Sprite texture="%ModDir%/Items/Electricity/crankshaft_equipment1.png" depth="0.8" sourcerect="320,0,320,208" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/crankshaft_equipment1.png" sourcerect="320,208,320,208" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/crankshaft_equipment1.png" sourcerect="320,416,320,208" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="1000.0" maxrechargespeed="3000.0" maxoutput="2000000.0" efficiency="0.75" rechargeadjustspeed="0.05" rechargewarningindicatorlow="0.34" rechargewarningindicatorhigh="0.67" canbeselected="true" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="2200" maxrechargespeed="3000.0" maxoutput="2000000.0" efficiency="0.75" rechargeadjustspeed="0.05" rechargewarningindicatorlow="0.34" rechargewarningindicatorhigh="0.67" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" />
 	--&gt;
 	<!-- maxsize="420,300"--></PowerContainer>
@@ -608,7 +608,7 @@
       <input name="set_rate" displayname="connection.batterysetrechargespeed" />
       <output name="condition_out" displayname="connection.conditionout" />
     </ConnectionPanel>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" pulsefrequency="0.4" pulseamount="0.4" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" pulsefrequency="0.4" pulseamount="0.4" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="358,334,154,160" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerContainer" rechargeratio="gt 0.7" />
       <IsActive targetitemcomponent="PowerContainer" currpowerconsumption="gt 500" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Engine/thruster_engines.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Engine/thruster_engines.xml
index 2cd1751c..29dc663f 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Engine/thruster_engines.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Engine/thruster_engines.xml	
@@ -9,7 +9,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_newthrusterforcer_tiny_050" />
+      <Containable items="ekdockyard_newthrusterforcer_tiny_050,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_newthrusterforcer_tiny_050" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -71,7 +71,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_newthrusterforcer_tiny_100" />
+      <Containable items="ekdockyard_newthrusterforcer_tiny_100,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_newthrusterforcer_tiny_100" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -133,7 +133,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_newthrusterforcer_small_300" />
+      <Containable items="ekdockyard_newthrusterforcer_small_300,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_newthrusterforcer_small_300" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -205,7 +205,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_newthrusterforcer_small_500" />
+      <Containable items="ekdockyard_newthrusterforcer_small_500,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_newthrusterforcer_small_500" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -277,7 +277,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_newthrusterforcer_medium_500" />
+      <Containable items="ekdockyard_newthrusterforcer_medium_500,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_newthrusterforcer_medium_500" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -349,7 +349,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_newthrusterforcer_medium_1000" />
+      <Containable items="ekdockyard_newthrusterforcer_medium_1000,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_newthrusterforcer_medium_1000" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -421,7 +421,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_newthrusterforcer_medium_2000" />
+      <Containable items="ekdockyard_newthrusterforcer_medium_2000,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_newthrusterforcer_medium_2000" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -494,7 +494,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_newthrusterforcer_mediumalt_300" />
+      <Containable items="ekdockyard_newthrusterforcer_mediumalt_300,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_newthrusterforcer_mediumalt_300" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -566,7 +566,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_newthrusterforcer_mediumalt_500" />
+      <Containable items="ekdockyard_newthrusterforcer_mediumalt_500,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_newthrusterforcer_mediumalt_500" spawnposition="ThisInventory" />
       </StatusEffect>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Engine/thruster_engines_legacy.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Engine/thruster_engines_legacy.xml
index 7e15b4e6..5a1894c9 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Engine/thruster_engines_legacy.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Engine/thruster_engines_legacy.xml	
@@ -9,7 +9,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_thrusterforcer_tiny_050" />
+      <Containable items="ekdockyard_thrusterforcer_tiny_050,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_thrusterforcer_tiny_050" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -68,7 +68,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_thrusterforcer_tiny_100" />
+      <Containable items="ekdockyard_thrusterforcer_tiny_100,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_thrusterforcer_tiny_100" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -127,7 +127,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_thrusterforcer_small_300" />
+      <Containable items="ekdockyard_thrusterforcer_small_300,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_thrusterforcer_small_300" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -199,7 +199,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_thrusterforcer_small_500" />
+      <Containable items="ekdockyard_thrusterforcer_small_500,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_thrusterforcer_small_500" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -271,7 +271,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_thrusterforcer_medium_500" />
+      <Containable items="ekdockyard_thrusterforcer_medium_500,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_thrusterforcer_medium_500" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -343,7 +343,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_thrusterforcer_medium_1000" />
+      <Containable items="ekdockyard_thrusterforcer_medium_1000,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_thrusterforcer_medium_1000" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -415,7 +415,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_thrusterforcer_medium_2000" />
+      <Containable items="ekdockyard_thrusterforcer_medium_2000,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_thrusterforcer_medium_2000" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -488,7 +488,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_thrusterforcer_mediumalt_300" />
+      <Containable items="ekdockyard_thrusterforcer_mediumalt_300,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_thrusterforcer_mediumalt_300" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -560,7 +560,7 @@
       <StatusEffect type="Always" target="This" Condition="-10.0" disabledeltatime="true">
         <Conditional Condition="gt 90" />
       </StatusEffect>
-      <Containable items="ekdockyard_thrusterforcer_mediumalt_500" />
+      <Containable items="ekdockyard_thrusterforcer_mediumalt_500,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="Contained">
         <SpawnItem identifier="ekdockyard_thrusterforcer_mediumalt_500" spawnposition="ThisInventory" />
       </StatusEffect>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_hazards.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_hazards.xml
index 58c496cb..d1c33d6a 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_hazards.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_hazards.xml	
@@ -4,7 +4,7 @@
   <Item name="Env Radiation Source" identifier="ekdockyard_customenvironmenthazard_radiationemitter1" category="Alien" description="Ambient Radiation Emitter (1.5m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="175,200,100,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="175.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="radiationsickness" amount="0.5" />
@@ -28,7 +28,7 @@
   <Item name="Env Radiation Source" identifier="ekdockyard_customenvironmenthazard_radiationemitter2" category="Alien" description="Ambient Radiation Emitter (3m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="175,200,100,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="325.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="radiationsickness" amount="0.5" />
@@ -52,7 +52,7 @@
   <Item name="Env Radiation Source" identifier="ekdockyard_customenvironmenthazard_radiationemitter3" category="Alien" description="Ambient Radiation Emitter (5m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="175,200,100,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="512,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="550.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="radiationsickness" amount="0.5" />
@@ -76,7 +76,7 @@
   <Item name="Env Radiation Source" identifier="ekdockyard_customenvironmenthazard_radiationemitter4" category="Alien" description="Ambient Radiation Emitter (7.5m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="175,200,100,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="768,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="775.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="radiationsickness" amount="0.5" />
@@ -100,7 +100,7 @@
   <Item name="Env Radiation Source" identifier="ekdockyard_customenvironmenthazard_radiationemitter5" category="Alien" description="Ambient Radiation Emitter (10m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="175,200,100,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,64,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="1100.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="radiationsickness" amount="0.5" />
@@ -124,7 +124,7 @@
   <Item name="Env Radiation Source" identifier="ekdockyard_customenvironmenthazard_radiationemitter6" category="Alien" description="Ambient Radiation Emitter (20m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="175,200,100,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,64,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="2100.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="radiationsickness" amount="0.5" />
@@ -150,7 +150,7 @@
   description="Ambient Radiation Emitter (30m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="175,200,100,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="512,64,256,64" offset="0,84" depth="0.551" origin="0.5,0.5"/>
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5" >
 		<Explosion range="3100.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false" >
           <Affliction identifier="radiationsickness" amount="0.5" />
@@ -176,7 +176,7 @@
   description="Ambient Radiation Emitter (40m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="175,200,100,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="768,64,256,64" offset="0,84" depth="0.551" origin="0.5,0.5"/>
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5" >
 		<Explosion range="4100.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false" >
           <Affliction identifier="radiationsickness" amount="0.5" />
@@ -201,7 +201,7 @@
   <Item name="Env Psychosis Source" identifier="ekdockyard_customenvironmenthazard_psychosisemitter1" category="Alien" description="Ambient Psychosis Emitter (1.5m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="200,100,150,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="175.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="psychosis" amount="0.5" />
@@ -225,7 +225,7 @@
   <Item name="Env Psychosis Source" identifier="ekdockyard_customenvironmenthazard_psychosisemitter2" category="Alien" description="Ambient Psychosis Emitter (3m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="200,100,150,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="325.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="psychosis" amount="0.5" />
@@ -249,7 +249,7 @@
   <Item name="Env Psychosis Source" identifier="ekdockyard_customenvironmenthazard_psychosisemitter3" category="Alien" description="Ambient Psychosis Emitter (5m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="200,100,150,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="512,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="550.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="psychosis" amount="0.5" />
@@ -273,7 +273,7 @@
   <Item name="Env Psychosis Source" identifier="ekdockyard_customenvironmenthazard_psychosisemitter4" category="Alien" description="Ambient Psychosis Emitter (7.5m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="200,100,150,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="768,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="775.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="psychosis" amount="0.5" />
@@ -297,7 +297,7 @@
   <Item name="Env Psychosis Source" identifier="ekdockyard_customenvironmenthazard_psychosisemitter5" category="Alien" description="Ambient Psychosis Emitter (10m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="200,100,150,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,64,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="1100.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="psychosis" amount="0.5" />
@@ -321,7 +321,7 @@
   <Item name="Env Psychosis Source" identifier="ekdockyard_customenvironmenthazard_psychosisemitter6" category="Alien" description="Ambient Psychosis Emitter (20m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="200,100,150,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,64,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="2100.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="psychosis" amount="0.5" />
@@ -345,7 +345,7 @@
   <Item name="Env Burn Source" identifier="ekdockyard_customenvironmenthazard_burnemitter1" category="Alien" description="Ambient Burn Emitter (1.5m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="255,125,0,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="175.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="burn" amount="0.5" />
@@ -369,7 +369,7 @@
   <Item name="Env Burn Source" identifier="ekdockyard_customenvironmenthazard_burnemitter2" category="Alien" description="Ambient Burn Emitter (3m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="255,125,0,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="325.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="burn" amount="0.5" />
@@ -393,7 +393,7 @@
   <Item name="Env Burn Source" identifier="ekdockyard_customenvironmenthazard_burnemitter3" category="Alien" description="Ambient Burn Emitter (5m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="255,125,0,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="512,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="550.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="burn" amount="0.5" />
@@ -417,7 +417,7 @@
   <Item name="Env Burn Source" identifier="ekdockyard_customenvironmenthazard_burnemitter4" category="Alien" description="Ambient Burn Emitter (7.5m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="255,125,0,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="768,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="775.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="burn" amount="0.5" />
@@ -441,7 +441,7 @@
   <Item name="Env Burn Source" identifier="ekdockyard_customenvironmenthazard_burnemitter5" category="Alien" description="Ambient Burn Emitter (10m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="255,125,0,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,64,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="1100.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="burn" amount="0.5" />
@@ -465,7 +465,7 @@
   <Item name="Env Burn Source" identifier="ekdockyard_customenvironmenthazard_burnemitter6" category="Alien" description="Ambient Burn Emitter (20m Range)" Tags="" scale="0.25" isshootable="false" spritecolor="255,125,0,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,64,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This" disabledeltatime="true" stackable="false" delay="0.5">
         <Explosion range="2100.0" structuredamage="0" itemdamage="0" force="0.005" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="0" playtinnitus="false" applyfireeffects="false">
           <Affliction identifier="burn" amount="0.5" />
@@ -489,7 +489,7 @@
   <!-- Atmosphere Emitters -->
   <Item name="Env Oxygen Source" identifier="ekdockyard_customenvironmenthazard_oxygenemitter1" category="Alien" description="Ambient Oxygen Emitter" Tags="" scale="0.25" isshootable="false" spritecolor="100,175,255,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="0,512,256,256" depth="0.55" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="Hull" Oxygen="2000000" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
@@ -501,7 +501,7 @@
   </Item>
   <Item name="Env Oxygen Remover" identifier="ekdockyard_customenvironmenthazard_oxygenremover1" category="Alien" description="Ambient Oxygen Remover" Tags="" scale="0.25" isshootable="false" spritecolor="100,175,255,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_afflictions.png" sourcerect="256,512,256,256" depth="0.55" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="Hull" Oxygen="-2000000" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_particles.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_particles.xml
index d516143d..afeb2b83 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_particles.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_particles.xml	
@@ -4,7 +4,7 @@
   <Item name="Env Particles Snow 1" identifier="ekdockyard_customenvironmentparticles_precipitationsnow1small" category="Alien" description="Light Snowfall (Small)" Tags="" scale="0.25" isshootable="false" spritecolor="200,225,255,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="0,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="0,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow1layer1" anglemin="0" anglemax="360" particlespersecond="6" velocitymin="0" velocitymax="50" scalemin="0.90" scalemax="1.10" distancemin="0" distancemax="400" />
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow1layer2" anglemin="0" anglemax="360" particlespersecond="5" velocitymin="0" velocitymax="50" scalemin="0.80" scalemax="1.00" distancemin="0" distancemax="400" />
@@ -21,7 +21,7 @@
   <Item name="Env Particles Snow 1" identifier="ekdockyard_customenvironmentparticles_precipitationsnow1medium" category="Alien" description="Light Snowfall (Medium)" Tags="" scale="0.25" isshootable="false" spritecolor="200,225,255,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="0,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="256,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow1layer1" anglemin="0" anglemax="360" particlespersecond="12" velocitymin="0" velocitymax="50" scalemin="0.90" scalemax="1.10" distancemin="0" distancemax="800" />
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow1layer2" anglemin="0" anglemax="360" particlespersecond="10" velocitymin="0" velocitymax="50" scalemin="0.80" scalemax="1.00" distancemin="0" distancemax="800" />
@@ -38,7 +38,7 @@
   <Item name="Env Particles Snow 1" identifier="ekdockyard_customenvironmentparticles_precipitationsnow1large" category="Alien" description="Light Snowfall (Large)" Tags="" scale="0.25" isshootable="false" spritecolor="200,225,255,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="0,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="512,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow1layer1" anglemin="0" anglemax="360" particlespersecond="18" velocitymin="0" velocitymax="50" scalemin="0.90" scalemax="1.10" distancemin="0" distancemax="1200" />
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow1layer2" anglemin="0" anglemax="360" particlespersecond="15" velocitymin="0" velocitymax="50" scalemin="0.80" scalemax="1.00" distancemin="0" distancemax="1200" />
@@ -55,7 +55,7 @@
   <Item name="Env Particles Snow 2" identifier="ekdockyard_customenvironmentparticles_precipitationsnow2small" category="Alien" description="Heavy Snow (Small)" Tags="" scale="0.25" isshootable="false" spritecolor="200,225,255,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="256,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="0,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow2layer1" anglemin="0" anglemax="360" particlespersecond="7" velocitymin="0" velocitymax="50" scalemin="1.00" scalemax="1.20" distancemin="0" distancemax="400" />
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow2layer2" anglemin="0" anglemax="360" particlespersecond="5" velocitymin="0" velocitymax="50" scalemin="0.90" scalemax="1.10" distancemin="0" distancemax="400" />
@@ -72,7 +72,7 @@
   <Item name="Env Particles Snow 2" identifier="ekdockyard_customenvironmentparticles_precipitationsnow2medium" category="Alien" description="Heavy Snow (Medium)" Tags="" scale="0.25" isshootable="false" spritecolor="200,225,255,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="256,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="256,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow2layer1" anglemin="0" anglemax="360" particlespersecond="14" velocitymin="0" velocitymax="50" scalemin="1.00" scalemax="1.20" distancemin="0" distancemax="800" />
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow2layer2" anglemin="0" anglemax="360" particlespersecond="10" velocitymin="0" velocitymax="50" scalemin="0.90" scalemax="1.10" distancemin="0" distancemax="800" />
@@ -89,7 +89,7 @@
   <Item name="Env Particles Snow 2" identifier="ekdockyard_customenvironmentparticles_precipitationsnow2large" category="Alien" description="Heavy Snow (Large)" Tags="" scale="0.25" isshootable="false" spritecolor="200,225,255,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="256,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="256,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow2layer1" anglemin="0" anglemax="360" particlespersecond="21" velocitymin="0" velocitymax="50" scalemin="1.00" scalemax="1.20" distancemin="0" distancemax="1200" />
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_snow2layer2" anglemin="0" anglemax="360" particlespersecond="15" velocitymin="0" velocitymax="50" scalemin="0.90" scalemax="1.10" distancemin="0" distancemax="1200" />
@@ -106,7 +106,7 @@
   <Item name="Env Particles Rain 1" identifier="ekdockyard_customenvironmentparticles_precipitationrain1small" category="Alien" description="Light Rain (Small)" Tags="" scale="0.25" isshootable="false" spritecolor="175,175,200,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="0,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_rain1layer1" anglemin="0" anglemax="360" particlespersecond="4" velocitymin="0" velocitymax="50" scalemin="1" scalemax="1" distancemin="0" distancemax="500" />
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_rain1layer2" anglemin="0" anglemax="360" particlespersecond="4" velocitymin="0" velocitymax="50" scalemin="1" scalemax="1" distancemin="0" distancemax="500" />
@@ -122,7 +122,7 @@
   <Item name="Env Particles Rain 1" identifier="ekdockyard_customenvironmentparticles_precipitationrain1medium" category="Alien" description="Light Rain (Medium)" Tags="" scale="0.25" isshootable="false" spritecolor="175,175,200,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="256,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_rain1layer1" anglemin="0" anglemax="360" particlespersecond="8" velocitymin="0" velocitymax="50" scalemin="1" scalemax="1" distancemin="0" distancemax="1000" />
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_rain1layer2" anglemin="0" anglemax="360" particlespersecond="8" velocitymin="0" velocitymax="50" scalemin="1" scalemax="1" distancemin="0" distancemax="1000" />
@@ -138,7 +138,7 @@
   <Item name="Env Particles Rain 1" identifier="ekdockyard_customenvironmentparticles_precipitationrain1large" category="Alien" description="Light Rain (Large)" Tags="" scale="0.25" isshootable="false" spritecolor="175,175,200,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="512,0,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_rain1layer1" anglemin="0" anglemax="360" particlespersecond="16" velocitymin="0" velocitymax="50" scalemin="1" scalemax="1" distancemin="0" distancemax="1500" />
         <ParticleEmitter particle="ekdockyard_environmentprecipitation_rain1layer2" anglemin="0" anglemax="360" particlespersecond="16" velocitymin="0" velocitymax="50" scalemin="1" scalemax="1" distancemin="0" distancemax="1500" />
@@ -154,18 +154,18 @@
   <Item name="Env Lightning 1" identifier="ekdockyard_customenvironment_lightning1" category="Alien" description="Near Lightning and Thunder" Tags="" scale="0.25" isshootable="false" spritecolor="175,175,200,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="768,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="0,64,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,175" castshadows="true" allowingameediting="false" range="4096">
+    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,175" castshadows="true" allowingameediting="false" range="16384">
       <LightTexture texture="%ModDir%/Lights/pointlight_ultrabright_hires.png" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This" disabledeltatime="true" stackable="false" delay="10" setvalue="true" range="4096" />
     </LightComponent>
     <!--
-	<LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="4096">
+	<LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="16384">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q3.png" origin="1.0,0.0" size="1.01,1.01" />
     </LightComponent>
-    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="4096">
+    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="16384">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q2.png" origin="0.0,1.0" size="1.01,1.01" />
     </LightComponent>
-    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="4096">
+    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="16384">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q1.png" origin="1.0,1.0" size="1.01,1.01" />
     </LightComponent>
 	-->
@@ -191,18 +191,18 @@
   <Item name="Env Lightning 2" identifier="ekdockyard_customenvironment_lightning2" category="Alien" description="Distant Lightning and Thunder" Tags="" scale="0.25" isshootable="false" spritecolor="175,175,200,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="768,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weather.png" sourcerect="256,64,256,64" offset="0,84" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,75" castshadows="true" allowingameediting="false" range="4096">
+    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,75" castshadows="true" allowingameediting="false" range="16384">
       <LightTexture texture="%ModDir%/Lights/pointlight_ultrabright_hires.png" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This" disabledeltatime="true" stackable="false" delay="10" setvalue="true" range="4096" />
     </LightComponent>
     <!--
-	<LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="4096">
+	<LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="16384">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q3.png" origin="1.0,0.0" size="1.01,1.01" />
     </LightComponent>
-    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="4096">
+    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="16384">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q2.png" origin="0.0,1.0" size="1.01,1.01" />
     </LightComponent>
-    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="4096">
+    <LightComponent canbeselected="false" IsOn="false" flicker="1" flickerspeed="0.6" lightcolor="225,225,255,255" castshadows="true" allowingameediting="false" range="16384">
       <LightTexture texture="%ModDir%/Lights/pointlight_bright_q1.png" origin="1.0,1.0" size="1.01,1.01" />
     </LightComponent>
 	-->
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_sounds.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_sounds.xml
index 0e9aab45..64bf7255 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_sounds.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Environment/environment_sounds.xml	
@@ -4,7 +4,7 @@
   <Item name="Env Sound Rain 1" identifier="ekdockyard_customenvironmentsounds_rain1small" category="Alien" description="Rain (Small)" Tags="" scale="0.25" isshootable="false" spritecolor="175,175,200,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="0,0,256,64" offset="0,152" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <sound file="%ModDir%/Items/Environment/rain_loop1.ogg" type="OnActive" range="1000.0" loop="true" volume="1.0" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
@@ -17,7 +17,7 @@
   <Item name="Env Sound Rain 1" identifier="ekdockyard_customenvironmentsounds_rain1medium" category="Alien" description="Rain (Medium)" Tags="" scale="0.25" isshootable="false" spritecolor="175,175,200,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="256,0,256,64" offset="0,152" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <sound file="%ModDir%/Items/Environment/rain_loop1.ogg" type="OnActive" range="2500.0" loop="true" volume="1.0" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
@@ -30,7 +30,7 @@
   <Item name="Env Sound Rain 2" identifier="ekdockyard_customenvironmentsounds_rain2small" category="Alien" description="Light Rain (Small)" Tags="" scale="0.25" isshootable="false" spritecolor="175,175,200,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="0,0,256,64" offset="0,152" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <sound file="%ModDir%/Items/Environment/rainlight_loop1.ogg" type="OnActive" range="1000.0" loop="true" volume="1.0" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
@@ -43,7 +43,7 @@
   <Item name="Env Sound Rain 2" identifier="ekdockyard_customenvironmentsounds_rain2medium" category="Alien" description="Light Rain (Medium)" Tags="" scale="0.25" isshootable="false" spritecolor="175,175,200,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="256,0,256,64" offset="0,152" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <sound file="%ModDir%/Items/Environment/rainlight_loop1.ogg" type="OnActive" range="2500.0" loop="true" volume="1.0" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
@@ -56,7 +56,7 @@
   <Item name="Env Sound Rain 3" identifier="ekdockyard_customenvironmentsounds_rain3small" category="Alien" description="Heavy Rain (Small)" Tags="" scale="0.25" isshootable="false" spritecolor="175,175,200,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="0,0,256,64" offset="0,152" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <sound file="%ModDir%/Items/Environment/rainheavy_loop1.ogg" type="OnActive" range="1000.0" loop="true" volume="1.0" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
@@ -69,7 +69,7 @@
   <Item name="Env Sound Rain 3" identifier="ekdockyard_customenvironmentsounds_rain3medium" category="Alien" description="Heavy Rain (Medium)" Tags="" scale="0.25" isshootable="false" spritecolor="175,175,200,175" hiddeningame="true">
     <sprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="512,256,256,256" depth="0.55" origin="0.5,0.5" />
     <DecorativeSprite texture="%ModDir%/Items/Environment/environmentemitters_weathersounds.png" sourcerect="256,0,256,64" offset="0,152" depth="0.551" origin="0.5,0.5" />
-    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="1">
+    <LightComponent canbeselected="false" IsOn="true" lightcolor="25,25,25,0" castshadows="false" allowingameediting="false" range="4">
       <sound file="%ModDir%/Items/Environment/rainheavy_loop1.ogg" type="OnActive" range="2500.0" loop="true" volume="1.0" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Fabricators/fabricator_variants.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Fabricators/fabricator_variants.xml
index 3a67ef84..1ea0d59f 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Fabricators/fabricator_variants.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Fabricators/fabricator_variants.xml	
@@ -23,7 +23,7 @@
       <IsActiveConditional Condition="gt 0.0" />
     </DecorativeSprite>
 	-->
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" Flicker="0.2" Flickerspeed="0.7">
       <sprite texture="%ModDir%/Items/Fabricators/fabricator_adaptive.png" depth="0.025" sourcerect="16,544,288,176" origin="0.505,0.9" alpha="1.0" />
     </LightComponent>
     <Fabricator canbeselected="true" powerconsumption="750.0" msg="ItemMsgInteractSelect" fabricationspeed="0.8" skillrequirementmultiplier="0.6">
@@ -60,7 +60,7 @@
         <Affliction identifier="stun" strength="5" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="" allowuioverlap="true">
+    <ItemContainer capacity="11" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="" allowuioverlap="true">
       <StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
       <StatusEffect type="OnNotContained" target="This" setvalue="true" drawinventory="true" />
     </ItemContainer>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Generator/generator.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Generator/generator.xml
index 29d9646f..207c5e7c 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Generator/generator.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Generator/generator.xml	
@@ -54,11 +54,11 @@
         <Conditional temperature="gt 2" />
       </StatusEffect>
     </Reactor>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
       <sprite texture="%ModDir%/Items/Generator/reactor_mini.png" depth="0.025" sourcerect="272,257,224,254" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,25,15,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1">
+    <LightComponent range="40" lightcolor="255,25,15,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1">
       <IsActive targetitemcomponent="Reactor" temperaturecritical="eq true" />
       <sprite texture="%ModDir%/Items/Generator/reactor_mini.png" depth="0.025" sourcerect="272,257,224,254" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -102,17 +102,17 @@
         <StatusEffect type="OnUse" target="This" autotemp="true" setvalue="true" />
       </input>
     </ConnectionPanel>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
-      <Containable items="fuelrod">
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
+      <Containable items="fuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="80.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="fulguriumfuelrod">
+      <Containable items="fulguriumfuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="150.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="thoriumfuelrod">
+      <Containable items="thoriumfuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="100.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="fulguriumfuelrodvolatile">
+      <Containable items="fulguriumfuelrodvolatile,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="150.0" disabledeltatime="true" />
       </Containable>
     </ItemContainer>
@@ -184,11 +184,11 @@
         <Conditional temperature="gt 2" />
       </StatusEffect>
     </Reactor>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
       <sprite texture="%ModDir%/Items/Generator/reactor_small.png" depth="0.025" sourcerect="386,354,380,340" origin="0.5,0.45" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,25,15,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1">
+    <LightComponent range="40" lightcolor="255,25,15,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1">
       <IsActive targetitemcomponent="Reactor" temperaturecritical="eq true" />
       <sprite texture="%ModDir%/Items/Generator/reactor_small.png" depth="0.025" sourcerect="386,354,380,340" origin="0.5,0.45" alpha="1.0" />
     </LightComponent>
@@ -232,17 +232,17 @@
         <StatusEffect type="OnUse" target="This" autotemp="true" setvalue="true" />
       </input>
     </ConnectionPanel>
-    <ItemContainer capacity="2" maxstacksize="1" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
-      <Containable items="fuelrod">
+    <ItemContainer capacity="4" maxstacksize="2" canbeselected="true" hudpos="0.5,0.15" slotsperrow="2" uilabel="FuelRods">
+      <Containable items="fuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="80.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="fulguriumfuelrod">
+      <Containable items="fulguriumfuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="150.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="thoriumfuelrod">
+      <Containable items="thoriumfuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="100.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="fulguriumfuelrodvolatile">
+      <Containable items="fulguriumfuelrodvolatile,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="150.0" disabledeltatime="true" />
       </Containable>
     </ItemContainer>
@@ -314,11 +314,11 @@
         <Conditional temperature="gt 2" />
       </StatusEffect>
     </Reactor>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
       <sprite texture="%ModDir%/Items/Generator/reactorslow_small.png" depth="0.025" sourcerect="388,356,376,336" origin="0.5,0.45" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,25,15,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1">
+    <LightComponent range="40" lightcolor="255,25,15,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1">
       <IsActive targetitemcomponent="Reactor" temperaturecritical="eq true" />
       <sprite texture="%ModDir%/Items/Generator/reactorslow_small.png" depth="0.025" sourcerect="388,356,376,336" origin="0.5,0.45" alpha="1.0" />
     </LightComponent>
@@ -362,17 +362,17 @@
         <StatusEffect type="OnUse" target="This" autotemp="true" setvalue="true" />
       </input>
     </ConnectionPanel>
-    <ItemContainer capacity="2" maxstacksize="1" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
-      <Containable items="fuelrod">
+    <ItemContainer capacity="4" maxstacksize="2" canbeselected="true" hudpos="0.5,0.15" slotsperrow="2" uilabel="FuelRods">
+      <Containable items="fuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="40.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="fulguriumfuelrod">
+      <Containable items="fulguriumfuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="75.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="thoriumfuelrod">
+      <Containable items="thoriumfuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="50.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="fulguriumfuelrodvolatile">
+      <Containable items="fulguriumfuelrodvolatile,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="75.0" disabledeltatime="true" />
       </Containable>
     </ItemContainer>
@@ -390,14 +390,14 @@
       </StatusEffect>
     </Repairable>
   </Item>
-  <Item name="Diesel Biofuel" identifier="ekdockyard_generatorfuel" Tags="mediumitem,generatorfuel,reactorfuel" category="Fuel" cargocontaineridentifier="metalcrate" scale="0.5" description="Hydrocarbon-based fuel used by diesel generators." maxstacksize="4">
-    <PreferredContainer primary="ek_dieselgenerator" minamount="1" maxamount="1" />
+  <Item name="Diesel Biofuel" identifier="ekdockyard_generatorfuel" Tags="mediumitem,generatorfuel,reactorfuel" category="Fuel" cargocontaineridentifier="metalcrate" scale="0.5" description="Hydrocarbon-based fuel used by diesel generators." maxstacksize="8">
+    <PreferredContainer primary="ek_dieselgenerator" minamount="2" maxamount="2" />
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" multiplier="1" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" multiplier="3" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" minavailable="9" />
     </Price>
     <!--
 	45
@@ -538,12 +538,12 @@
         <StatusEffect type="OnUse" target="This" autotemp="true" setvalue="true" />
       </input>
     </ConnectionPanel>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
-      <Containable items="ekdockyard_generatorfuel,generatorfuel">
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
+      <Containable items="ekdockyard_generatorfuel,generatorfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="100.0" disabledeltatime="true" />
       </Containable>
       <!--
-	  <Containable items="ekdockyard_generatorfuel">
+	  <Containable items="ekdockyard_generatorfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="100.0" disabledeltatime="true" />
       </Containable>
 	  -->
@@ -612,11 +612,11 @@
         <Fire size="300" />
       </StatusEffect>
     </Reactor>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" flicker="0.3" flickerspeed="0.2">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" flicker="0.3" flickerspeed="0.2">
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
       <sprite texture="%ModDir%/Items/Generator/generator_diesel_medium.png" depth="0.025" sourcerect="560,352,144,96" origin="-0.3,-0.22" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,100,100,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1">
+    <LightComponent range="40" lightcolor="255,100,100,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1">
       <IsActive targetitemcomponent="Reactor" temperaturecritical="eq true" />
       <sprite texture="%ModDir%/Items/Generator/generator_diesel_medium.png" depth="0.025" sourcerect="560,352,144,96" origin="-0.3,-0.22" alpha="1.0" />
     </LightComponent>
@@ -658,12 +658,12 @@
         <StatusEffect type="OnUse" target="This" autotemp="true" setvalue="true" />
       </input>
     </ConnectionPanel>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
-      <Containable items="ekdockyard_generatorfuel,generatorfuel">
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
+      <Containable items="ekdockyard_generatorfuel,generatorfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="100.0" disabledeltatime="true" />
       </Containable>
       <!--
-	  <Containable items="ekdockyard_generatorfuel">
+	  <Containable items="ekdockyard_generatorfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="100.0" disabledeltatime="true" />
       </Containable>
 	  -->
@@ -770,12 +770,12 @@
         <StatusEffect type="OnUse" target="This" autotemp="true" setvalue="true" />
       </input>
     </ConnectionPanel>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
-      <Containable items="ekdockyard_generatorfuel,generatorfuel">
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
+      <Containable items="ekdockyard_generatorfuel,generatorfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="100.0" disabledeltatime="true" />
       </Containable>
       <!--
-	  <Containable items="ekdockyard_generatorfuel">
+	  <Containable items="ekdockyard_generatorfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="100.0" disabledeltatime="true" />
       </Containable>
 	  -->
@@ -794,16 +794,16 @@
       </StatusEffect>
     </Repairable>
   </Item>
-  <Item name="Fusion Fuel (Tritium Deuterium)" identifier="ekdockyard_fusionfuel_tritiumdeuterium" Tags="smallitem,fusionfuel,reactorfuel,fusionfuellevel2" category="Fuel" maxstacksize="4" cargocontaineridentifier="metalcrate" health="100" scale="0.5" description="Conventional fusile material which predates the colonies. However due to the immense colony resource demands, production of viable tritium deuterium fuel on industrial scale is still very costly.">
+  <Item name="Fusion Fuel (Tritium Deuterium)" identifier="ekdockyard_fusionfuel_tritiumdeuterium" Tags="smallitem,fusionfuel,reactorfuel,fusionfuellevel2" category="Fuel" maxstacksize="8" cargocontaineridentifier="metalcrate" health="100" scale="0.5" description="Conventional fusile material which predates the colonies. However due to the immense colony resource demands, production of viable tritium deuterium fuel on industrial scale is still very costly.">
     <PreferredContainer primary="reactorcab,storagecab" />
-    <PreferredContainer primary="wreckreactorcab" minamount="0" maxamount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="wreckreactorcab" minamount="0" maxamount="2" spawnprobability="0.1" />
     <Price baseprice="275" soldeverywhere="false">
       <!-- 170 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <!--
 	42
@@ -842,15 +842,15 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="Fusion Fuel (Oxygenite)" identifier="ekdockyard_fusionfuel_oxygenite" Tags="smallitem,fusionfuel,reactorfuel,fusionfuellevel1" category="Fuel" maxstacksize="4" cargocontaineridentifier="metalcrate" health="100" scale="0.5" description="A mixture of pressurized oxygenite vapor and lithium dust. The process takes advantage of oxygenite's unique metaphysical properties, producing an easy-fusing fuel but relatively low effective output.">
+  <Item name="Fusion Fuel (Oxygenite)" identifier="ekdockyard_fusionfuel_oxygenite" Tags="smallitem,fusionfuel,reactorfuel,fusionfuellevel1" category="Fuel" maxstacksize="8" cargocontaineridentifier="metalcrate" health="100" scale="0.5" description="A mixture of pressurized oxygenite vapor and lithium dust. The process takes advantage of oxygenite's unique metaphysical properties, producing an easy-fusing fuel but relatively low effective output.">
     <PreferredContainer primary="reactorcab,storagecab" />
     <Price baseprice="225" soldeverywhere="false">
       <!-- 145 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <!--
 	42
@@ -886,15 +886,15 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="Fusion Fuel (Helium-3)" identifier="ekdockyard_fusionfuel_helium3" Tags="smallitem,fusionfuel,reactorfuel,fusionfuellevel1" category="Fuel" maxstacksize="4" cargocontaineridentifier="metalcrate" health="100" scale="0.5" description="A naturally occuring but thinly scattered fusile material. Sometimes found in large veins with other radioactive minerals or within' icy asteroids, making it a relatively easy fuel source to come by - until recently.">
+  <Item name="Fusion Fuel (Helium-3)" identifier="ekdockyard_fusionfuel_helium3" Tags="smallitem,fusionfuel,reactorfuel,fusionfuellevel1" category="Fuel" maxstacksize="8" cargocontaineridentifier="metalcrate" health="100" scale="0.5" description="A naturally occuring but thinly scattered fusile material. Sometimes found in large veins with other radioactive minerals or within' icy asteroids, making it a relatively easy fuel source to come by - until recently.">
     <PreferredContainer primary="reactorcab,storagecab" />
     <Price baseprice="220" soldeverywhere="false">
       <!-- 142 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.2" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.6" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="6" />
     </Price>
     <!--
 	42
@@ -933,15 +933,15 @@
 	  -->
     </Holdable>
   </Item>
-  <Item name="Fusion Fuel (Alien Cell)" identifier="ekdockyard_fusionfuel_aliencell" Tags="smallitem,fusionfuel,reactorfuel,fusionfuellevel3" category="Fuel" maxstacksize="4" cargocontaineridentifier="metalcrate" health="100" scale="0.5" description="Experimental fusile matter supply powered by an alien cell. Capable of producing a very energetic reaction, however its exact function is not well understood.">
+  <Item name="Fusion Fuel (Alien Cell)" identifier="ekdockyard_fusionfuel_aliencell" Tags="smallitem,fusionfuel,reactorfuel,fusionfuellevel3" category="Fuel" maxstacksize="8" cargocontaineridentifier="metalcrate" health="100" scale="0.5" description="Experimental fusile matter supply powered by an alien cell. Capable of producing a very energetic reaction, however its exact function is not well understood.">
     <PreferredContainer primary="reactorcab,storagecab" />
     <Price baseprice="280" soldeverywhere="false">
       <!-- 175 -->
-      <Price storeidentifier="merchantoutpost" multiplier="1.2" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.3" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" sold="false" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.6" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="3" sold="false" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.9" sold="false" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" sold="false" />
     </Price>
     <!--
 	42
@@ -962,7 +962,7 @@
     <Sprite texture="%ModDir%/Items/Generator/fuel_items.png" depth="0.55" sourcerect="88,248,88,120" />
     <BrokenSprite texture="%ModDir%/Items/Generator/fuel_items.png" depth="0.55" sourcerect="0,248,88,120" origin="0.5,0.5" maxcondition="0" />
     <Body width="72" height="108" density="15" />
-    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,50" canbeselected="false" range="60.0" IsOn="true" castshadows="false" />
+    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,50" canbeselected="false" range="240" IsOn="true" castshadows="false" />
     <Holdable handle1="0,0" slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect" removeOnCombined="true">
       <!--
 	  <StatusEffect type="OnBroken" target="This">
@@ -1066,15 +1066,15 @@
         <SpawnItem identifier="ekdockyard_fusionsmall_aftereffectemitter" spawnposition="This" />
       </StatusEffect>
     </Reactor>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" flicker="0.3" flickerspeed="0.2">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" flicker="0.3" flickerspeed="0.2">
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
       <sprite texture="%ModDir%/Items/Generator/reactor_fusion_small.png" depth="0.025" sourcerect="229,357,86,70" origin="0.5,1.47" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="130,200,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" flicker="0.3" flickerspeed="0.8">
+    <LightComponent range="40" lightcolor="130,200,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" flicker="0.3" flickerspeed="0.8">
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
       <sprite texture="%ModDir%/Items/Generator/reactor_fusion_small.png" depth="0.025" sourcerect="0,577,320,126" origin="0.5,0.564" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="125.0" lightcolor="255,25,0,150" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="4">
+    <LightComponent range="500" lightcolor="255,25,0,150" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="4">
       <IsActive targetitemcomponent="Reactor" temperaturecritical="eq true" />
       <sprite texture="%ModDir%/Items/Generator/reactor_fusion_small.png" depth="0.025" sourcerect="229,357,86,70" origin="0.5,1.47" alpha="1.0" />
     </LightComponent>
@@ -1119,14 +1119,14 @@
         <StatusEffect type="OnUse" target="This" autotemp="true" setvalue="true" />
       </input>
     </ConnectionPanel>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
-      <Containable items="fusionfuellevel1">
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
+      <Containable items="fusionfuellevel1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="75" disabledeltatime="true" />
       </Containable>
-      <Containable items="fusionfuellevel2">
+      <Containable items="fusionfuellevel2,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="110" disabledeltatime="true" />
       </Containable>
-      <Containable items="fusionfuellevel3">
+      <Containable items="fusionfuellevel3,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="160" disabledeltatime="true" />
       </Containable>
     </ItemContainer>
@@ -1196,15 +1196,15 @@
         <SpawnItem identifier="ekdockyard_fusionmedium_aftereffectemitter" spawnposition="This" />
       </StatusEffect>
     </Reactor>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" flicker="0.3" flickerspeed="0.2">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" flicker="0.3" flickerspeed="0.2">
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
       <sprite texture="%ModDir%/Items/Generator/reactor_fusion_medium.png" depth="0.025" sourcerect="16,656,128,48" origin="1.094,-0.25" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="130,200,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" flicker="0.3" flickerspeed="0.8">
+    <LightComponent range="40" lightcolor="130,200,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" flicker="0.3" flickerspeed="0.8">
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
       <sprite texture="%ModDir%/Items/Generator/reactor_fusion_medium.png" depth="0.025" sourcerect="16,400,480,224" origin="0.5,0.505" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="175.0" lightcolor="255,25,0,150" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="4">
+    <LightComponent range="700" lightcolor="255,25,0,150" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="4">
       <IsActive targetitemcomponent="Reactor" temperaturecritical="eq true" />
       <sprite texture="%ModDir%/Items/Generator/reactor_fusion_medium.png" depth="0.025" sourcerect="16,656,128,48" origin="1.094,-0.24" alpha="1.0" />
     </LightComponent>
@@ -1249,14 +1249,14 @@
         <StatusEffect type="OnUse" target="This" autotemp="true" setvalue="true" />
       </input>
     </ConnectionPanel>
-    <ItemContainer capacity="2" maxstacksize="1" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
-      <Containable items="fusionfuellevel1">
+    <ItemContainer capacity="4" maxstacksize="2" canbeselected="true" hudpos="0.5,0.15" slotsperrow="2" uilabel="FuelRods">
+      <Containable items="fusionfuellevel1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="37.5" disabledeltatime="true" />
       </Containable>
-      <Containable items="fusionfuellevel2">
+      <Containable items="fusionfuellevel2,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="55.0" disabledeltatime="true" />
       </Containable>
-      <Containable items="fusionfuellevel3">
+      <Containable items="fusionfuellevel3,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" AvailableFuel="80.0" disabledeltatime="true" />
       </Containable>
     </ItemContainer>
@@ -1280,7 +1280,7 @@
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="64,961,32,22" origin="0.5,0.45" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="128,0,128,160" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="128,0,128,160" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="1000.0" maxrechargespeed="1000.0" maxoutput="1000.0" canbeselected="false">
+    <PowerContainer capacity="2200" maxrechargespeed="1000.0" maxoutput="1000.0" canbeselected="false">
 	  <StatusEffect type="Always" target="This" Charge="-200.0" />
     </PowerContainer>
 	<DecorativeSprite texture="%ModDir%/Items/Electricity/variants_batteries1.png" sourcerect="128,0,128,160" depth="0.78" origin="0.5,0.5">
@@ -1301,9 +1301,9 @@
       <output name="charge_%" displayname="connection.batterychargepercentage" />
 	  <output name="condition_out" displayname="connection.conditionout" />
     </ConnectionPanel>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="FuelRods">
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="FuelRods">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
-      <Containable items="fuelrod">
+      <Containable items="fuelrod,ammobox,deepdiving,smallitem,mediumitem,largeitem">
 		<StatusEffect type="Always" target="This" Charge="1000.0" >
 		  <RequiredItem items="fuelrod" type="Contained" />
 		  <Conditional ChargePercentage="lt 99" targetcontainer="true" targetitemcomponent="PowerContainer"/>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Searchlight/searchlight_custom.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Searchlight/searchlight_custom.xml
index 426e2ed7..2a1f6e01 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Searchlight/searchlight_custom.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2390137099/Items/Searchlight/searchlight_custom.xml	
@@ -4,7 +4,7 @@
     <Sprite texture="Content/Items/SearchLight/SearchLightBase.png" depth="0.01" sourcerect="0,0,98,81" />
     <Turret canbeselected="true" linkable="false" barrelpos="49,24" reload="999999999" rotationlimits="180,360" powerconsumption="10000.0" showchargeindicator="false" showprojectileindicator="false" springstiffnesslowskill="25" springstiffnesshighskill="25" springdampinglowskill="5" springdampinghighskill="5" rotationspeedlowskill="0.5" rotationspeedhighskill="0.5">
       <BarrelSprite texture="%ModDir%/Items/Searchlight/searchlight_custom.png" sourcerect="0,0,72,96" origin="0.5, 0.75" />
-      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="2500" IsOn="true" powerconsumption="50" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="10000" IsOn="true" powerconsumption="50" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_wide.png" origin="0.018,0.5" size="1.0,1.0" />
       </LightComponent>
     </Turret>
@@ -21,7 +21,7 @@
     <Sprite texture="Content/Items/SearchLight/SearchLightBase.png" depth="0.01" sourcerect="0,0,98,81" />
     <Turret canbeselected="true" linkable="false" barrelpos="49,24" reload="999999999" rotationlimits="180,360" powerconsumption="10000.0" showchargeindicator="false" showprojectileindicator="false" springstiffnesslowskill="25" springstiffnesshighskill="25" springdampinglowskill="5" springdampinghighskill="5" rotationspeedlowskill="0.5" rotationspeedhighskill="0.5">
       <BarrelSprite texture="%ModDir%/Items/Searchlight/searchlight_custom.png" sourcerect="0,0,72,96" origin="0.5, 0.75" />
-      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="2500" IsOn="true" powerconsumption="50" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="10000" IsOn="true" powerconsumption="50" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_huge.png" origin="0.018,0.5" size="1.0,1.0" />
       </LightComponent>
     </Turret>
@@ -48,7 +48,7 @@
       springdampinglowskill="5" springdampinghighskill="5"
       rotationspeedlowskill="0.5" rotationspeedhighskill="0.5">
       <BarrelSprite texture="%ModDir%/Items/Searchlight/searchlight_custom.png" sourcerect="0,0,64,88" origin="0.5, 0.75" />
-      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="2500" IsOn="true" powerconsumption="50" drawbehindsubs="true" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="10000" IsOn="true" powerconsumption="50" drawbehindsubs="true" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_wide.png" origin="0.012,0.5" size="1.0,1.0"/>
       </LightComponent>
     </Turret>
@@ -66,7 +66,7 @@
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" depth="0.8" sourcerect="0,192,64,64" />
     <Turret canbeselected="true" linkable="false" barrelpos="32,32" reload="999999999" rotationlimits="180,360" powerconsumption="10000.0" showchargeindicator="false" showprojectileindicator="false" springstiffnesslowskill="1" springstiffnesshighskill="1" springdampinglowskill="1" springdampinghighskill="1" rotationspeedlowskill="0" rotationspeedhighskill="0">
       <BarrelSprite texture="Content/Items/SearchLight/SearchLightBase.png" sourcerect="98,0,68,92" origin="0.5, 0.5" />
-      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="2500" IsOn="true" powerconsumption="50" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="10000" IsOn="true" powerconsumption="50" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.018, 0.5" />
       </LightComponent>
     </Turret>
@@ -82,7 +82,7 @@
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" depth="0.8" sourcerect="0,192,64,64" />
     <Turret canbeselected="true" linkable="false" barrelpos="32,32" reload="999999999" rotationlimits="180,360" powerconsumption="10000.0" showchargeindicator="false" showprojectileindicator="false" springstiffnesslowskill="1" springstiffnesshighskill="1" springdampinglowskill="1" springdampinghighskill="1" rotationspeedlowskill="0" rotationspeedhighskill="0">
       <BarrelSprite texture="%ModDir%/Items/Searchlight/searchlight_custom.png" sourcerect="2,4,68,92" origin="0.5, 0.5" />
-      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="2500" IsOn="true" powerconsumption="50" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="10000" IsOn="true" powerconsumption="50" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_wide.png" origin="0.018, 0.5" />
       </LightComponent>
     </Turret>
@@ -98,7 +98,7 @@
     <Sprite texture="%ModDir%/Items/Electricity/lamps_advanced1.png" depth="0.8" sourcerect="0,192,64,64" />
     <Turret canbeselected="true" linkable="false" barrelpos="32,32" reload="999999999" rotationlimits="180,360" powerconsumption="10000.0" showchargeindicator="false" showprojectileindicator="false" springstiffnesslowskill="1" springstiffnesshighskill="1" springdampinglowskill="1" springdampinghighskill="1" rotationspeedlowskill="0" rotationspeedhighskill="0">
       <BarrelSprite texture="%ModDir%/Items/Searchlight/searchlight_custom.png" sourcerect="2,4,68,92" origin="0.5, 0.5" />
-      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="2500" IsOn="true" powerconsumption="50" drawbehindsubs="false" ignorecontinuoustoggle="true">
+      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="10000" IsOn="true" powerconsumption="50" drawbehindsubs="false" ignorecontinuoustoggle="true">
         <LightTexture texture="%ModDir%/Lights/lightcone_huge.png" origin="0.018, 0.5" />
       </LightComponent>
     </Turret>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Biomes/CaveOutpostLocations/CaveObjects.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Biomes/CaveOutpostLocations/CaveObjects.xml
index 8c5ed651..8431890a 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Biomes/CaveOutpostLocations/CaveObjects.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Biomes/CaveOutpostLocations/CaveObjects.xml	
@@ -20,85 +20,85 @@
   <!-- Bioluminescent plants -->
   <Item name="Bioluminescent Cave Boulder" identifier="de-bioluminescentcaveboulder1" nameidentifier="de-bioluminescentcaveboulder1" tags="" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/BackgroundChunks.png" sourcerect="4,4,335,321" depth="0.879" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Cave Boulder" identifier="de-bioluminescentcaveboulder2" nameidentifier="de-bioluminescentcaveboulder2" tags="" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/BackgroundChunks.png" sourcerect="345,4,328,333" depth="0.878" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Cave Boulder" identifier="de-bioluminescentcaveboulder3" nameidentifier="de-bioluminescentcaveboulder3" tags="" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/BackgroundChunks.png" sourcerect="687,4,339,332" depth="0.877" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Cave Boulder" identifier="de-bioluminescentcaveboulder4" nameidentifier="de-bioluminescentcaveboulder4" tags="" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/BackgroundChunks.png" sourcerect="14,335,450,341" depth="0.876" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Cave Boulder" identifier="de-bioluminescentcaveboulder5" nameidentifier="de-bioluminescentcaveboulder5" tags="" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/BackgroundChunks.png" sourcerect="493,343,500,334" depth="0.875" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Cave Chunk" identifier="de-bioluminescentcavechunk1" nameidentifier="de-bioluminescentcavechunk1" tags="" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/LevelObjects.png" sourcerect="8,412,498,326" depth="0.874" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Cave Chunk" identifier="de-bioluminescentcavechunk2" nameidentifier="de-bioluminescentcavechunk2" tags="" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/LevelObjects.png" sourcerect="536,402,477,324" depth="0.873" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Cave Chunk" identifier="de-bioluminescentcavechunk3" nameidentifier="de-bioluminescentcavechunk3" tags="" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/LevelObjects.png" sourcerect="15,736,481,287" depth="0.872" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Cave Chunk" identifier="de-bioluminescentcavechunk4" nameidentifier="de-bioluminescentcavechunk4" tags="" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/LevelObjects.png" sourcerect="524,736,482,287" depth="0.871" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Plant" identifier="de-bioluminescentplant1" nameidentifier="de-bioluminescentplant1" tags="light" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/LevelObjects.png" sourcerect="344,30,326,191" depth="0.879" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Plant" identifier="de-bioluminescentplant2" nameidentifier="de-bioluminescentplant2" tags="light" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/LevelObjects.png" sourcerect="684,0,336,217" depth="0.878" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Plant" identifier="de-bioluminescentplant3" nameidentifier="de-bioluminescentplant3" tags="light" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/LevelObjects.png" sourcerect="9,14,323,199" depth="0.877" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Plant" identifier="de-bioluminescentplant4" nameidentifier="de-bioluminescentplant4" tags="light" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/LevelObjects.png" sourcerect="347,221,333,184" depth="0.876" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Bioluminescent Plant" identifier="de-bioluminescentplant5" nameidentifier="de-bioluminescentplant5" tags="light" allowattachitems="true" subcategory="cavedeco" texturescale="1.0,1.0" scale="0.5" category="Decorative" canflipy="true" noninteractable="true">
     <Sprite texture="Content/Map/Biomes/BioluminescentCave/LevelObjects.png" sourcerect="685,215,331,183" depth="0.875" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent IsOn="true" range="150" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
+    <LightComponent IsOn="true" range="600" lightcolor="25,25,80,250" pulseamount="0.3" pulsefrequency="0.1">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
   </Item>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Characters/Special Creatures/Lithomorph/LithomorphItems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Characters/Special Creatures/Lithomorph/LithomorphItems.xml
index 580aa48e..94b2c042 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Characters/Special Creatures/Lithomorph/LithomorphItems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Characters/Special Creatures/Lithomorph/LithomorphItems.xml	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="Tentacle" identifier="lithomorphtentacle" category="Weapon" maxstacksize="1" scale="0.5" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" noninteractable="true" hideinmenus="true" health="5" damagedbymeleeweapons="false">
+  <Item name="Tentacle" identifier="lithomorphtentacle" category="Weapon" maxstacksize="2" scale="0.5" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" noninteractable="true" hideinmenus="true" health="5" damagedbymeleeweapons="false">
     <Sprite texture="%ModDir:2532991202%/Characters/Special Creatures/Lithomorph/LithomorphSpritesheet.png" sourcerect="0,0,15,15" depth="0.57" origin="0.5,0.5" />
     <Body radius="15" density="10" />
     <Rope sourcepullforce="0" targetpullforce="100" projectilepullforce="1" maxlength="450" snaponcollision="false" spritewidth="40" tile="true" origin="0.05,0.5" targetminmass="0" lerpforces="true" snapanimduration="0.5" breakfrommiddle="false" SnapWhenNotAimed="False">
@@ -30,7 +30,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="TentacleNoDamage" identifier="lithomorphtentaclenodamage" category="Weapon" maxstacksize="1" scale="0.5" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" noninteractable="true" hideinmenus="true" health="5" damagedbymeleeweapons="false" spritecolor="220,220,220,255">
+  <Item name="TentacleNoDamage" identifier="lithomorphtentaclenodamage" category="Weapon" maxstacksize="2" scale="0.5" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" noninteractable="true" hideinmenus="true" health="5" damagedbymeleeweapons="false" spritecolor="220,220,220,255">
     <Sprite texture="%ModDir:2532991202%/Characters/Special Creatures/Lithomorph/LithomorphSpritesheet.png" sourcerect="0,0,15,15" depth="0.57" origin="0.5,0.5" />
     <Body radius="15" density="10" />
     <Rope sourcepullforce="0" targetpullforce="50" projectilepullforce="1" maxlength="500" snaponcollision="false" spritewidth="40" tile="true" origin="0.05,0.5" targetminmass="0" lerpforces="true" snapanimduration="0.5" breakfrommiddle="false" SnapWhenNotAimed="False">
@@ -73,14 +73,14 @@
         <Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" underwaterbubble="false" camerashake="6.0" />
         <SpawnItem identifier="lithomorphtentacle" spawnposition="Thisinventory" count="1" rotationtype="Collider" rotation="0" />
       </StatusEffect>
-      <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" canbeselected="false" characterusable="true" spawnwithid="lithomorphtentacle">
-        <Containable items="lithomorphtentacle" />
+      <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="2" canbeselected="false" characterusable="true" spawnwithid="lithomorphtentacle">
+        <Containable items="lithomorphtentacle,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
   </Item>
-  <Item name="" nameidentifier="cassiterite" identifier="lithomorphspawnercassiterite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="1" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+  <Item name="" nameidentifier="cassiterite" identifier="lithomorphspawnercassiterite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="2" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.47" sourcerect="597,877,84,147" origin="0.5,0.5" />
@@ -120,8 +120,8 @@
     </MotionSensor>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" canbepicked="False" allowingameediting="False" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" nameidentifier="chamosite" identifier="lithomorphspawnerchamosite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="1" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+  <Item name="" nameidentifier="chamosite" identifier="lithomorphspawnerchamosite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="2" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.47" sourcerect="341,438,86,148" origin="0.5,0.5" />
@@ -162,8 +162,8 @@
     </MotionSensor>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" canbepicked="False" allowingameediting="False" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" nameidentifier="cryolite" identifier="lithomorphspawnercryolite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="1" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+  <Item name="" nameidentifier="cryolite" identifier="lithomorphspawnercryolite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="2" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.47" sourcerect="0,144,86,147" origin="0.5,0.5" />
@@ -204,8 +204,8 @@
     </MotionSensor>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" canbepicked="False" allowingameediting="False" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" nameidentifier="galena" identifier="lithomorphspawnergalena" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="1" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+  <Item name="" nameidentifier="galena" identifier="lithomorphspawnergalena" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="2" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.47" sourcerect="341,877,86,147" origin="0.5,0.5" />
@@ -245,8 +245,8 @@
     </MotionSensor>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" canbepicked="False" allowingameediting="False" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" nameidentifier="hydroxyapatite" identifier="lithomorphspawnerhydroxyapatite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="1" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+  <Item name="" nameidentifier="hydroxyapatite" identifier="lithomorphspawnerhydroxyapatite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="2" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.47" sourcerect="426,292,86,147" origin="0.5,0.5" />
@@ -287,8 +287,8 @@
     </MotionSensor>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" canbepicked="False" allowingameediting="False" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" nameidentifier="pyromorphite" identifier="lithomorphspawnerpyromorphite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="1" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+  <Item name="" nameidentifier="pyromorphite" identifier="lithomorphspawnerpyromorphite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="2" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.47" sourcerect="853,292,86,147" origin="0.5,0.5" />
@@ -328,8 +328,8 @@
     </MotionSensor>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" canbepicked="False" allowingameediting="False" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" nameidentifier="sphalerite" identifier="lithomorphspawnersphalerite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="1" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+  <Item name="" nameidentifier="sphalerite" identifier="lithomorphspawnersphalerite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="2" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.47" sourcerect="172,585,84,147" origin="0.5,0.5" />
@@ -369,8 +369,8 @@
     </MotionSensor>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" canbepicked="False" allowingameediting="False" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" nameidentifier="sylvite" identifier="lithomorphspawnersylvite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="1" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+  <Item name="" nameidentifier="sylvite" identifier="lithomorphspawnersylvite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="2" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.47" sourcerect="256,146,86,147" origin="0.5,0.5" />
@@ -411,8 +411,8 @@
     </MotionSensor>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" canbepicked="False" allowingameediting="False" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" nameidentifier="triphylite" identifier="lithomorphspawnertriphylite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="1" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+  <Item name="" nameidentifier="triphylite" identifier="lithomorphspawnertriphylite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="2" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.47" sourcerect="256,0,86,147" origin="0.5,0.5" />
@@ -452,8 +452,8 @@
     </MotionSensor>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" canbepicked="False" allowingameediting="False" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" nameidentifier="titanite" identifier="lithomorphspawnertitanite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="1" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+  <Item name="" nameidentifier="titanite" identifier="lithomorphspawnertitanite" category="Material" Tags="smallitem,ore,lithomorphspawner" maxstacksize="2" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" health="10" noninteractable="true" damagedbyprojectiles="true" damagedbyexplosions="true" hideinmenus="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.47" sourcerect="512,730,86,147" origin="0.5,0.5" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Events/Missions.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Events/Missions.xml
index ca3b6cb7..d6ee89aa 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Events/Missions.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Events/Missions.xml	
@@ -4,7 +4,7 @@
   <!--OVERRIDES-->
   <!--OVERRIDES-->
   <Override>
-    <OutpostDestroyMission identifier="huskcultspecialassassinate" type="OutpostDestroy" achievementidentifier="huskcultspecialassassinate" reward="2000" difficulty="4" commonness="0" allowretry="true" sonarlabel="target" requireCorrectLocationType="true" BlockLocationTypeChanges="true">
+    <OutpostDestroyMission identifier="huskcultspecialassassinate" type="OutpostDestroy" achievementidentifier="huskcultspecialassassinate" reward="8000" difficulty="4" commonness="0" allowretry="true" sonarlabel="target" requireCorrectLocationType="true" BlockLocationTypeChanges="true">
       <Reputation identifier="huskcult" amount="10" />
       <Reputation identifier="coalition" amount="-5" />
       <Icon texture="Content/UI/MissionIcons.png" sourcerect="0,512,256,256" color="214,50,48" />
@@ -38,7 +38,7 @@
       <Metadata identifier="tormsdalereport" value="2" />
     </SalvageMission>
     <!-- Added Base -->
-    <OutpostMission identifier="jailbreak_coalition" name="missionname.jailbreak" successmessage="missionsuccess.jailbreak" failuremessage="missionfailure.jailbreak" tags="jailbreak_coalition" requiredlocationfaction="separatists" achievementidentifier="jailbreak_coalition" type="AbandonedOutpost" reward="3000" difficulty="3" commonness="100" allowretry="true" hostageskilledmessage="prisonerkilled">
+    <OutpostMission identifier="jailbreak_coalition" name="missionname.jailbreak" successmessage="missionsuccess.jailbreak" failuremessage="missionfailure.jailbreak" tags="jailbreak_coalition" requiredlocationfaction="separatists" achievementidentifier="jailbreak_coalition" type="AbandonedOutpost" reward="12000" difficulty="3" commonness="100" allowretry="true" hostageskilledmessage="prisonerkilled">
       <Icon texture="Content/UI/MissionIcons.png" sourcerect="512,256,256,256" color="214,50,48" />
       <LocationType identifier="Colony" />
       <LocationType identifier="City" />
@@ -53,7 +53,7 @@
       <Reputation identifier="coalition" amount="5" amountforopposingfaction="-5" />
       <message header="missionheader0.prisonerrescue" text="missionmessage0.prisonerrescue" />
     </OutpostMission>
-    <OutpostMission identifier="jailbreak_separatists" name="missionname.jailbreak" successmessage="missionsuccess.jailbreak" failuremessage="missionfailure.jailbreak" tags="jailbreak_separatists" requiredlocationfaction="coalition" achievementidentifier="jailbreak_separatists" type="AbandonedOutpost" reward="3000" difficulty="3" commonness="100" allowretry="true" hostageskilledmessage="prisonerkilled">
+    <OutpostMission identifier="jailbreak_separatists" name="missionname.jailbreak" successmessage="missionsuccess.jailbreak" failuremessage="missionfailure.jailbreak" tags="jailbreak_separatists" requiredlocationfaction="coalition" achievementidentifier="jailbreak_separatists" type="AbandonedOutpost" reward="12000" difficulty="3" commonness="100" allowretry="true" hostageskilledmessage="prisonerkilled">
       <Icon texture="Content/UI/MissionIcons.png" sourcerect="512,256,256,256" color="214,50,48" />
       <LocationType identifier="Colony" />
       <LocationType identifier="City" />
@@ -68,7 +68,7 @@
       <Reputation identifier="separatists" amount="5" amountforopposingfaction="-5" />
       <message header="missionheader0.prisonerrescue" text="missionmessage0.prisonerrescue" />
     </OutpostMission>
-    <OutpostMission identifier="jailbreak_sootman" name="missionname.jailbreak" successmessage="missionsuccess.jailbreak_singletarget" failuremessage="missionfailure.jailbreak_singletarget" tags="jailbreak_separatists" achievementidentifier="jailbreak_sootman" type="AbandonedOutpost" alloworderingrescuees="false" reward="3000" difficulty="3" commonness="0" allowretry="true" hostageskilledmessage="prisonerkilled" BlockLocationTypeChanges="true">
+    <OutpostMission identifier="jailbreak_sootman" name="missionname.jailbreak" successmessage="missionsuccess.jailbreak_singletarget" failuremessage="missionfailure.jailbreak_singletarget" tags="jailbreak_separatists" achievementidentifier="jailbreak_sootman" type="AbandonedOutpost" alloworderingrescuees="false" reward="12000" difficulty="3" commonness="0" allowretry="true" hostageskilledmessage="prisonerkilled" BlockLocationTypeChanges="true">
       <Icon texture="Content/UI/MissionIcons.png" sourcerect="512,256,256,256" color="214,50,48" />
       <LocationType identifier="Colony" />
       <LocationType identifier="City" />
@@ -83,7 +83,7 @@
       <Metadata identifier="sootman_freed" value="true" />
     </OutpostMission>
     <!-- -2 bandit rep for doing abandoned outposts -->
-    <AbandonedOutpostMission identifier="abandonedoutposthumans" tags="abandonedoutpost" achievementidentifier="abandonedoutpostdestroyhumans" type="OutpostDestroy" reward="3000" difficulty="2" commonness="100" allowretry="true" targetitem="reactor" unhideentitysubcategories="abandonedhuman" maxleveldifficulty="65">
+    <AbandonedOutpostMission identifier="abandonedoutposthumans" tags="abandonedoutpost" achievementidentifier="abandonedoutpostdestroyhumans" type="OutpostDestroy" reward="12000" difficulty="2" commonness="100" allowretry="true" targetitem="reactor" unhideentitysubcategories="abandonedhuman" maxleveldifficulty="65">
       <Reputation identifier="bandits" amount="-2" />
       <Icon texture="Content/UI/MissionIcons.png" sourcerect="512,256,256,256" color="214,50,48" />
       <LocationType identifier="Abandoned" />
@@ -101,7 +101,7 @@
       <TriggerEvent state="0" delay="5" eventidentifier="heartofgold" campaignonly="true" />
       <message header="missionheader0.abandonedoutposthumans" text="missionmessage0.abandonedoutposthumans" />
     </AbandonedOutpostMission>
-    <AbandonedOutpostMission identifier="abandonedoutposthumans2" textidentifier="abandonedoutposthumans" tags="abandonedoutpost" achievementidentifier="abandonedoutpostdestroyhumans" type="OutpostDestroy" reward="4000" difficulty="3" commonness="100" allowretry="true" targetitem="reactor" unhideentitysubcategories="abandonedhuman" minleveldifficulty="50">
+    <AbandonedOutpostMission identifier="abandonedoutposthumans2" textidentifier="abandonedoutposthumans" tags="abandonedoutpost" achievementidentifier="abandonedoutpostdestroyhumans" type="OutpostDestroy" reward="16000" difficulty="3" commonness="100" allowretry="true" targetitem="reactor" unhideentitysubcategories="abandonedhuman" minleveldifficulty="50">
       <Reputation identifier="bandits" amount="-2" />
       <Icon texture="Content/UI/MissionIcons.png" sourcerect="512,256,256,256" color="214,50,48" />
       <LocationType identifier="Abandoned" />
@@ -120,7 +120,7 @@
       <TriggerEvent state="0" delay="5" eventidentifier="heartofgold" campaignonly="true" />
       <message header="missionheader0.abandonedoutposthumans" text="missionmessage0.abandonedoutposthumans" />
     </AbandonedOutpostMission>
-    <AbandonedOutpostMission identifier="abandonedoutposthumans3" textidentifier="abandonedoutposthumans" tags="abandonedoutpost" achievementidentifier="abandonedoutpostdestroyhumans" type="OutpostDestroy" reward="6000" difficulty="4" commonness="100" allowretry="true" targetitem="reactor" unhideentitysubcategories="abandonedhuman" minleveldifficulty="65">
+    <AbandonedOutpostMission identifier="abandonedoutposthumans3" textidentifier="abandonedoutposthumans" tags="abandonedoutpost" achievementidentifier="abandonedoutpostdestroyhumans" type="OutpostDestroy" reward="24000" difficulty="4" commonness="100" allowretry="true" targetitem="reactor" unhideentitysubcategories="abandonedhuman" minleveldifficulty="65">
       <Reputation identifier="bandits" amount="-2" />
       <Icon texture="Content/UI/MissionIcons.png" sourcerect="512,256,256,256" color="214,50,48" />
       <LocationType identifier="Abandoned" />
@@ -141,17 +141,17 @@
       <message header="missionheader0.abandonedoutposthumans" text="missionmessage0.abandonedoutposthumans" />
     </AbandonedOutpostMission>
     <!-- Variants of abyssals that avoid abyss and roam main path -->
-    <MonsterMission identifier="huntinggrounds1" textidentifier="huntinggrounds" tags="huntinggrounds,hard" type="Monster" sideobjective="true" difficulty="4" commonness="0" reward="6500" sonarlabel="target" spawntype="MainPath" maxsonarmarkerdistance="20000" successmessage="" monsterfile="Endworm_Hunting">
+    <MonsterMission identifier="huntinggrounds1" textidentifier="huntinggrounds" tags="huntinggrounds,hard" type="Monster" sideobjective="true" difficulty="4" commonness="0" reward="26000" sonarlabel="target" spawntype="MainPath" maxsonarmarkerdistance="20000" successmessage="" monsterfile="Endworm_Hunting">
       <Reputation identifier="location" amount="2" />
       <Icon texture="Content/UI/MissionIcons2.png" sourcerect="256,768,256,256" color="214,50,48" />
       <message header="missionheader0.huntinggrounds1" text="missionmessage0.huntinggrounds1" />
     </MonsterMission>
-    <MonsterMission identifier="huntinggrounds2" textidentifier="huntinggrounds" tags="huntinggrounds" type="Monster" sideobjective="true" difficulty="4" commonness="0" reward="6500" sonarlabel="target" spawntype="MainPath" maxsonarmarkerdistance="20000" successmessage="" monsterfile="Charybdis_Hunting">
+    <MonsterMission identifier="huntinggrounds2" textidentifier="huntinggrounds" tags="huntinggrounds" type="Monster" sideobjective="true" difficulty="4" commonness="0" reward="26000" sonarlabel="target" spawntype="MainPath" maxsonarmarkerdistance="20000" successmessage="" monsterfile="Charybdis_Hunting">
       <Reputation identifier="location" amount="2" />
       <Icon texture="Content/UI/MissionIcons2.png" sourcerect="256,768,256,256" color="214,50,48" />
       <message header="missionheader0.huntinggrounds1" text="missionmessage0.huntinggrounds1" />
     </MonsterMission>
-    <MonsterMission identifier="huntinggrounds3" textidentifier="huntinggrounds" tags="huntinggrounds,easy" type="Monster" sideobjective="true" difficulty="4" commonness="0" reward="6500" sonarlabel="target" spawntype="MainPath" maxsonarmarkerdistance="20000" successmessage="" monsterfile="Latcher_Hunting">
+    <MonsterMission identifier="huntinggrounds3" textidentifier="huntinggrounds" tags="huntinggrounds,easy" type="Monster" sideobjective="true" difficulty="4" commonness="0" reward="26000" sonarlabel="target" spawntype="MainPath" maxsonarmarkerdistance="20000" successmessage="" monsterfile="Latcher_Hunting">
       <Reputation identifier="location" amount="2" />
       <Icon texture="Content/UI/MissionIcons2.png" sourcerect="256,768,256,256" color="214,50,48" />
       <message header="missionheader0.huntinggrounds1" text="missionmessage0.huntinggrounds1" />
@@ -161,7 +161,7 @@
   <!--END OF OVERRIDES-->
   <!--END OF OVERRIDES-->
   <!-- Lair -->
-  <CrawlerLairMission identifier="crawlerlair1" textidentifier="destroylair" tags="destroylair,crawlerlair" type="OutpostDestroy" reward="2000" difficulty="3" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="0" maxleveldifficulty="30">
+  <CrawlerLairMission identifier="crawlerlair1" textidentifier="destroylair" tags="destroylair,crawlerlair" type="OutpostDestroy" reward="8000" difficulty="3" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="0" maxleveldifficulty="30">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationTypeChange from="Lair" to="None" requiredduration="1" cooldownafterchange="1" />
@@ -185,7 +185,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </CrawlerLairMission>
-  <CrawlerLairMission identifier="crawlerlair2" textidentifier="destroylair" tags="destroylair,crawlerlair" type="OutpostDestroy" reward="2500" difficulty="3" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="30" maxleveldifficulty="50">
+  <CrawlerLairMission identifier="crawlerlair2" textidentifier="destroylair" tags="destroylair,crawlerlair" type="OutpostDestroy" reward="10000" difficulty="3" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="30" maxleveldifficulty="50">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationTypeChange from="Lair" to="None" requiredduration="1" cooldownafterchange="1" />
@@ -213,7 +213,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </CrawlerLairMission>
-  <CrawlerLairMission identifier="crawlerlair3" textidentifier="destroylair" tags="destroylair,crawlerlair" type="OutpostDestroy" reward="3000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="50">
+  <CrawlerLairMission identifier="crawlerlair3" textidentifier="destroylair" tags="destroylair,crawlerlair" type="OutpostDestroy" reward="12000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="50">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationTypeChange from="Lair" to="None" requiredduration="1" cooldownafterchange="1" />
@@ -252,7 +252,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </CrawlerLairMission>
-  <MudraptorLairMission identifier="mudraptorlair1" textidentifier="destroylair" tags="destroylair,mudraptorlair" type="OutpostDestroy" reward="3000" difficulty="3" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="15" maxleveldifficulty="40">
+  <MudraptorLairMission identifier="mudraptorlair1" textidentifier="destroylair" tags="destroylair,mudraptorlair" type="OutpostDestroy" reward="12000" difficulty="3" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="15" maxleveldifficulty="40">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationTypeChange from="Lair" to="None" requiredduration="1" cooldownafterchange="1" />
@@ -276,7 +276,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </MudraptorLairMission>
-  <MudraptorLairMission identifier="mudraptorlair2" textidentifier="destroylair" tags="destroylair,mudraptorlair" type="OutpostDestroy" reward="3500" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="40" maxleveldifficulty="60">
+  <MudraptorLairMission identifier="mudraptorlair2" textidentifier="destroylair" tags="destroylair,mudraptorlair" type="OutpostDestroy" reward="14000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="40" maxleveldifficulty="60">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationTypeChange from="Lair" to="None" requiredduration="1" cooldownafterchange="1" />
@@ -305,7 +305,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </MudraptorLairMission>
-  <MudraptorLairMission identifier="mudraptorlair3" textidentifier="destroylair" tags="destroylair,mudraptorlair" type="OutpostDestroy" reward="4000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="60">
+  <MudraptorLairMission identifier="mudraptorlair3" textidentifier="destroylair" tags="destroylair,mudraptorlair" type="OutpostDestroy" reward="16000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="60">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationTypeChange from="Lair" to="None" requiredduration="1" cooldownafterchange="1" />
@@ -341,7 +341,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </MudraptorLairMission>
-  <ThresherLairMission identifier="thresherlair1" textidentifier="destroylair" tags="destroylair,thresherlair" type="OutpostDestroy" reward="3000" difficulty="3" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="45" maxleveldifficulty="60">
+  <ThresherLairMission identifier="thresherlair1" textidentifier="destroylair" tags="destroylair,thresherlair" type="OutpostDestroy" reward="12000" difficulty="3" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="45" maxleveldifficulty="60">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationTypeChange from="Lair" to="None" requiredduration="1" cooldownafterchange="1" />
@@ -367,7 +367,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </ThresherLairMission>
-  <ThresherLairMission identifier="thresherlair2" textidentifier="destroylair" tags="destroylair,thresherlair" type="OutpostDestroy" reward="3500" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="60" maxleveldifficulty="75">
+  <ThresherLairMission identifier="thresherlair2" textidentifier="destroylair" tags="destroylair,thresherlair" type="OutpostDestroy" reward="14000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="60" maxleveldifficulty="75">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationTypeChange from="Lair" to="None" requiredduration="1" cooldownafterchange="1" />
@@ -404,7 +404,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </ThresherLairMission>
-  <ThresherLairMission identifier="thresherlair3" textidentifier="destroylair" tags="destroylair,thresherlair" type="OutpostDestroy" reward="4000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="75">
+  <ThresherLairMission identifier="thresherlair3" textidentifier="destroylair" tags="destroylair,thresherlair" type="OutpostDestroy" reward="16000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="75">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationTypeChange from="Lair" to="None" requiredduration="1" cooldownafterchange="1" />
@@ -441,7 +441,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </ThresherLairMission>
-  <HuskCrawlerLairMission identifier="huskcrawlerlair1" textidentifier="huskcrawlerlair" tags="husklair" type="OutpostDestroy" reward="4000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Target" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="0" maxleveldifficulty="50">
+  <HuskCrawlerLairMission identifier="huskcrawlerlair1" textidentifier="huskcrawlerlair" tags="husklair" type="OutpostDestroy" reward="16000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Target" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="0" maxleveldifficulty="50">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="HuskgroundsDE" />
     <LocationTypeChange from="HuskgroundsDE" to="MilitaryForces" requiredduration="1" cooldownafterchange="1" />
@@ -457,7 +457,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </HuskCrawlerLairMission>
-  <HuskCrawlerLairMission identifier="huskcrawlerlair2" textidentifier="huskcrawlerlair" tags="husklair" type="OutpostDestroy" reward="4500" difficulty="4" commonness="100" allowretry="true" sonarlabel="Target" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="50" maxleveldifficulty="100">
+  <HuskCrawlerLairMission identifier="huskcrawlerlair2" textidentifier="huskcrawlerlair" tags="husklair" type="OutpostDestroy" reward="18000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Target" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true" minleveldifficulty="50" maxleveldifficulty="100">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="HuskgroundsDE" />
     <LocationTypeChange from="HuskgroundsDE" to="MilitaryForces" requiredduration="1" cooldownafterchange="1" />
@@ -473,14 +473,14 @@
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </HuskCrawlerLairMission>
   <!-- Electric Spineling -->
-  <MonsterMission identifier="killelectricspineling1" tags="killmonster_thegreatsea" type="Monster" difficulty="3" commonness="33" reward="3500" maxsonarmarkerdistance="10000" sonarlabel="character.spineling" monsterfile="spineling_electric">
+  <MonsterMission identifier="killelectricspineling1" tags="killmonster_thegreatsea" type="Monster" difficulty="3" commonness="33" reward="14000" maxsonarmarkerdistance="10000" sonarlabel="character.spineling" monsterfile="spineling_electric">
     <monster character="spineling" min="4" max="8" />
     <monster character="spineling_electric" min="1" max="1" />
     <Reputation identifier="location" amount="2" />
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="768,768,256,256" color="10,100,150" />
     <message header="missionheader0.spineling_electric1" text="missionmessage0.spineling_electric1" />
   </MonsterMission>
-  <MonsterMission identifier="killelectricspineling2" tags="killmonster_thegreatsea" type="Monster" difficulty="4" commonness="33" reward="4500" maxsonarmarkerdistance="10000" sonarlabel="character.spineling" monsterfile="spineling_electric">
+  <MonsterMission identifier="killelectricspineling2" tags="killmonster_thegreatsea" type="Monster" difficulty="4" commonness="33" reward="18000" maxsonarmarkerdistance="10000" sonarlabel="character.spineling" monsterfile="spineling_electric">
     <monster character="spineling" min="4" max="5" />
     <monster character="spineling_electric" min="2" max="2" />
     <Reputation identifier="location" amount="2" />
@@ -532,17 +532,17 @@
     <message header="missionheader0.pirate_heavy" text="missionmessage0.pirate_heavy" />
     <message header="missionheader1.pirate_heavy" text="missionmessage1.pirate_heavy" />
   </PirateMission>
-  <PirateMission type="Pirate" identifier="pirate_heavy" tags="piratemission,heavypirate" difficulty="4" commonness="100" reward="3500" achievementidentifier="piratemission" addedmissiondifficultyperplayer="8">
+  <PirateMission type="Pirate" identifier="pirate_heavy" tags="piratemission,heavypirate" difficulty="4" commonness="100" reward="14000" achievementidentifier="piratemission" addedmissiondifficultyperplayer="8">
     <Reputation identifier="coalition" amount="7" />
     <Reputation identifier="separatists" amount="7" />
     <Reputation identifier="bandits" amount="-2" />
     <SubmarineTypes>
-      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/U-41SPirate.sub" preferreddifficulty="20" alternatereward="3000" />
-      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/LuotiPirate.sub" preferreddifficulty="30" alternatereward="3500" />
-      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/GunGatorPirate.sub" preferreddifficulty="35" alternatereward="3500" />
-      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/BerthaPirate.sub" preferreddifficulty="40" alternatereward="4000" />
-      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/Winterhalter [PIRATE].sub" preferreddifficulty="40" alternatereward="4500" />
-      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/U-42CPirate.sub" preferreddifficulty="50" alternatereward="5000" />
+      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/U-41SPirate.sub" preferreddifficulty="20" alternatereward="12000" />
+      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/LuotiPirate.sub" preferreddifficulty="30" alternatereward="14000" />
+      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/GunGatorPirate.sub" preferreddifficulty="35" alternatereward="14000" />
+      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/BerthaPirate.sub" preferreddifficulty="40" alternatereward="16000" />
+      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/Winterhalter [PIRATE].sub" preferreddifficulty="40" alternatereward="18000" />
+      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/U-42CPirate.sub" preferreddifficulty="50" alternatereward="20000" />
     </SubmarineTypes>
     <Characters>
       <Character typeidentifier="piratecaptain" minamount="1" maxamount="1" />
@@ -579,14 +579,14 @@
     <message header="missionheader0.pirate_heavy" text="missionmessage0.pirate_heavy" />
     <message header="missionheader1.pirate_heavy" text="missionmessage1.pirate_heavy" />
   </PirateMission>
-  <PirateMission type="Pirate" identifier="pirate_party" tags="piratemission,partypirate" difficulty="4" commonness="20" reward="5000" achievementidentifier="piratemission" addedmissiondifficultyperplayer="8">
+  <PirateMission type="Pirate" identifier="pirate_party" tags="piratemission,partypirate" difficulty="4" commonness="20" reward="20000" achievementidentifier="piratemission" addedmissiondifficultyperplayer="8">
     <Reputation identifier="coalition" amount="3" />
     <Reputation identifier="separatists" amount="3" />
     <Reputation identifier="huskcult" amount="3" />
     <Reputation identifier="clowns" amount="-5" />
     <SubmarineTypes>
-      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/U-41SPartyPirate.sub" preferreddifficulty="20" alternatereward="5000" />
-      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/Warden Raving Vessel 1.sub" preferreddifficulty="40" alternatereward="5000" />
+      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/U-41SPartyPirate.sub" preferreddifficulty="20" alternatereward="20000" />
+      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/Warden Raving Vessel 1.sub" preferreddifficulty="40" alternatereward="20000" />
     </SubmarineTypes>
     <Characters>
       <Character typeidentifier="partypiratecaptain" minamount="1" maxamount="1" />
@@ -620,12 +620,12 @@
     <message header="missionheader1.pirate_party" text="missionmessage1.pirate_party" />
   </PirateMission>
   <!--STRANGE VESSEL MISSIONS-->
-  <PirateMission type="Pirate" identifier="pirate_piezo" tags="piratemission,strangepirate" difficulty="4" commonness="20" reward="5000" achievementidentifier="piratemission" addedmissiondifficultyperplayer="8">
+  <PirateMission type="Pirate" identifier="pirate_piezo" tags="piratemission,strangepirate" difficulty="4" commonness="20" reward="20000" achievementidentifier="piratemission" addedmissiondifficultyperplayer="8">
     <Reputation identifier="coalition" amount="10" />
     <Reputation identifier="separatists" amount="10" />
     <Reputation identifier="bandits" amount="-2" />
     <SubmarineTypes>
-      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/U-42PiezoPirate.sub" preferreddifficulty="50" alternatereward="5000" />
+      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Pirates/U-42PiezoPirate.sub" preferreddifficulty="50" alternatereward="20000" />
     </SubmarineTypes>
     <Characters>
       <Character typeidentifier="piratecaptain" minamount="1" maxamount="1" />
@@ -918,7 +918,7 @@
 	</OutpostDestroyMission>
 	-->
   <!--OUTPOST TAKEOVER-->
-  <OutpostDestroyMission name="Coalition Station-Takeover" identifier="cotakeover_separatistoutpost" tags="outposttakeovermission" type="OutpostDestroy" requireCorrectLocationType="true" locations="city,research,military,colony,base,blockade,hospital,factory,shipyard" reward="5000" difficulty="4" commonness="0" allowretry="true" BlockLocationTypeChanges="true">
+  <OutpostDestroyMission name="Coalition Station-Takeover" identifier="cotakeover_separatistoutpost" tags="outposttakeovermission" type="OutpostDestroy" requireCorrectLocationType="true" locations="city,research,military,colony,base,blockade,hospital,factory,shipyard" reward="20000" difficulty="4" commonness="0" allowretry="true" BlockLocationTypeChanges="true">
     <Reputation identifier="separatists" amount="-200" />
     <Reputation identifier="coalition" amount="10" />
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="0,512,256,256" color="214,50,48" />
@@ -952,7 +952,7 @@
     <message header="missionheader0.coalitiontakeover" text="missionmessage0.coalitiontakeover" />
     <!-- <Metadata identifier="completedcoalitiontakeover" operation="Add" value="1"/> -->
   </OutpostDestroyMission>
-  <OutpostDestroyMission name="Separatist Station-Takeover" identifier="septakeover_coalitionoutpost" tags="outposttakeovermission" type="OutpostDestroy" requireCorrectLocationType="true" locations="city,research,military,colony,base,blockade,hospital,factory,shipyard" reward="5000" difficulty="4" commonness="0" allowretry="true" BlockLocationTypeChanges="true">
+  <OutpostDestroyMission name="Separatist Station-Takeover" identifier="septakeover_coalitionoutpost" tags="outposttakeovermission" type="OutpostDestroy" requireCorrectLocationType="true" locations="city,research,military,colony,base,blockade,hospital,factory,shipyard" reward="20000" difficulty="4" commonness="0" allowretry="true" BlockLocationTypeChanges="true">
     <Reputation identifier="coalition" amount="-200" />
     <Reputation identifier="separatists" amount="10" />
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="0,512,256,256" color="214,50,48" />
@@ -1083,7 +1083,7 @@
     <message header="missionheader0.surveyedminerals" text="missionmessage0.surveyedminerals" />
   </MineralMission>
   <!-- BACKWARDS COMPATIBILITY | THESE MISSIONS ARE UNOBTAINABLE THROUGH GAMEPLAY AND ONLY EXIST TO ALLOW OLDER CAMPAIGNS TO LOAD -->
-  <CrawlerLairMission identifier="crawlerlair" tags="" type="OutpostDestroy" textidentifier="destroylair" reward="3500" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true">
+  <CrawlerLairMission identifier="crawlerlair" tags="" type="OutpostDestroy" textidentifier="destroylair" reward="14000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationTypeChange from="Lair" to="None" requiredduration="1" cooldownafterchange="1" />
@@ -1111,7 +1111,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </CrawlerLairMission>
-  <MudraptorLairMission identifier="mudraptorlair" tags="" type="OutpostDestroy" textidentifier="destroylair" reward="4000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true">
+  <MudraptorLairMission identifier="mudraptorlair" tags="" type="OutpostDestroy" textidentifier="destroylair" reward="16000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationType identifier="LairMudraptor" />
@@ -1142,7 +1142,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </MudraptorLairMission>
-  <ThresherLairMission identifier="thresherlair" tags="" type="OutpostDestroy" textidentifier="destroylair" reward="4500" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true">
+  <ThresherLairMission identifier="thresherlair" tags="" type="OutpostDestroy" textidentifier="destroylair" reward="18000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Nest" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="Lair" />
     <LocationType identifier="LairThresher" />
@@ -1181,7 +1181,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </ThresherLairMission>
-  <HuskCrawlerLairMission identifier="huskcrawlerlair" tags="" type="OutpostDestroy" reward="4500" difficulty="4" commonness="100" allowretry="true" sonarlabel="Target" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true">
+  <HuskCrawlerLairMission identifier="huskcrawlerlair" tags="" type="OutpostDestroy" reward="18000" difficulty="4" commonness="100" allowretry="true" sonarlabel="Target" unhideentitysubcategories="abandonedmonster" requireCorrectLocationType="true">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="214,50,48" />
     <LocationType identifier="HuskgroundsDE" />
     <LocationTypeChange from="HuskgroundsDE" to="MilitaryForces" requiredduration="1" cooldownafterchange="1" />
@@ -1195,7 +1195,7 @@
     <message header="missionheader0.destroylair" text="missionmessage0.destroylair" />
     <TriggerEvent state="0" eventidentifier="lairbombspawn" campaignonly="true" />
   </HuskCrawlerLairMission>
-  <OutpostMission identifier="vipnapping" name="missionname.vipnapping" successmessage="missionsuccess.vipnapping" failuremessage="missionfailure.vipnapping" tags="vipnapping" type="AbandonedOutpost" alloworderingrescuees="false" reward="3000" difficulty="3" commonness="0" allowretry="true" hostageskilledmessage="vipkilled" BlockLocationTypeChanges="true">
+  <OutpostMission identifier="vipnapping" name="missionname.vipnapping" successmessage="missionsuccess.vipnapping" failuremessage="missionfailure.vipnapping" tags="vipnapping" type="AbandonedOutpost" alloworderingrescuees="false" reward="12000" difficulty="3" commonness="0" allowretry="true" hostageskilledmessage="vipkilled" BlockLocationTypeChanges="true">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="512,512,256,256" color="130,90,90" />
     <LocationType identifier="colony" />
     <LocationType identifier="city" />
@@ -1211,7 +1211,7 @@
     <message header="missionheader0.vipnapping" text="missionmessage0.vipnapping" />
     <Metadata identifier="vipnappingnorepeat" value="1" />
   </OutpostMission>
-  <AbandonedOutpostMission identifier="silencewitness" tags="assasination" achievementidentifier="abandonedoutpostassassinate" type="OutpostDestroy" reward="3000" difficulty="3" commonness="100" allowretry="true" description="missiondescription.silencewitness" successmessage="missionsuccess.silencewitness" failuremessage="missionfailure.silencewitness">
+  <AbandonedOutpostMission identifier="silencewitness" tags="assasination" achievementidentifier="abandonedoutpostassassinate" type="OutpostDestroy" reward="12000" difficulty="3" commonness="100" allowretry="true" description="missiondescription.silencewitness" successmessage="missionsuccess.silencewitness" failuremessage="missionfailure.silencewitness">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="0,512,256,256" color="125,90,90,255" />
     <LocationType identifier="Colony" />
     <LocationType identifier="City" />
@@ -1226,7 +1226,7 @@
     <Reputation identifier="bandits" amount="3" />
     <Metadata identifier="silencewitnessnorepeat" value="1" />
   </AbandonedOutpostMission>
-  <OutpostDestroyMission name="Hostage Situation" identifier="hostagesituation" tags="outposttakeovermission" type="OutpostDestroy" requireCorrectLocationType="true" reward="3500" difficulty="3" commonness="0" allowretry="true" BlockLocationTypeChanges="true" hostageskilledmessage="hostagesexecuted">
+  <OutpostDestroyMission name="Hostage Situation" identifier="hostagesituation" tags="outposttakeovermission" type="OutpostDestroy" requireCorrectLocationType="true" reward="14000" difficulty="3" commonness="0" allowretry="true" BlockLocationTypeChanges="true" hostageskilledmessage="hostagesexecuted">
     <Reputation identifier="location" amount="5" />
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="512,512,256,256" color="60,125,125" />
     <Characters>
@@ -1255,7 +1255,7 @@
     <CompleteCheckDataAction identifier="hostagesituationresolved" condition="eq 1" />
     <CompleteCheckDataAction identifier="hostagesalive" condition="eq 1" />
   </OutpostDestroyMission>
-  <EscortMission identifier="escortmedivac" tags="escortmedivac,escort" type="Escort" difficulty="2" commonness="100" reward="2000" achievementidentifier="escortmission" baseescortedcharacters="1">
+  <EscortMission identifier="escortmedivac" tags="escortmedivac,escort" type="Escort" difficulty="2" commonness="100" reward="8000" achievementidentifier="escortmission" baseescortedcharacters="1">
     <Characters>
       <Character from="customnpcs" identifier="sickpatient">
         <StatusEffect target="Character" delay="1" disabledeltatime="true">
@@ -1271,34 +1271,34 @@
     <LocationType from="AnyOutpost" to="HuskChurch" />
     <message header="missionheader0.escortmedivac" text="missionmessage0.escortmedivac" />
   </EscortMission>
-  <SalvageMission identifier="retrieveindustrialwaste" name="missionname.retrieveindustrialwaste" description="missiondescription.retrieveindustrialwaste" successmessage="missionsuccess.retrieveindustrialwaste" failuremessage="missionfailure.retrieveindustrialwaste" tags="salvageindustrial" type="Salvage" difficulty="3" commonness="100" reward="2000" requireddeliveryamount="0.80" PartiallyRetrievedMessage="missionmessage.retrieveindustrialwaste.partiallyretrieved" AllRetrievedMessage="missionmessage.retrieveindustrialwaste.allretrieved">
+  <SalvageMission identifier="retrieveindustrialwaste" name="missionname.retrieveindustrialwaste" description="missiondescription.retrieveindustrialwaste" successmessage="missionsuccess.retrieveindustrialwaste" failuremessage="missionfailure.retrieveindustrialwaste" tags="salvageindustrial" type="Salvage" difficulty="3" commonness="100" reward="8000" requireddeliveryamount="0.80" PartiallyRetrievedMessage="missionmessage.retrieveindustrialwaste.partiallyretrieved" AllRetrievedMessage="missionmessage.retrieveindustrialwaste.allretrieved">
     <Reputation identifier="location" amount="3" />
     <Portrait texture="Content/Map/LocationPortraits/Wreck1.png" sourcerect="0,0,2160,1080" premultiplyalpha="false" />
     <target spawntype="mainpath" itemidentifier="radioactivewaste" sonarlabel="missionsonarlabel.retrieveindustrialwaste" allowcontinuebeforeretrieved="true" requireretrieval="RetrievedToSub" hidelabelafterretrieved="false" minamount="5" maxamount="7"></target>
     <LocationType from="AnyOutpost" to="AnyOutpost" />
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="512,256,256,256" color="120,214,48" />
   </SalvageMission>
-  <SalvageMission identifier="retrievehammerheadmucus" name="missionname.retrievehammerheadmucus" description="missiondescription.retrievehammerheadmucus" successmessage="missionsuccess.retrievehammerheadmucus" failuremessage="missionfailure.retrievehammerheadmucus" tags="salvagemedical" type="Salvage" difficulty="2" commonness="80" reward="2000" requireddeliveryamount="0.01" PartiallyRetrievedMessage="missionmessage.retrievehammerheadmucus.partiallyretrieved" AllRetrievedMessage="missionmessage.retrievehammerheadmucus.allretrieved">
+  <SalvageMission identifier="retrievehammerheadmucus" name="missionname.retrievehammerheadmucus" description="missiondescription.retrievehammerheadmucus" successmessage="missionsuccess.retrievehammerheadmucus" failuremessage="missionfailure.retrievehammerheadmucus" tags="salvagemedical" type="Salvage" difficulty="2" commonness="80" reward="8000" requireddeliveryamount="0.01" PartiallyRetrievedMessage="missionmessage.retrievehammerheadmucus.partiallyretrieved" AllRetrievedMessage="missionmessage.retrievehammerheadmucus.allretrieved">
     <Reputation identifier="location" amount="3" />
     <Portrait texture="Content/Map/LocationPortraits/Wreck1.png" sourcerect="0,0,2160,1080" premultiplyalpha="false" />
     <target spawntype="mainpath" itemidentifier="hammerheadmucus" sonarlabel="missionsonarlabel.retrievehammerheadmucus" allowcontinuebeforeretrieved="true" requireretrieval="RetrievedToSub" hidelabelafterretrieved="false" minamount="4" maxamount="5"></target>
     <LocationType from="AnyOutpost" to="AnyOutpost" />
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="256,256,256,256" color="140,160,90" />
   </SalvageMission>
-  <MonsterMission identifier="salvagekillmoloch" textidentifier="salvagekillmoloch" tags="salvageartifact" type="Monster" difficulty="3" commonness="20" reward="3500" sonarlabel="missionsonarlabel.salvagekillmoloch" maxsonarmarkerdistance="10000" monsterfile="Molochblack">
+  <MonsterMission identifier="salvagekillmoloch" textidentifier="salvagekillmoloch" tags="salvageartifact" type="Monster" difficulty="3" commonness="20" reward="14000" sonarlabel="missionsonarlabel.salvagekillmoloch" maxsonarmarkerdistance="10000" monsterfile="Molochblack">
     <Reputation identifier="location" amount="2" amountforopposingfaction="-2" />
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="768,0,256,256" color="49,93,233" />
     <message header="missionheader0.salvagekillmoloch" text="missionmessage0.salvagekillmoloch" />
   </MonsterMission>
   <!-- turns out for GoTo missions in outposts, you need to use a maxprogressstate that is >1, otherwise it will show up as completed in the menu! -->
-  <GotoMission name="" identifier="industrialincident" type="GoTo" difficulty="2" commonness="0" maxprogressstate="2" reward="3000" BlockLocationTypeChanges="true">
+  <GotoMission name="" identifier="industrialincident" type="GoTo" difficulty="2" commonness="0" maxprogressstate="2" reward="12000" BlockLocationTypeChanges="true">
     <TriggerEvent state="1" delay="5" eventidentifier="industrialincidentevent" campaignonly="true" />
     <LocationType identifier="Factory" />
     <LocationType identifier="Shipyard" />
     <CompleteCheckDataAction identifier="outpostfixed" condition="eq 1" />
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="0,512,256,256" color="230,230,50" />
   </GotoMission>
-  <GotoMission identifier="escortorangeboys" name="missionname.escortorangeboys" description="missiondescription.escortorangeboys" tags="escortfood" type="GoTo" difficulty="2" commonness="0" maxprogressstate="2" reward="2500" successmessage="missionsuccess.escortorangeboys" failuremessage="missionfailure.escortorangeboys">
+  <GotoMission identifier="escortorangeboys" name="missionname.escortorangeboys" description="missiondescription.escortorangeboys" tags="escortfood" type="GoTo" difficulty="2" commonness="0" maxprogressstate="2" reward="10000" successmessage="missionsuccess.escortorangeboys" failuremessage="missionfailure.escortorangeboys">
     <Reputation identifier="location" amount="3" />
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="768,512,256,256" color="240,180,70" />
     <LocationType from="Hydroponics" to="Outpost" />
@@ -1309,9 +1309,9 @@
     <TriggerEvent state="0" delay="0" eventidentifier="escortorangeboysevent" />
     <CompleteCheckDataAction identifier="escortedorangeboys" condition="eq 1" />
   </GotoMission>
-  <CargoMission identifier="cargodefensebots" tags="cargodefensebots" type="Cargo" description="missiondescription.cargodefensebots" difficulty="2" commonness="100" reward="500" achievementidentifier="cargomission" requireddeliveryamount="0.95">
+  <CargoMission identifier="cargodefensebots" tags="cargodefensebots" type="Cargo" description="missiondescription.cargodefensebots" difficulty="2" commonness="100" reward="2000" achievementidentifier="cargomission" requireddeliveryamount="0.95">
     <Items>
-      <Item identifier="cargodefensebot" reward="400" maxcount="5" />
+      <Item identifier="cargodefensebot" reward="1600" maxcount="5" />
     </Items>
     <Reputation identifier="location" amount="3" amountforopposingfaction="-3" />
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="0,256,256,256" color="80,110,90" />
@@ -1326,10 +1326,10 @@
     <LocationType from="AnyOutpost" to="Factory" />
     <LocationType from="AnyOutpost" to="Shipyard" />
   </CargoMission>
-  <CargoMission identifier="cargodefensebots_defective" tags="cargodefensebots" type="Cargo" description="missiondescription.cargodefensebots" difficulty="2" commonness="20" reward="500" achievementidentifier="cargomission" requireddeliveryamount="0.75">
+  <CargoMission identifier="cargodefensebots_defective" tags="cargodefensebots" type="Cargo" description="missiondescription.cargodefensebots" difficulty="2" commonness="20" reward="2000" achievementidentifier="cargomission" requireddeliveryamount="0.75">
     <Items>
-      <Item identifier="cargodefensebot" reward="400" maxcount="4" />
-      <Item identifier="cargodefensebot_defective" reward="400" maxcount="1" />
+      <Item identifier="cargodefensebot" reward="1600" maxcount="4" />
+      <Item identifier="cargodefensebot_defective" reward="1600" maxcount="1" />
     </Items>
     <Reputation identifier="location" amount="3" amountforopposingfaction="-3" />
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="0,256,256,256" color="80,110,90" />
@@ -1345,7 +1345,7 @@
     <LocationType from="AnyOutpost" to="Shipyard" />
   </CargoMission>
   <!-- turns out for GoTo missions in outposts, you need to use a maxprogressstate that is >1, otherwise it will show up as completed in the menu! -->
-  <GotoMission name="" identifier="alcoholcontraband" type="GoTo" difficulty="1" commonness="0" maxprogressstate="2" reward="1500" BlockLocationTypeChanges="true">
+  <GotoMission name="" identifier="alcoholcontraband" type="GoTo" difficulty="1" commonness="0" maxprogressstate="2" reward="6000" BlockLocationTypeChanges="true">
     <Reputation identifier="bandits" amount="3" />
     <TriggerEvent state="1" delay="5" eventidentifier="alcoholcontrabandevent" campaignonly="true" />
     <LocationType identifier="Settlement" />
@@ -1365,7 +1365,7 @@
   <!-- CULT OF HUSK RELATED missions -->
   <CargoMission identifier="huskmedicalcargo" tags="cargohusk" type="Cargo" difficulty="1" commonness="100" achievementidentifier="cargomission">
     <Items>
-      <Item identifier="mediccrate" reward="250" maxcount="10">
+      <Item identifier="mediccrate" reward="1000" maxcount="10">
         <Item identifier="antibiotics" amount="5" />
         <Item identifier="stabilozine" amount="3" />
       </Item>
@@ -1376,7 +1376,7 @@
   </CargoMission>
   <CargoMission identifier="huskeggsmuggling" tags="cargohusk,cargosmugglinghusk" type="Cargo" difficulty="1" commonness="100" achievementidentifier="cargomission">
     <Items>
-      <Item identifier="mediccrate" reward="500" maxcount="5">
+      <Item identifier="mediccrate" reward="2000" maxcount="5">
         <Item identifier="antidama1" amount="2" />
         <Item identifier="antidama2" amount="2" />
         <Item identifier="antibloodloss1" amount="1" />
@@ -1393,7 +1393,7 @@
   </CargoMission>
   <CargoMission identifier="keepwetcargo" tags="cargohusk" type="Cargo" textidentifier="keepwetcargo" description="missiondescription.keepwetcargo" difficulty="1" commonness="100" achievementidentifier="cargomission">
     <Items>
-      <Item identifier="biocrate" reward="2000" maxcount="1" />
+      <Item identifier="biocrate" reward="8000" maxcount="1" />
     </Items>
     <Reputation identifier="location" amount="3" />
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="512,256,256,256" color="50,70,150" />
@@ -1405,7 +1405,7 @@
     <LocationType from="AnyOutpost" to="City" />
     <message header="missionheader0.keepwetcargo" text="missionmessage0.keepwetcargo" />
   </CargoMission>
-  <EscortMission identifier="escorthuskvip" tags="escortVIP,escort" type="Escort" difficulty="2" commonness="100" reward="3000" achievementidentifier="escortmission">
+  <EscortMission identifier="escorthuskvip" tags="escortVIP,escort" type="Escort" difficulty="2" commonness="100" reward="12000" achievementidentifier="escortmission">
     <Characters>
       <Character from="husknpcsmission" identifier="huskvip" escortidentifier="vip" color="40,140,80">
         <StatusEffect target="Character" delay="1" disabledeltatime="true">
@@ -1423,7 +1423,7 @@
     <LocationType from="AnyOutpost" to="City" />
     <message header="missionheader0.escort2" text="missionmessage0.escort2" />
   </EscortMission>
-  <MineralMission identifier="slimecollection" textIdentifier="slimecollection" tags="collectplants,collectplants_set1,collectplants_cave" type="Mineral" difficulty="1" commonness="100" resourceHandoverAmount="0.4" positionType="cave" reward="2000">
+  <MineralMission identifier="slimecollection" textIdentifier="slimecollection" tags="collectplants,collectplants_set1,collectplants_cave" type="Mineral" difficulty="1" commonness="100" resourceHandoverAmount="0.4" positionType="cave" reward="8000">
     <Items>
       <Item identifier="slimebacteria" />
       <Item identifier="slimebacteria" />
@@ -1436,7 +1436,7 @@
     <Reputation identifier="huskcult" amount="3" />
     <message header="missionheader0.slimecollection" text="missionmessage0.slimecollection" />
   </MineralMission>
-  <EscortMission identifier="escorthuskterrorist" tags="escortterrorists,escortterroristshusk,escort" type="Escort" difficulty="2" commonness="100" reward="2500" achievementidentifier="escortmission" baseescortedcharacters="1" scalingescortedcharacters="0.35" terroristchance="0.35" terroristannouncedialogtag="huskterroristannounce">
+  <EscortMission identifier="escorthuskterrorist" tags="escortterrorists,escortterroristshusk,escort" type="Escort" difficulty="2" commonness="100" reward="10000" achievementidentifier="escortmission" baseescortedcharacters="1" scalingescortedcharacters="0.35" terroristchance="0.35" terroristannouncedialogtag="huskterroristannounce">
     <Characters>
       <Character from="escortnpcs1" identifier="commoner" />
     </Characters>
@@ -1458,7 +1458,7 @@
     <message header="missionheader0.escorthuskterrorist" text="missionmessage0.escorthuskterrorist" />
     <message header="missionheader1.escorthuskterrorist" text="missionmessage1.escorthuskterrorist" />
   </EscortMission>
-  <OutpostMission identifier="jailbreak_husk" name="missionname.jailbreak_husk" successmessage="missionsuccess.jailbreak" failuremessage="missionfailure.jailbreak" tags="jailbreak_husk" type="AbandonedOutpost" reward="3000" difficulty="3" commonness="100" allowretry="true" hostageskilledmessage="prisonerkilled">
+  <OutpostMission identifier="jailbreak_husk" name="missionname.jailbreak_husk" successmessage="missionsuccess.jailbreak" failuremessage="missionfailure.jailbreak" tags="jailbreak_husk" type="AbandonedOutpost" reward="12000" difficulty="3" commonness="100" allowretry="true" hostageskilledmessage="prisonerkilled">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="512,256,256,256" color="40,140,80" />
     <LocationType identifier="Colony" />
     <LocationType identifier="City" />
@@ -1472,7 +1472,7 @@
     <message header="missionheader0.prisonerrescue" text="missionmessage0.prisonerrescue" />
   </OutpostMission>
   <!-- add event? -->
-  <AbandonedOutpostMission identifier="assassinatehuskresearcher" tags="assasination" achievementidentifier="abandonedoutpostassassinate" type="OutpostDestroy" reward="3000" difficulty="3" commonness="100" allowretry="true" sonarlabel="target">
+  <AbandonedOutpostMission identifier="assassinatehuskresearcher" tags="assasination" achievementidentifier="abandonedoutpostassassinate" type="OutpostDestroy" reward="12000" difficulty="3" commonness="100" allowretry="true" sonarlabel="target">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="0,512,256,256" color="214,50,48" />
     <LocationType identifier="huskchurch" />
     <Characters>
@@ -1487,7 +1487,7 @@
   <PirateMission type="Pirate" identifier="huskcultattack1" tags="huskcultattack" showinmenus="false" showstartmessage="false" issideobjective="true" achievementidentifier="combatmissionseparatistsvscoalition" difficulty="4" commonness="0" reward="0" addedmissiondifficultyperplayer="8">
     <Reputation identifier="huskchurch" amount="-5" />
     <SubmarineTypes>
-      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Husk/Huskedsub.sub" faction="huskcult" preferreddifficulty="40" alternatereward="3200" />
+      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Husk/Huskedsub.sub" faction="huskcult" preferreddifficulty="40" alternatereward="12800" />
     </SubmarineTypes>
     <Characters>
       <Character typeidentifier="huskcultcaptain" minamount="1" maxamount="1">
@@ -1547,7 +1547,7 @@
     <Reputation identifier="separatists" amount="15" amountforopposingfaction="-5" />
     <Reputation identifier="huskchurch" amount="-15" />
     <SubmarineTypes>
-      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Husk/Huskedsub.sub" faction="huskcult" preferreddifficulty="10" alternatereward="3200" />
+      <Submarine path="%ModDir:2532991202%/EnemySubmarines/Husk/Huskedsub.sub" faction="huskcult" preferreddifficulty="10" alternatereward="12800" />
     </SubmarineTypes>
     <Characters>
       <Character typeidentifier="huskcultcaptain" minamount="1" maxamount="1">
@@ -1603,7 +1603,7 @@
     <LocationType from="AnyOutpost" to="AnyOutpost" />
     <Metadata identifier="huskinterceptionmissionnorepeat" value="1" />
   </PirateMission>
-  <GotoMission identifier="capturelivecrawler" name="missionname.livecapture" description="missiondescription.livecapture" tags="capturemission" type="GoTo" difficulty="3" commonness="0" reward="3500" successmessage="missionsuccess.livecapture" failuremessage="missionfailure.livecapture">
+  <GotoMission identifier="capturelivecrawler" name="missionname.livecapture" description="missiondescription.livecapture" tags="capturemission" type="GoTo" difficulty="3" commonness="0" reward="14000" successmessage="missionsuccess.livecapture" failuremessage="missionfailure.livecapture">
     <Reputation identifier="huskcult" amount="5" />
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="768,768,256,256" color="60,120,90" />
     <LocationType from="Anyoutpost" to="Huskchurch" />
@@ -1612,7 +1612,7 @@
     <CompleteCheckDataAction identifier="capturedlivetarget" condition="eq 1" />
     <Metadata identifier="capturelivecrawlernorepeat" value="1" />
   </GotoMission>
-  <GotoMission identifier="chimerasamples" name="missionname.chimerasamples" description="missiondescription.chimerasamples" tags="capturemission" type="GoTo" difficulty="3" commonness="0" reward="3500" successmessage="missionsuccess.chimerasamples" failuremessage="missionfailure.chimerasamples">
+  <GotoMission identifier="chimerasamples" name="missionname.chimerasamples" description="missiondescription.chimerasamples" tags="capturemission" type="GoTo" difficulty="3" commonness="0" reward="14000" successmessage="missionsuccess.chimerasamples" failuremessage="missionfailure.chimerasamples">
     <Reputation identifier="huskcult" amount="5" />
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="768,768,256,256" color="60,120,90" />
     <LocationType from="Anyoutpost" to="Anyoutpost" />
@@ -1649,7 +1649,7 @@
     identifier="industrialsabotage"
     tags="industrialsabotage"
     type="OutpostDestroy"
-    reward="1000"
+    reward="4000"
     difficulty="2"
     commonness="100"
     allowretry="true"
@@ -1671,7 +1671,7 @@
     commonness="50"
     resourceHandoverAmount="0.25"
     positionType="mainpath"
-    reward="1200">
+    reward="4800">
     <Items>
       <Item identifier="lithomorphspawnerpyromorphite" />
       <Item identifier="pyromorphite" />
@@ -1705,7 +1705,7 @@
     difficulty="2"
     commonness="30"
     resourceHandoverAmount="0.25"
-    reward="1600">
+    reward="6400">
     <Items>
       <Item identifier="lithomorphspawnergalena" />
       <Item identifier="galena" />
@@ -1739,7 +1739,7 @@
     difficulty="2"
     commonness="75"
     resourceHandoverAmount="0.33"
-    reward="2100">
+    reward="8400">
     <Items>
       <Item identifier="lithomorphspawnertriphylite" />
       <Item identifier="triphylite" />
@@ -1771,7 +1771,7 @@
     difficulty="2"
     commonness="30"
     resourceHandoverAmount="0.25"
-    reward="2400">
+    reward="9600">
     <Items>
       <Item identifier="ilmenite" />
       <Item identifier="ilmenite" />
@@ -1805,7 +1805,7 @@
     difficulty="2"
     commonness="50"
     resourceHandoverAmount="0.33"
-    reward="2700">
+    reward="10800">
     <Items>
       <Item identifier="lithomorphspawnertitanite" />
       <Item identifier="titanite" />
@@ -1835,7 +1835,7 @@
       tags="huskbeaconmission"
       type="Beacon"
       difficulty="1"
-      reward="1500"
+      reward="6000"
       sideobjective="false">
       <Reputation identifier="huskchurch" amount="5" />
       <SubmarineTypes>
@@ -1855,9 +1855,9 @@
       type="Beacon"
       difficulty="2"
       commonness="100"
-      reward="1500">
+      reward="6000">
       <SubmarineTypes>
-        <Submarine path="Content/Map/BeaconStations/BeaconStation2_AlienResearch.sub" faction="huskcult" alternatereward="3200"/>
+        <Submarine path="Content/Map/BeaconStations/BeaconStation2_AlienResearch.sub" faction="huskcult" alternatereward="12800"/>
       </SubmarineTypes>
       <monsters commonness="100">
         <monster character="Crawler" min="0" max="8"/>      
@@ -1884,7 +1884,7 @@
       tags="assasination"
       achievementidentifier="abandonedoutpostassassinate"
       type="OutpostDestroy"
-      reward="3000"
+      reward="12000"
       difficulty="3"
       commonness="100"
       allowretry="true"
@@ -1899,7 +1899,7 @@
       <Metadata identifier="poisonchalicemissionnorepeat" value="1"/>
     </OutpostMission> -->
   <!-- Unused. BUGGED. TODO: reenable multiple documents if ever fixed -->
-  <!--   <SalvageMission identifier="stealingintel" tags="stealintel" type="Salvage" difficulty="3" commonness="0" reward="3000" sonarlabel="target" spawntype="Outpost" showmessagewhenpickedup="true" itemidentifier="documents" removeitem="true" containertag="admincabinet" requirewreck="false" BlockLocationTypeChanges="true">
+  <!--   <SalvageMission identifier="stealingintel" tags="stealintel" type="Salvage" difficulty="3" commonness="0" reward="12000" sonarlabel="target" spawntype="Outpost" showmessagewhenpickedup="true" itemidentifier="documents" removeitem="true" containertag="admincabinet" requirewreck="false" BlockLocationTypeChanges="true">
     <Reputation identifier="coalition" amount="-10" />
     <Reputation identifier="separatists" amount="10" />
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="0,512,256,256" color="49,93,233" />
@@ -1961,7 +1961,7 @@
     type="Salvage"
     difficulty="3"
     commonness="100"
-    reward="2000"
+    reward="8000"
     requireddeliveryamount="1"
     PartiallyRetrievedMessage="missionmessage.findhiddenpylons.partiallyretrieved"
     AllRetrievedMessage="missionmessage.findhiddenpylons.allretrieved">
@@ -2017,7 +2017,7 @@
     type="Salvage"
     difficulty="5"
     commonness="0"
-    reward="2000"
+    reward="8000"
     requirewreck="false">
 
     <target
@@ -2044,7 +2044,7 @@
     type="GoTo"
     difficulty="3"
     commonness="0"
-    reward="3500"
+    reward="14000"
     successmessage="missionsuccess.rescuestrandeddivers"
     failuremessage="missionfailure.rescuestrandeddivers">
   <Reputation identifier="location" amount="3" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Fabricators/fabricators.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Fabricators/fabricators.xml
index 780caa50..ef0b2b80 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Fabricators/fabricators.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Fabricators/fabricators.xml	
@@ -23,7 +23,7 @@
       </Fabricator>
       <ItemContainer capacity="0" canbeselected="false" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true" />
       <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true" />
-      <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+      <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
         <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="241,497,238,396" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
     </Item>
@@ -37,7 +37,7 @@
       </Fabricator>
       <ItemContainer capacity="0" canbeselected="false" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true" />
       <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true" />
-      <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+      <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
         <sprite texture="Content/Map/Outposts/Art/MedBayAssets.png" sourcerect="721,497,238,396" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
     </Item>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Drinks.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Drinks.xml
index 4ef17a65..c3c05ee2 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Drinks.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Drinks.xml	
@@ -3,10 +3,10 @@
   <!--OVERRIDES-->
   <Override>
     <!--DISABLE SPAWNING OF VANILLA ITEM-->
-    <EnergyDrink name="" identifier="energydrink" category="Medical,Material" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <EnergyDrink name="" identifier="energydrink" category="Medical,Material" maxstacksize="16" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="0" spawnprobability="0.0" />
-      <PreferredContainer secondary="abandonedcrewcab" maxamount="0" spawnprobability="0.0" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="0" spawnprobability="0" />
+      <PreferredContainer secondary="abandonedcrewcab" maxamount="0" spawnprobability="0" />
       <PreferredContainer primary="crewcab" />
       <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="40" fabricationlimitmin="5" fabricationlimitmax="10" />
       <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="64,768,64,64" origin="0.5,0.5" />
@@ -33,17 +33,17 @@
   </Override>
   <!--ADJUST ITEM TO APPLY EFFECTS WHILE DRINKING, GET DESTROYED ON IMPACT AND SPAWN EMPTY BOTTLE IF EMPTY-->
   <Override>
-    <Rum name="" identifier="rum" category="Medical,Misc" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A strong alcoholic beverage. |Alcoholic Beverage |Decrease Psychosis |Decrease Hallucinations |Decrease Husk Infection (If below 90%) |Heal Damage |Increase Psychosis Resistance" Tags="smallitem,drinkitem,alcoholitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true" />
+    <Rum name="" identifier="rum" category="Medical,Misc" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A strong alcoholic beverage. |Alcoholic Beverage |Decrease Psychosis |Decrease Hallucinations |Decrease Husk Infection (If below 90%) |Heal Damage |Increase Psychosis Resistance" Tags="smallitem,drinkitem,alcoholitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Price baseprice="150" sold="false">
-        <Price storeidentifier="merchantclown" multiplier="2.0" minavailable="0" maxavailable="8">
+        <Price storeidentifier="merchantclown" multiplier="6" minavailable="0" maxavailable="8">
           <Reputation faction="clowns" min="30" />
         </Price>
-        <Price storeidentifier="merchantoutpost" sold="true" multiplier="1.0" minavailable="0" maxavailable="4" />
-        <Price storeidentifier="merchantcity" sold="true" multiplier="1.3" minavailable="0" maxavailable="8" />
+        <Price storeidentifier="merchantoutpost" sold="true" multiplier="3" minavailable="0" maxavailable="4" />
+        <Price storeidentifier="merchantcity" sold="true" multiplier="3.9" minavailable="0" maxavailable="8" />
       </Price>
       <Fabricate suitablefabricators="piratestore" requiredtime="3" requiredmoney="175" fabricationlimitmin="0" fabricationlimitmax="10" />
       <Fabricate suitablefabricators="fabricator" requiredtime="25" requiresrecipe="true">
@@ -88,17 +88,17 @@
   </Override>
   <!--END OF OVERRIDES-->
   <Override>
-    <Rum name="Pirate Rum" identifier="he-rum" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A very strong rum enriched with uranium for extra spice. |Alcoholic Beverage |Decrease Psychosis |Decrease Hallucinations |Decrease Husk Infection (If below 90%) |Healing Properties |Increase Psychosis Resistance |Increase Radiation Sickness (Slightly)" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true" />
+    <Rum name="Pirate Rum" identifier="he-rum" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A very strong rum enriched with uranium for extra spice. |Alcoholic Beverage |Decrease Psychosis |Decrease Hallucinations |Decrease Husk Infection (If below 90%) |Healing Properties |Increase Psychosis Resistance |Increase Radiation Sickness (Slightly)" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true" />
       <PreferredContainer primary="liquorcrate" secondary="kitchen" />
       <Price baseprice="299" sold="false">
-        <Price storeidentifier="merchantclown" multiplier="2.0" minavailable="0" maxavailable="8">
+        <Price storeidentifier="merchantclown" multiplier="6" minavailable="0" maxavailable="8">
           <Reputation faction="clowns" min="30" />
         </Price>
-        <Price storeidentifier="merchantoutpost" multiplier="1.1" minavailable="0" maxavailable="8" />
-        <Price storeidentifier="merchantcity" multiplier="1.5" minavailable="2" maxavailable="16" />
+        <Price storeidentifier="merchantoutpost" multiplier="3.3" minavailable="0" maxavailable="8" />
+        <Price storeidentifier="merchantcity" multiplier="4.5" minavailable="6" maxavailable="16" />
       </Price>
       <Fabricate suitablefabricators="piratestore" requiredtime="3" requiredmoney="299" fabricationlimitmin="0" fabricationlimitmax="10" />
       <Fabricate suitablefabricators="refillstation" requiredtime="5" requiresrecipe="false" amount="1">
@@ -146,17 +146,17 @@
     </Rum>
   </Override>
   <Override>
-    <Item name="Doc's Whiskey" identifier="he-whiskey" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="Doctor Michael's original whiskey. Approved by Doctors europa-wide. |Alcoholic Beverage |Reduce Hallucinations |Reduce Halucinova Effects |Reduce Chem Addiction |Increase Psychosis Resistance |Slight Healing Properties" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true" />
+    <Item name="Doc's Whiskey" identifier="he-whiskey" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="Doctor Michael's original whiskey. Approved by Doctors europa-wide. |Alcoholic Beverage |Reduce Hallucinations |Reduce Halucinova Effects |Reduce Chem Addiction |Increase Psychosis Resistance |Slight Healing Properties" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Price baseprice="125" sold="true">
-        <Price storeidentifier="merchantclown" multiplier="2.0" minavailable="0" maxavailable="16">
+        <Price storeidentifier="merchantclown" multiplier="6" minavailable="0" maxavailable="16">
           <Reputation faction="clowns" min="30" />
         </Price>
-        <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="0" maxavailable="3" />
-        <Price storeidentifier="merchantcity" multiplier="1.0" minavailable="3" maxavailable="9" />
+        <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="0" maxavailable="3" />
+        <Price storeidentifier="merchantcity" multiplier="3" minavailable="9" maxavailable="9" />
       </Price>
       <Fabricate suitablefabricators="piratestore" requiredtime="3" requiredmoney="125" fabricationlimitmin="0" fabricationlimitmax="6" />
       <Fabricate suitablefabricators="refillstation" requiredtime="5" requiresrecipe="false" amount="1">
@@ -200,17 +200,17 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Halucinova" identifier="he-halucinova" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="Keep away from &quot;Sadashi Kira&quot; at all cost! |Alcoholic Beverage |Increase Hallucinations | Slight Healing Properties" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true" />
+    <Item name="Halucinova" identifier="he-halucinova" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="Keep away from &quot;Sadashi Kira&quot; at all cost! |Alcoholic Beverage |Increase Hallucinations | Slight Healing Properties" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Price baseprice="249" sold="false">
-        <Price storeidentifier="merchantclown" multiplier="2.0" minavailable="0" maxavailable="6">
+        <Price storeidentifier="merchantclown" multiplier="6" minavailable="0" maxavailable="6">
           <Reputation faction="clowns" min="30" />
         </Price>
-        <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="0" maxavailable="2" />
-        <Price storeidentifier="merchantcity" multiplier="1.0" minavailable="0" maxavailable="4" />
+        <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="0" maxavailable="2" />
+        <Price storeidentifier="merchantcity" multiplier="3" minavailable="0" maxavailable="4" />
       </Price>
       <Fabricate suitablefabricators="piratestore" requiredtime="3" requiredmoney="249" fabricationlimitmin="0" fabricationlimitmax="3" />
       <Fabricate suitablefabricators="refillstation" requiredtime="5" requiresrecipe="false" amount="1">
@@ -252,17 +252,17 @@
   </Override>
   <!--BEERS-->
   <Override>
-    <Item name="Coalition Premium" identifier="he-beercoalitionpremium" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A popular beer amongst coalition station inhabitants. |Alcoholic Beverage |Increase Psychosis Resistance" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true" />
+    <Item name="Coalition Premium" identifier="he-beercoalitionpremium" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A popular beer amongst coalition station inhabitants. |Alcoholic Beverage |Increase Psychosis Resistance" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Price baseprice="6" sold="true">
-        <Price storeidentifier="merchantclown" multiplier="2.0" minavailable="0" maxavailable="16">
+        <Price storeidentifier="merchantclown" multiplier="6" minavailable="0" maxavailable="16">
           <Reputation faction="clowns" min="30" />
         </Price>
-        <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="0" maxavailable="16" />
-        <Price storeidentifier="merchantcity" multiplier="1.0" minavailable="6" maxavailable="24" />
+        <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="0" maxavailable="16" />
+        <Price storeidentifier="merchantcity" multiplier="3" minavailable="18" maxavailable="24" />
       </Price>
       <Fabricate suitablefabricators="vendingmachinedrinks,piratestore,cafeteria" requiredtime="3" requiredmoney="10" fabricationlimitmin="0" fabricationlimitmax="12" />
       <Fabricate suitablefabricators="refillstation" requiredtime="5" requiresrecipe="false" amount="1">
@@ -301,17 +301,17 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Jovian Force" identifier="he-beerjovianforce" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A beer most popular amongst the Separatists. |Alcoholic Beverage |Increase Psychosis Resistance" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true" />
+    <Item name="Jovian Force" identifier="he-beerjovianforce" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A beer most popular amongst the Separatists. |Alcoholic Beverage |Increase Psychosis Resistance" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Price baseprice="6" sold="true">
-        <Price storeidentifier="merchantclown" multiplier="2.0" minavailable="0" maxavailable="16">
+        <Price storeidentifier="merchantclown" multiplier="6" minavailable="0" maxavailable="16">
           <Reputation faction="clowns" min="30" />
         </Price>
-        <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="0" maxavailable="16" />
-        <Price storeidentifier="merchantcity" multiplier="1.0" minavailable="6" maxavailable="24" />
+        <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="0" maxavailable="16" />
+        <Price storeidentifier="merchantcity" multiplier="3" minavailable="18" maxavailable="24" />
       </Price>
       <Fabricate suitablefabricators="vendingmachinedrinks,piratestore,cafeteria" requiredtime="3" requiredmoney="10" fabricationlimitmin="0" fabricationlimitmax="12" />
       <Fabricate suitablefabricators="refillstation" requiredtime="5" requiresrecipe="false" amount="1">
@@ -350,17 +350,17 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Liquid Ascension" identifier="he-beerliquidascension" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A popular beer amongst members of the church of husk on their way to ascension! |Alcoholic Beverage |Increase Psychosis Resistance |Increase Pressure Immunity |Oxygen Not Included |May contain traces of husk parasites" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true" />
+    <Item name="Liquid Ascension" identifier="he-beerliquidascension" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A popular beer amongst members of the church of husk on their way to ascension! |Alcoholic Beverage |Increase Psychosis Resistance |Increase Pressure Immunity |Oxygen Not Included |May contain traces of husk parasites" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Price baseprice="54" sold="true">
-        <Price storeidentifier="merchanthusk" multiplier="2.0" minavailable="0" maxavailable="16">
+        <Price storeidentifier="merchanthusk" multiplier="6" minavailable="0" maxavailable="16">
           <Reputation faction="husk" min="30" />
         </Price>
-        <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="0" maxavailable="16" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="1.0" minavailable="6" maxavailable="24" sold="false" />
+        <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="0" maxavailable="16" sold="false" />
+        <Price storeidentifier="merchantcity" multiplier="3" minavailable="18" maxavailable="24" sold="false" />
       </Price>
       <Fabricate suitablefabricators="vendingmachinedrinks,piratestore,cafeteria" requiredtime="3" requiredmoney="59" fabricationlimitmin="0" fabricationlimitmax="12" />
       <Fabricate suitablefabricators="refillstation" requiredtime="5" requiresrecipe="false" amount="1">
@@ -403,17 +403,17 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Clown Juice" identifier="he-beerclownjuice" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A popular beer amongst pranksters. Praise the honkmother! |Alcoholic Beverage |Increase Psychosis Resistance" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true" />
+    <Item name="Clown Juice" identifier="he-beerclownjuice" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A popular beer amongst pranksters. Praise the honkmother! |Alcoholic Beverage |Increase Psychosis Resistance" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Price baseprice="32" sold="true">
-        <Price storeidentifier="merchantclown" multiplier="2.0" minavailable="0" maxavailable="16">
+        <Price storeidentifier="merchantclown" multiplier="6" minavailable="0" maxavailable="16">
           <Reputation faction="clowns" min="30" />
         </Price>
-        <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="0" maxavailable="16" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="1.0" minavailable="6" maxavailable="24" sold="false" />
+        <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="0" maxavailable="16" sold="false" />
+        <Price storeidentifier="merchantcity" multiplier="3" minavailable="18" maxavailable="24" sold="false" />
       </Price>
       <Fabricate suitablefabricators="vendingmachinedrinks,piratestore,cafeteria" requiredtime="3" requiredmoney="38" fabricationlimitmin="0" fabricationlimitmax="12" />
       <Fabricate suitablefabricators="refillstation" requiredtime="5" requiresrecipe="false" amount="1">
@@ -454,7 +454,7 @@
   </Override>
   <!--old beer item converting to new coalition variant for backwards compatibility-->
   <Override>
-    <Item name="Coalition Premium Lager Beer" identifier="he-beer" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A popular beer amongst coalition station inhabitants. |Alcoholic Beverage |Increase Psychosis Resistance" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+    <Item name="Coalition Premium Lager Beer" identifier="he-beer" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A popular beer amongst coalition station inhabitants. |Alcoholic Beverage |Increase Psychosis Resistance" Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="458,1,16,65" depth="0.6" origin="0.5,0.5" />
       <BrokenSprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="476,1,16,65" depth="0.6" maxcondition="99" />
       <Body width="17" height="63" density="15" />
@@ -472,17 +472,17 @@
   </Override>
   <!-- NON-ALCOHOLIC -->
   <Override>
-    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-water" identifier="he-water" category="Misc,Material" maxstacksize="8" cargocontaineridentifier="metalcrate" description="Tastes fresh." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" minamount="0" maxamount="8" spawnprobability="0.1" />
+    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-water" identifier="he-water" category="Misc,Material" maxstacksize="16" cargocontaineridentifier="metalcrate" description="Tastes fresh." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" minamount="0" maxamount="16" spawnprobability="0.2" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Price baseprice="9" sold="true">
-        <Price storeidentifier="merchantclown" multiplier="1.2" minavailable="0" maxavailable="16">
+        <Price storeidentifier="merchantclown" multiplier="3.6" minavailable="0" maxavailable="16">
           <Reputation faction="clowns" min="30" />
         </Price>
-        <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="0" maxavailable="12" />
-        <Price storeidentifier="merchantcity" multiplier="1.0" minavailable="6" maxavailable="24" />
+        <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="0" maxavailable="12" />
+        <Price storeidentifier="merchantcity" multiplier="3" minavailable="18" maxavailable="24" />
       </Price>
       <Fabricate suitablefabricators="vendingmachinedrinks,cafeteria" requiredtime="3" requiredmoney="14" fabricationlimitmin="0" fabricationlimitmax="6" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="243,8,21,58" depth="0.6" origin="0.5,0.5" />
@@ -517,14 +517,14 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Moloch Milk" identifier="he-milk" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A bottle of Moloch Milk. Tastes a bit funny. Don't ask how they get milk from a Moloch! May help a bit when you're shit-faced." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true" />
+    <Item name="Moloch Milk" identifier="he-milk" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A bottle of Moloch Milk. Tastes a bit funny. Don't ask how they get milk from a Moloch! May help a bit when you're shit-faced." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Price baseprice="130" sold="true">
-        <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="0" maxavailable="6" />
-        <Price storeidentifier="merchantcity" multiplier="1.0" minavailable="2" maxavailable="12" />
+        <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="0" maxavailable="6" />
+        <Price storeidentifier="merchantcity" multiplier="3" minavailable="6" maxavailable="12" />
       </Price>
       <Fabricate suitablefabricators="vendingmachinedrinks,cafeteria" requiredtime="3" requiredmoney="139" fabricationlimitmin="0" fabricationlimitmax="6" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="201,8,21,58" depth="0.6" origin="0.5,0.5" />
@@ -559,10 +559,10 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Energy Drink" identifier="he-energydrink1" category="Misc" subcategory="Drinks" maxstacksize="32" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A refreshing energy drink. Good for when you're absolutely shit-faced and need to sober up a bit." Tags="smallitem,drinkitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_aluminiumcan_full" impacttolerance="5.5" isshootable="true" requireaimtouse="true" canflipx="false">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" minamount="0" maxamount="8" spawnprobability="0.1" />
+    <Item name="Energy Drink" identifier="he-energydrink1" category="Misc" subcategory="Drinks" maxstacksize="64" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A refreshing energy drink. Good for when you're absolutely shit-faced and need to sober up a bit." Tags="smallitem,drinkitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_aluminiumcan_full" impacttolerance="5.5" isshootable="true" requireaimtouse="true" canflipx="false">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" minamount="0" maxamount="16" spawnprobability="0.2" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Fabricate suitablefabricators="vendingmachinedrinks,cafeteria" requiredtime="3" requiredmoney="25" fabricationlimitmin="0" fabricationlimitmax="6" />
       <Deconstruct time="2">
@@ -602,10 +602,10 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Can of Couwola Cola" identifier="he-colacan" category="Misc" subcategory="Drinks" maxstacksize="32" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A refreshing can of Couwola Cola. Super refreshing and good for when you're absolutely shit-faced and need to sober up a quickly. Mass-consumption may cause discomfort." Tags="smallitem,drinkitem,cola,colafuel1" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_aluminiumcan_full" impacttolerance="5.5" isshootable="true" requireaimtouse="true" canflipx="false">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" minamount="0" maxamount="8" spawnprobability="0.1" />
+    <Item name="Can of Couwola Cola" identifier="he-colacan" category="Misc" subcategory="Drinks" maxstacksize="64" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A refreshing can of Couwola Cola. Super refreshing and good for when you're absolutely shit-faced and need to sober up a quickly. Mass-consumption may cause discomfort." Tags="smallitem,drinkitem,cola,colafuel1" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_aluminiumcan_full" impacttolerance="5.5" isshootable="true" requireaimtouse="true" canflipx="false">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" minamount="0" maxamount="16" spawnprobability="0.2" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Fabricate suitablefabricators="vendingmachinedrinks,cafeteria" requiredtime="3" requiredmoney="29" fabricationlimitmin="0" fabricationlimitmax="6" />
       <Deconstruct time="2">
@@ -644,10 +644,10 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Can of Couwola Cola Zero" identifier="he-colazerocan" category="Misc" subcategory="Drinks" maxstacksize="32" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A refreshing can of Couwola Cola Zero. No sugar, but full flavor! Very refreshing and good for when you're absolutely shit-faced and need to sober up a quickly." Tags="smallitem,drinkitem,colazero,colafuel2" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_aluminiumcan_full" impacttolerance="5.5" isshootable="true" requireaimtouse="true" canflipx="false">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" minamount="0" maxamount="8" spawnprobability="0.1" />
+    <Item name="Can of Couwola Cola Zero" identifier="he-colazerocan" category="Misc" subcategory="Drinks" maxstacksize="64" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A refreshing can of Couwola Cola Zero. No sugar, but full flavor! Very refreshing and good for when you're absolutely shit-faced and need to sober up a quickly." Tags="smallitem,drinkitem,colazero,colafuel2" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_aluminiumcan_full" impacttolerance="5.5" isshootable="true" requireaimtouse="true" canflipx="false">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" minamount="0" maxamount="16" spawnprobability="0.2" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Fabricate suitablefabricators="vendingmachinedrinks,cafeteria" requiredtime="3" requiredmoney="29" fabricationlimitmin="0" fabricationlimitmax="6" />
       <Deconstruct time="2">
@@ -687,10 +687,10 @@
   </Override>
   <!-- DIRTY WATER -->
   <Override>
-    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-seawater" identifier="he-seawaterrum" category="Misc,Material" maxstacksize="8" cargocontaineridentifier="metalcrate" description="Tastes salty." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0" />
-      <PreferredContainer secondary="crewcab" minamount="0" maxamount="8" spawnprobability="0" />
+    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-seawater" identifier="he-seawaterrum" category="Misc,Material" maxstacksize="16" cargocontaineridentifier="metalcrate" description="Tastes salty." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0" />
+      <PreferredContainer secondary="crewcab" minamount="0" maxamount="16" spawnprobability="0" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="0,140,26,66" depth="0.6" origin="0.5,0.5" />
       <Body width="26" height="66" density="15" />
@@ -724,10 +724,10 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-seawater" identifier="he-seawaterwhiskey" category="Misc,Material" maxstacksize="8" cargocontaineridentifier="metalcrate" description="Tastes salty." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0" />
-      <PreferredContainer secondary="crewcab" minamount="0" maxamount="8" spawnprobability="0" />
+    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-seawater" identifier="he-seawaterwhiskey" category="Misc,Material" maxstacksize="16" cargocontaineridentifier="metalcrate" description="Tastes salty." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0" />
+      <PreferredContainer secondary="crewcab" minamount="0" maxamount="16" spawnprobability="0" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="27,140,27,66" depth="0.6" origin="0.5,0.5" />
       <Body width="27" height="66" density="15" />
@@ -761,10 +761,10 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-seawater" identifier="he-seawaterhalucinova" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="Tastes salty." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0" />
-      <PreferredContainer secondary="crewcab" minamount="0" maxamount="8" spawnprobability="0" />
+    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-seawater" identifier="he-seawaterhalucinova" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="Tastes salty." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0" />
+      <PreferredContainer secondary="crewcab" minamount="0" maxamount="16" spawnprobability="0" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="76,140,31,64" depth="0.6" origin="0.5,0.5" />
       <Body width="31" height="64" density="15" />
@@ -798,10 +798,10 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-seawater" identifier="he-seawater" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="Tastes salty." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0" />
-      <PreferredContainer secondary="crewcab" minamount="0" maxamount="8" spawnprobability="0" />
+    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-seawater" identifier="he-seawater" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="Tastes salty." Tags="smallitem,drinkitem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0" />
+      <PreferredContainer secondary="crewcab" minamount="0" maxamount="16" spawnprobability="0" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="55,148,21,58" depth="0.6" origin="0.5,0.5" />
       <Body width="21" height="58" density="15" />
@@ -835,10 +835,10 @@
     </Item>
   </Override>
   <Override>
-    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-seawater" identifier="he-seawaterbeer" category="Misc,Material" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="Tastes salty." Tags="smallitem,drinkitem,seawater,water,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0" />
-      <PreferredContainer secondary="crewcab" minamount="0" maxamount="8" spawnprobability="0" />
+    <Item name="Water" nameidentifier="he-water" descriptionidentifier="he-seawater" identifier="he-seawaterbeer" category="Misc,Material" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="Tastes salty." Tags="smallitem,drinkitem,seawater,water,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0" />
+      <PreferredContainer secondary="crewcab" minamount="0" maxamount="16" spawnprobability="0" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="108,142,17,64" depth="0.6" origin="0.5,0.5" />
       <Body width="17" height="62" density="15" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Food.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Food.xml
index 9b540c81..85f08e80 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Food.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Food.xml	
@@ -3,10 +3,10 @@
   <Items>
     <!--OVERRIDES-->
     <!--MAKE ITEM EDIBLE-->
-    <Item name="Protein Bar" identifier="proteinbar" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.04" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.08" />
+    <Item name="Protein Bar" identifier="proteinbar" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.08" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.08" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.16" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="202,469,54,18" depth="0.6" origin="0.5,0.5" />
       <BrokenSprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="207,490,49,23" depth="0.6" maxcondition="99" />
@@ -32,15 +32,15 @@
       <AiTarget sightrange="1000" static="true" />
     </Item>
     <!--MAKE ITEM EDIBLE-->
-    <Item name="Pomegrenade" identifier="creepingorange" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem,fooditem,sugary,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="5.5" damagedbyexplosions="false" allowasextracargo="True">
+    <Item name="Pomegrenade" identifier="creepingorange" category="Material" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="smallitem,plantitem,fooditem,sugary,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="5.5" damagedbyexplosions="false" allowasextracargo="True">
       <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="971,649,43,55" origin="0.5,0.5" />
       <Body radius="30" density="5" />
       <Price baseprice="20" sold="false">
         <Price storeidentifier="merchantoutpost" />
-        <Price storeidentifier="merchantcity" multiplier="1.2" />
-        <Price storeidentifier="merchantresearch" multiplier="1.1" />
-        <Price storeidentifier="merchantmilitary" multiplier="0.8" />
-        <Price storeidentifier="merchantmine" multiplier="0.75" />
+        <Price storeidentifier="merchantcity" multiplier="3.6" />
+        <Price storeidentifier="merchantresearch" multiplier="3.3" />
+        <Price storeidentifier="merchantmilitary" multiplier="2.4" />
+        <Price storeidentifier="merchantmine" multiplier="2.25" />
       </Price>
       <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="30" fabricationlimitmin="3" fabricationlimitmax="5" />
       <Deconstruct time="5">
@@ -78,10 +78,10 @@
       <PreferredContainer primary="plantcontainer" />
     </Item>
     <!--MAKE ITEM EDIBLE-->
-    <Item name="Banana" identifier="banana" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,seed,plantitem,fooditem,ingredient,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.04" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.04" />
-      <PreferredContainer primary="seedbag" amount="1" spawnposition="0.03" />
+    <Item name="Banana" identifier="banana" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,seed,plantitem,fooditem,ingredient,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.08" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.08" />
+      <PreferredContainer primary="seedbag" amount="2" spawnposition="0.03" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="0,330,52,55" depth="0.2" origin="0.5,0.5" />
       <BrokenSprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="53,313,47,72" depth="0.2" maxcondition="99" />
       <Price baseprice="50" canbespecial="false">
@@ -90,7 +90,7 @@
         <Price storeidentifier="merchantresearch" sold="false" />
         <Price storeidentifier="merchantmilitary" sold="false" />
         <Price storeidentifier="merchantmine" sold="false" />
-        <Price storeidentifier="merchantclown" minavailable="3" maxavailable="5" sold="true">
+        <Price storeidentifier="merchantclown" minavailable="9" maxavailable="5" sold="true">
           <Reputation faction="clowns" min="50" />
         </Price>
       </Price>
@@ -147,10 +147,10 @@
     </Item>
     <!--END OF OVERRIDES-->
     <!--MISC FOOD-->
-    <Item name="Bag of Pomegrenade Chips" identifier="he-chips1" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="Dried pomegrenade chips. A popular little snack to watch the annual 'DUNWICE FACE-OFF' to." Tags="smallitem,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.04" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.08" />
+    <Item name="Bag of Pomegrenade Chips" identifier="he-chips1" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="Dried pomegrenade chips. A popular little snack to watch the annual 'DUNWICE FACE-OFF' to." Tags="smallitem,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.08" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.08" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.16" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="0,207,48,67" depth="0.6" origin="0.5,0.5" />
       <BrokenSprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="49,207,48,67" depth="0.6" maxcondition="99" />
@@ -176,10 +176,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Bag of Mutated Pomegrenade Chips" identifier="he-chips2" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="Dried mutated pomegrenade chips. A popular little snack. It is said to speed up the healing of burns a bit." Tags="smallitem,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.04" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.08" />
+    <Item name="Bag of Mutated Pomegrenade Chips" identifier="he-chips2" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="Dried mutated pomegrenade chips. A popular little snack. It is said to speed up the healing of burns a bit." Tags="smallitem,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.08" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.08" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.16" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="99,207,48,67" depth="0.6" origin="0.5,0.5" />
       <BrokenSprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="148,207,48,67" depth="0.6" maxcondition="99" />
@@ -207,10 +207,10 @@
     </Item>
     <!-- MEAT -->
     <!--Crawler-->
-    <Item name="Nugget" identifier="he-cookedcrawlernugget" category="Misc" subcategory="Food" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_softitem" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.02" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.0" notcampaign="True" />
+    <Item name="Nugget" identifier="he-cookedcrawlernugget" category="Misc" subcategory="Food" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_softitem" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="table,crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="225,455,17,11" depth="0.6" origin="0.5,0.5" />
       <InventoryIcon texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/UI/InventoryIcons.png" sourcerect="191,0,55,38" origin="0.5,0.5" />
@@ -231,10 +231,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Burger" identifier="he-crawlerburger" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.02" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.0" notcampaign="True" />
+    <Item name="Burger" identifier="he-crawlerburger" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="0,485,47,27" depth="0.6" origin="0.5,0.5" />
       <BrokenSprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="48,485,47,27" depth="0.6" maxcondition="99" />
@@ -264,10 +264,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Filet" identifier="he-cookedcrawlerfilet" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.02" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.0" notcampaign="True" />
+    <Item name="Filet" identifier="he-cookedcrawlerfilet" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="258,495,51,17" depth="0.6" origin="0.5,0.5" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="20" requiredmoney="49" fabricationlimitmin="0" fabricationlimitmax="10" displayname="crawlerfooditem" />
@@ -286,10 +286,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Hotdog" identifier="he-crawlerhotdog" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="True" />
+    <Item name="Hotdog" identifier="he-crawlerhotdog" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="20" requiredmoney="41" fabricationlimitmin="0" fabricationlimitmax="10" displayname="crawlerfooditem" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="139,489,67,23" depth="0.6" origin="0.5,0.5" />
@@ -309,10 +309,10 @@
       <AiTarget sightrange="1000" static="true" />
     </Item>
     <!--Mudraptor-->
-    <Item name="Nugget" identifier="he-cookedmudraptornugget" category="Misc" subcategory="Food" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_softitem" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.02" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.0" notcampaign="True" />
+    <Item name="Nugget" identifier="he-cookedmudraptornugget" category="Misc" subcategory="Food" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_softitem" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="table,crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="225,455,17,11" depth="0.6" origin="0.5,0.5" />
       <InventoryIcon texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/UI/InventoryIcons.png" sourcerect="191,0,55,38" origin="0.5,0.5" />
@@ -334,10 +334,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Burger" identifier="he-mudraptorburger" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.02" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.0" notcampaign="True" />
+    <Item name="Burger" identifier="he-mudraptorburger" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="0,485,47,27" depth="0.6" origin="0.5,0.5" />
       <BrokenSprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="48,485,47,27" depth="0.6" maxcondition="99" />
@@ -368,10 +368,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Hotdog" identifier="he-mudraptorhotdog" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="True" />
+    <Item name="Hotdog" identifier="he-mudraptorhotdog" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="20" requiredmoney="75" fabricationlimitmin="0" fabricationlimitmax="10" displayname="mudraptorfooditem" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="139,489,67,23" depth="0.6" origin="0.5,0.5" />
@@ -391,10 +391,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Roast" identifier="he-cookedmudraptorroast" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.02" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.0" notcampaign="True" />
+    <Item name="Roast" identifier="he-cookedmudraptorroast" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="258,495,51,17" depth="0.6" origin="0.5,0.5" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="20" requiredmoney="105" fabricationlimitmin="0" fabricationlimitmax="10" displayname="mudraptorfooditem" />
@@ -415,10 +415,10 @@
       <AiTarget sightrange="1000" static="true" />
     </Item>
     <!--Hammerhead-->
-    <Item name="Burger" identifier="he-hammerheadburger" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.02" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.0" notcampaign="True" />
+    <Item name="Burger" identifier="he-hammerheadburger" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="0,485,47,27" depth="0.6" origin="0.5,0.5" />
       <BrokenSprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="48,485,47,27" depth="0.6" maxcondition="99" />
@@ -448,10 +448,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Hotdog" identifier="he-hammerheadhotdog" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="True" />
+    <Item name="Hotdog" identifier="he-hammerheadhotdog" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="20" requiredmoney="159" fabricationlimitmin="0" fabricationlimitmax="10" displayname="hammerheadfooditem" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="139,489,67,23" depth="0.6" origin="0.5,0.5" />
@@ -471,10 +471,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Roast" identifier="he-cookedhammerheadroast" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.02" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.0" notcampaign="True" />
+    <Item name="Roast" identifier="he-cookedhammerheadroast" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="258,495,51,17" depth="0.6" origin="0.5,0.5" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="20" requiredmoney="345" fabricationlimitmin="0" fabricationlimitmax="10" displayname="hammerheadfooditem" />
@@ -494,10 +494,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Spareribs" identifier="he-cookedhammerheadspareribs" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.02" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.0" notcampaign="True" />
+    <Item name="Spareribs" identifier="he-cookedhammerheadspareribs" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="201,339,61,40" depth="0.6" origin="0.5,0.5" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="20" requiredmoney="300" fabricationlimitmin="0" fabricationlimitmax="10" displayname="hammerheadfooditem" />
@@ -518,10 +518,10 @@
       <AiTarget sightrange="1000" static="true" />
     </Item>
     <!--Thresher-->
-    <Item name="Filet" identifier="he-cookedthresherfilet" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.02" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.0" notcampaign="True" />
+    <Item name="Filet" identifier="he-cookedthresherfilet" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="258,495,51,17" depth="0.6" origin="0.5,0.5" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="20" requiredmoney="159" fabricationlimitmin="0" fabricationlimitmax="10" displayname="thresherfooditem" />
@@ -540,10 +540,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Burger" identifier="he-thresherburger" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.02" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="1" spawnprobability="0.02" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.0" notcampaign="True" />
+    <Item name="Burger" identifier="he-thresherburger" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" spawnprobability="0.04" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="0" maxamount="2" spawnprobability="0.04" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="0,485,47,27" depth="0.6" origin="0.5,0.5" />
       <BrokenSprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="48,485,47,27" depth="0.6" maxcondition="99" />
@@ -573,10 +573,10 @@
       </Holdable>
       <AiTarget sightrange="1000" static="true" />
     </Item>
-    <Item name="Hotdog" identifier="he-thresherhotdog" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="True" />
+    <Item name="Hotdog" identifier="he-thresherhotdog" category="Misc" maxstacksize="16" cargocontaineridentifier="metalcrate" description="" Tags="smallitem,fooditem,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="True" requireaimtouse="True">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="True" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="20" requiredmoney="104" fabricationlimitmin="0" fabricationlimitmax="10" displayname="thresherfooditem" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="139,489,67,23" depth="0.6" origin="0.5,0.5" />
@@ -597,7 +597,7 @@
       <AiTarget sightrange="1000" static="true" />
     </Item>
     <!-- Fast Food Menus -->
-    <Item name="Meal of Madness - Crawler" identifier="he-madnessmealcrawler" category="Misc" subcategory="Food" maxstacksize="1" cargocontaineridentifier="metalcrate" description="Content: 1x Crawler Burger | 8x Crawler Nuggets | 1x Can of Couwola Cola | 1x Random Toy" Tags="ingredient,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_softitem" isshootable="true" requireaimtouse="true" canflipx="false">
+    <Item name="Meal of Madness - Crawler" identifier="he-madnessmealcrawler" category="Misc" subcategory="Food" maxstacksize="2" cargocontaineridentifier="metalcrate" description="Content: 1x Crawler Burger | 8x Crawler Nuggets | 1x Can of Couwola Cola | 1x Random Toy" Tags="ingredient,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_softitem" isshootable="true" requireaimtouse="true" canflipx="false">
       <PreferredContainer primary="table" secondary="crewcab,kitchen" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="10" requiredmoney="105" fabricationlimitmin="2" fabricationlimitmax="20" />
       <Deconstruct time="1" requireddeconstructor="deconstructor" />
@@ -625,7 +625,7 @@
         </Button>
       </CustomInterface>
     </Item>
-    <Item name="Meal of Madness - Mudraptor" identifier="he-madnessmealmudraptor" category="Misc" subcategory="Food" maxstacksize="1" cargocontaineridentifier="metalcrate" description="Content: 1x Mudraptor Burger | 8x Mudraptor Nuggets | 1x Can of Couwola Cola | 1x Random Toy" Tags="ingredient,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_softitem" isshootable="true" requireaimtouse="true" canflipx="false">
+    <Item name="Meal of Madness - Mudraptor" identifier="he-madnessmealmudraptor" category="Misc" subcategory="Food" maxstacksize="2" cargocontaineridentifier="metalcrate" description="Content: 1x Mudraptor Burger | 8x Mudraptor Nuggets | 1x Can of Couwola Cola | 1x Random Toy" Tags="ingredient,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_softitem" isshootable="true" requireaimtouse="true" canflipx="false">
       <PreferredContainer primary="table" secondary="crewcab,kitchen" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="10" requiredmoney="175" fabricationlimitmin="2" fabricationlimitmax="20" />
       <Deconstruct time="1" requireddeconstructor="deconstructor" />
@@ -653,7 +653,7 @@
         </Button>
       </CustomInterface>
     </Item>
-    <Item name="Pack of Crawler Nuggets" identifier="he-nuggetpackcrawler" category="Misc" subcategory="Food" maxstacksize="1" cargocontaineridentifier="metalcrate" description="A pack of 8x crawler nuggets." Tags="smallitem,ingredient,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_softitem" isshootable="true" requireaimtouse="true" canflipx="false">
+    <Item name="Pack of Crawler Nuggets" identifier="he-nuggetpackcrawler" category="Misc" subcategory="Food" maxstacksize="2" cargocontaineridentifier="metalcrate" description="A pack of 8x crawler nuggets." Tags="smallitem,ingredient,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_softitem" isshootable="true" requireaimtouse="true" canflipx="false">
       <PreferredContainer primary="table" secondary="crewcab,kitchen" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="10" requiredmoney="35" fabricationlimitmin="0" fabricationlimitmax="10" />
       <Deconstruct time="1" requireddeconstructor="deconstructor" />
@@ -673,7 +673,7 @@
         </Button>
       </CustomInterface>
     </Item>
-    <Item name="Pack of Mudraptor Nuggets" identifier="he-nuggetpackmudraptor" category="Misc" subcategory="Food" maxstacksize="1" cargocontaineridentifier="metalcrate" description="A pack of 8x mudraptor nuggets." Tags="smallitem,ingredient,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_softitem" isshootable="true" requireaimtouse="true" canflipx="false">
+    <Item name="Pack of Mudraptor Nuggets" identifier="he-nuggetpackmudraptor" category="Misc" subcategory="Food" maxstacksize="2" cargocontaineridentifier="metalcrate" description="A pack of 8x mudraptor nuggets." Tags="smallitem,ingredient,fooditem" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_softitem" isshootable="true" requireaimtouse="true" canflipx="false">
       <PreferredContainer primary="table" secondary="crewcab,kitchen" />
       <Fabricate suitablefabricators="cafeteria" requiredtime="10" requiredmoney="70" fabricationlimitmin="0" fabricationlimitmax="10" />
       <Deconstruct time="1" requireddeconstructor="deconstructor" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Ingredients.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Ingredients.xml
index 615f3d5c..2db009c7 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Ingredients.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Food/Ingredients.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <Override>
-    <Item name="Empty Rum Bottle" identifier="he-emptybottlerum" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="metalcrate" description="An empty rum bottle. Can be thrown or used in water to collect dirty water." Tags="smallitem,ingredient" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+    <Item name="Empty Rum Bottle" identifier="he-emptybottlerum" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="metalcrate" description="An empty rum bottle. Can be thrown or used in water to collect dirty water." Tags="smallitem,ingredient" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="27,0,27,66" depth="0.499" origin="0.5,0.5" />
       <Body width="27" height="66" density="8" />
       <Deconstruct time="0.5" />
@@ -22,7 +22,7 @@
         </StatusEffect>
       </Throwable>
     </Item>
-    <Item name="Empty Whiskey Bottle" identifier="he-emptybottlewhiskey" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="metalcrate" description="An empty Whiskey bottle. Can be thrown or used in water to collect dirty water." Tags="smallitem,ingredient" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+    <Item name="Empty Whiskey Bottle" identifier="he-emptybottlewhiskey" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="metalcrate" description="An empty Whiskey bottle. Can be thrown or used in water to collect dirty water." Tags="smallitem,ingredient" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="110,0,27,66" depth="0.499" origin="0.5,0.5" />
       <Body width="27" height="66" density="8" />
       <Deconstruct time="0.5" />
@@ -43,7 +43,7 @@
         </StatusEffect>
       </Throwable>
     </Item>
-    <Item name="Empty Halucinova Bottle" identifier="he-emptybottlehalucinova" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="metalcrate" description="An empty Halucinova bottle. Can be thrown or used in water to collect dirty water." Tags="smallitem,ingredient" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+    <Item name="Empty Halucinova Bottle" identifier="he-emptybottlehalucinova" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="metalcrate" description="An empty Halucinova bottle. Can be thrown or used in water to collect dirty water." Tags="smallitem,ingredient" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="425,2,31,64" depth="0.499" origin="0.5,0.5" />
       <Body width="27" height="66" density="8" />
       <Deconstruct time="0.5" />
@@ -64,7 +64,7 @@
         </StatusEffect>
       </Throwable>
     </Item>
-    <Item name="Empty Bottle" identifier="he-emptybottle" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="metalcrate" description="An empty bottle. Can be thrown or used in water to collect dirty water." Tags="smallitem,ingredient" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+    <Item name="Empty Bottle" identifier="he-emptybottle" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="metalcrate" description="An empty bottle. Can be thrown or used in water to collect dirty water." Tags="smallitem,ingredient" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="180,8,21,58" depth="0.499" origin="0.5,0.5" />
       <Body width="21" height="58" density="8" />
       <Deconstruct time="0.5" />
@@ -85,10 +85,10 @@
         </StatusEffect>
       </Throwable>
     </Item>
-    <Item name="Empty Beer Bottle" identifier="he-emptybottlebeer" category="Misc,Material,Ingredient" maxstacksize="1" cargocontaineridentifier="metalcrate" description="An empty beer bottle. Can be thrown or used in water to collect dirty water." Tags="smallitem,ingredient,emptybottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true" />
+    <Item name="Empty Beer Bottle" identifier="he-emptybottlebeer" category="Misc,Material,Ingredient" maxstacksize="2" cargocontaineridentifier="metalcrate" description="An empty beer bottle. Can be thrown or used in water to collect dirty water." Tags="smallitem,ingredient,emptybottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true" />
       <PreferredContainer primary="kitchen" secondary="crewcab" />
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="494,1,17,65" depth="0.499" origin="0.5,0.5" />
       <InventoryIcon texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="494,1,17,65" origin="0.5,0.5" />
@@ -113,105 +113,105 @@
       </Throwable>
     </Item>
     <!--crawler-->
-    <Item name="Crawler Half" identifier="he-crawlermeatchunk" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Crawler Half" identifier="he-crawlermeatchunk" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="311,446,200,66" depth="0.6" origin="0.5,0.5" />
       <Body width="200" radius="33" density="12" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Crawler Meat" identifier="he-rawcrawlermeat" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Crawler Meat" identifier="he-rawcrawlermeat" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="258,477,51,17" depth="0.6" origin="0.5,0.5" />
       <Body width="51" radius="8" density="9" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Crawler Meat Patty" identifier="he-rawcrawlermeatpatty" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Crawler Meat Patty" identifier="he-rawcrawlermeatpatty" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="275,459,35,17" depth="0.6" origin="0.5,0.5" />
       <Body width="35" radius="7" density="9" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Crawler Sausage" identifier="he-rawcrawlersausage" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Crawler Sausage" identifier="he-rawcrawlersausage" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="243,444,67,14" depth="0.6" origin="0.5,0.5" />
       <Body width="67" radius="7" density="9" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
     <!--mudraptor-->
-    <Item name="Mudraptor Meat Chunk" identifier="he-mudraptormeatchunk" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Mudraptor Meat Chunk" identifier="he-mudraptormeatchunk" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="367,234,145,74" depth="0.6" origin="0.5,0.5" />
       <Body width="145" radius="37" density="12" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Mudraptor Meat" identifier="he-rawmudraptormeat" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Mudraptor Meat" identifier="he-rawmudraptormeat" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="325,332,52,21" depth="0.6" origin="0.5,0.5" />
       <Body width="52" radius="10" density="12" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Mudraptor Meat Patty" identifier="he-rawmudraptormeatpatty" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Mudraptor Meat Patty" identifier="he-rawmudraptormeatpatty" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="275,459,35,17" depth="0.6" origin="0.5,0.5" />
       <Body width="35" radius="7" density="9" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Mudraptor Sausage" identifier="he-rawmudraptorsausage" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Mudraptor Sausage" identifier="he-rawmudraptorsausage" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="243,444,67,14" depth="0.6" origin="0.5,0.5" />
       <Body width="67" radius="7" density="9" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Mudraptor Roast" identifier="he-rawmudraptorroast" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Mudraptor Roast" identifier="he-rawmudraptorroast" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="240,414,93,29" depth="0.6" origin="0.5,0.5" />
       <Body width="93" radius="14" density="12" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
     <!--thresher-->
-    <Item name="Thresher Meat Chunk" identifier="he-threshermeatchunk" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Thresher Meat Chunk" identifier="he-threshermeatchunk" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="334,392,178,53" depth="0.6" origin="0.5,0.5" />
       <Body width="178" radius="26" density="15" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Thresher Meat" identifier="he-rawthreshermeat" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Thresher Meat" identifier="he-rawthreshermeat" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="258,477,51,17" depth="0.6" origin="0.5,0.5" />
       <Body width="51" radius="8" density="15" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Thresher Meat Patty" identifier="he-rawthreshermeatpatty" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Thresher Meat Patty" identifier="he-rawthreshermeatpatty" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="275,459,35,17" depth="0.6" origin="0.5,0.5" />
       <Body width="35" radius="7" density="9" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Thresher Sausage" identifier="he-rawthreshersausage" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Thresher Sausage" identifier="he-rawthreshersausage" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="243,444,67,14" depth="0.6" origin="0.5,0.5" />
       <Body width="67" radius="7" density="9" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
     <!--hammerhead-->
-    <Item name="Hammerhead Spawn" identifier="he-hammerheadspawnmeatchunk" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Hammerhead Spawn" identifier="he-hammerheadspawnmeatchunk" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="431,309,81,34" depth="0.6" origin="0.5,0.5" />
       <Body width="81" radius="17" density="12" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Hammerhead Meat Chunk" identifier="he-hammerheadmeatchunk" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Hammerhead Meat Chunk" identifier="he-hammerheadmeatchunk" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="354,151,158,82" depth="0.6" origin="0.5,0.5" />
       <Body width="158" radius="41" density="12" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Hammerhead Meat" identifier="he-rawhammerheadmeat" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Hammerhead Meat" identifier="he-rawhammerheadmeat" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="327,354,50,25" depth="0.6" origin="0.5,0.5" />
       <Body width="50" radius="12" density="12" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Hammerhead Meat Patty" identifier="he-rawhammerheadmeatpatty" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Hammerhead Meat Patty" identifier="he-rawhammerheadmeatpatty" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="275,459,35,17" depth="0.6" origin="0.5,0.5" />
       <Body width="35" radius="7" density="9" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Hammerhead Sausage" identifier="he-rawhammerheadsausage" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Hammerhead Sausage" identifier="he-rawhammerheadsausage" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="243,444,67,14" depth="0.6" origin="0.5,0.5" />
       <Body width="67" radius="7" density="9" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Hammerhead Spareribs" identifier="he-rawhammerheadspareribs" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Hammerhead Spareribs" identifier="he-rawhammerheadspareribs" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="263,339,61,40" depth="0.6" origin="0.5,0.5" />
       <Body width="61" radius="18" density="12" />
       <AiTarget sightrange="1000" static="True" />
     </Item>
-    <Item name="Raw Hammerhead Roast" identifier="he-rawhammerheadroast" category="Misc,Material,Ingredient" maxstacksize="8" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
+    <Item name="Raw Hammerhead Roast" identifier="he-rawhammerheadroast" category="Misc,Material,Ingredient" maxstacksize="16" cargocontaineridentifier="he-coolercrate" description="" Tags="smallitem,meat,ingredient,canspoil,petfood1,petfood2,petfood3" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_soft" isshootable="true" requireaimtouse="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/FoodAndMeat.png" sourcerect="240,380,93,33" depth="0.6" origin="0.5,0.5" />
       <Body width="93" radius="16" density="12" />
       <AiTarget sightrange="1000" static="True" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Misc/Misc.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Misc/Misc.xml
index b4314605..00a6d79f 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Misc/Misc.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Integrations/Hungry Europans/Content/Items/Misc/Misc.xml	
@@ -32,13 +32,13 @@
       </Controller>
       <ItemContainer selectkey="Action" capacity="0" itemsperrow="0" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
         <GuiFrame relativesize="0.25,0.15" absoluteoffset="0,0.15" anchor="BottomCenter" style="ItemUI" />
-        <Containable items="none" />
-        <SubContainer capacity="5" itemsperrow="5">
-          <Containable items="smallitem,mediumitem" />
+        <Containable items="none,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
+        <SubContainer capacity="11" itemsperrow="5">
+          <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
         </SubContainer>
       </ItemContainer>
-      <ItemContainer capacity="1" maxstacksize="1" hideitems="true">
-        <Containable items="toiletflooditem" />
+      <ItemContainer capacity="1" maxstacksize="2" hideitems="true">
+        <Containable items="toiletflooditem,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
         <StatusEffect type="OnBroken" target="This">
           <SpawnItem identifier="toiletflooditem" spawnposition="ThisInventory" count="1" spawnifinventoryfull="false" />
         </StatusEffect>
@@ -88,9 +88,9 @@
     </Item>
     <!-- EMPTY CANS -->
     <Item name="Empty Can" identifier="he-emptycantonic" description="An empty aluminium can. Can be deconstructed into aluminium or thrown around." category="Misc" Tags="smallitem,emptycan" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_aluminiumcan">
-      <PreferredContainer secondary="wreckcrewcab,wreckstoragecab,wreckstorage,wreckengcab" minamount="1" maxamount="2" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab,abandonedengcab,abandonedstoragecab" minamount="1" maxamount="2" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.01" />
+      <PreferredContainer secondary="wreckcrewcab,wreckstoragecab,wreckstorage,wreckengcab" minamount="2" maxamount="4" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab,abandonedengcab,abandonedstoragecab" minamount="2" maxamount="4" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.02" />
       <PreferredContainer primary="storagecab" secondary="crewcab" />
       <Deconstruct time="1" chooserandom="true">
         <Item identifier="aluminium" amount="1" />
@@ -117,9 +117,9 @@
       </Projectile>
     </Item>
     <Item name="Empty Can" identifier="he-emptycanenergy1" description="An empty aluminium can. Can be deconstructed into aluminium or thrown around." category="Misc" Tags="smallitem,emptycan" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_aluminiumcan">
-      <PreferredContainer secondary="wreckcrewcab,wreckstoragecab,wreckstorage,wreckengcab" minamount="1" maxamount="2" spawnprobability="0.01" />
-      <PreferredContainer secondary="abandonedcrewcab,abandonedengcab,abandonedstoragecab" minamount="1" maxamount="2" spawnprobability="0.01" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.01" />
+      <PreferredContainer secondary="wreckcrewcab,wreckstoragecab,wreckstorage,wreckengcab" minamount="2" maxamount="4" spawnprobability="0.02" />
+      <PreferredContainer secondary="abandonedcrewcab,abandonedengcab,abandonedstoragecab" minamount="2" maxamount="4" spawnprobability="0.02" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.02" />
       <PreferredContainer primary="storagecab" secondary="crewcab" />
       <Deconstruct time="1" chooserandom="true">
         <Item identifier="aluminium" amount="1" />
@@ -146,9 +146,9 @@
       </Projectile>
     </Item>
     <Item name="Empty Can" identifier="he-emptycancola" description="An empty aluminium can. Can be deconstructed into aluminium or thrown around." category="Misc" Tags="smallitem,emptycan" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_aluminiumcan">
-      <PreferredContainer secondary="wreckcrewcab,wreckstoragecab,wreckstorage,wreckengcab" minamount="1" maxamount="3" spawnprobability="0.03" />
-      <PreferredContainer secondary="abandonedcrewcab,abandonedengcab,abandonedstoragecab" minamount="1" maxamount="3" spawnprobability="0.03" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.03" />
+      <PreferredContainer secondary="wreckcrewcab,wreckstoragecab,wreckstorage,wreckengcab" minamount="2" maxamount="6" spawnprobability="0.06" />
+      <PreferredContainer secondary="abandonedcrewcab,abandonedengcab,abandonedstoragecab" minamount="2" maxamount="6" spawnprobability="0.06" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.06" />
       <PreferredContainer primary="storagecab" secondary="crewcab" />
       <Deconstruct time="1" chooserandom="true">
         <Item identifier="aluminium" amount="1" />
@@ -175,9 +175,9 @@
       </Projectile>
     </Item>
     <Item name="Empty Can" identifier="he-emptycancolazero" description="An empty aluminium can. Can be deconstructed into aluminium or thrown around." category="Misc" Tags="smallitem,emptycan" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_aluminiumcan">
-      <PreferredContainer secondary="wreckcrewcab,wreckstoragecab,wreckstorage,wreckengcab" minamount="1" maxamount="3" spawnprobability="0.03" />
-      <PreferredContainer secondary="abandonedcrewcab,abandonedengcab,abandonedstoragecab" minamount="1" maxamount="3" spawnprobability="0.03" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.03" />
+      <PreferredContainer secondary="wreckcrewcab,wreckstoragecab,wreckstorage,wreckengcab" minamount="2" maxamount="6" spawnprobability="0.06" />
+      <PreferredContainer secondary="abandonedcrewcab,abandonedengcab,abandonedstoragecab" minamount="2" maxamount="6" spawnprobability="0.06" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.06" />
       <PreferredContainer primary="storagecab" secondary="crewcab" />
       <Deconstruct time="1" chooserandom="true">
         <Item identifier="aluminium" amount="1" />
@@ -219,11 +219,11 @@
           <SpawnItem identifier="punch" spawnposition="ThisInventory" />
         </StatusEffect>
       </RangedWeapon>
-      <ItemContainer capacity="1" maxstacksize="1" itempos="80,15" containedspritedepths="0.55" hideitems="false" drawinventory="false" canbeselected="false" removecontaineditemsondeconstruct="true" containedstateindicatorslot="0" containedstateindicatorstyle="spear" spawnwithid="punch">
-        <Containable items="punch" />
+      <ItemContainer capacity="1" maxstacksize="2" itempos="80,15" containedspritedepths="0.55" hideitems="false" drawinventory="false" canbeselected="false" removecontaineditemsondeconstruct="true" containedstateindicatorslot="0" containedstateindicatorstyle="spear" spawnwithid="punch">
+        <Containable items="punch,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
-    <Item name="punch" identifier="punch" category="Weapon" maxstacksize="6" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,punch" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="false" allowasextracargo="true" noninteractable="true">
+    <Item name="punch" identifier="punch" category="Weapon" maxstacksize="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,punch" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="false" allowasextracargo="true" noninteractable="true">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Misc/punchgun.png" sourcerect="371,70,50,53" depth="0.55" origin="0.5,0.5" />
       <Body width="50" height="50" radius="0" friction="10" density="10" />
       <Projectile characterusable="false" launchimpulse="5.0" maxtargetstohit="1" HitOnlyCharacters="true">
@@ -247,7 +247,7 @@
         <StatusEffect type="OnUse" target="This" delay="0.5" projectilepullforce="30" setvalue="True" />
       </Rope>
     </Item>
-    <Item name="Whoopee Cushion" identifier="he-whoopeecushion" Category="Hidden" Tags="smallitem,toy" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" spritecolor="255,255,255,255" requireaimtouse="true" noninteractable="false" hideinmenus="false">
+    <Item name="Whoopee Cushion" identifier="he-whoopeecushion" Category="Hidden" Tags="smallitem,toy" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="metalcrate" scale="0.5" spritecolor="255,255,255,255" requireaimtouse="true" noninteractable="false" hideinmenus="false">
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Misc/WhoopeeCushion.png" sourcerect="0,0,45,13" depth="0.55" origin="0.5,0.5" />
       <InventoryIcon texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/UI/InventoryIcons.png" sourcerect="80,426,85,85" origin="0.5,0.5" />
       <Body width="38" radius="6" density="9.5" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Alien/alienitems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Alien/alienitems.xml
index 9aa40cf7..901b2c4a 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Alien/alienitems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Alien/alienitems.xml	
@@ -3,7 +3,7 @@
   <Item name="Electrospike" identifier="electrospike" category="Misc" interactthroughwalls="true" tags="light,ignorebyai" Scale="0.5" health="20" damagedbyexplosions="false" damagedbyprojectiles="true" ItemDamageMultiplier="0.2" damagedbymeleeweapons="true" damagedbyrepairtools="true" sonarsize="20" hideinmenus="true">
     <Sprite texture="%ModDir:2532991202%/Characters/Special Creatures/Spineling_Electric/Spineling_Electric.png" sourcerect="0,860,720,72" depth="0.55" />
     <Body width="300" height="35" density="20" />
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" lightcolor="50,240,255,150" flicker="1.0" flickerspeed="5" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" lightcolor="50,240,255,150" flicker="1.0" flickerspeed="5" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="%ModDir:2532991202%/Characters/Special Creatures/Spineling_Electric/Spineling_Electric.png" sourcerect="0,940,720,72" origin="0.5,0.5" alpha="0.1" />
     </LightComponent>
     <Projectile characterusable="false" launchimpulse="25" sticktocharacters="false" sticktoitems="false" sticktodoors="false" sticktostructures="true" friendlyfire="false" damagedoors="true">
@@ -55,17 +55,17 @@
   </Item>
   <Item name="Alien Generator" identifier="aliengeneratorPA" category="Alien" Tags="alien,aliengenerator,artifactcontainer" scale="0.3">
     <Sprite texture="Content/Items/Alien/Legacy/AlienRuin_Legacy.png" depth="0.8" sourcerect="512,0,512,573" />
-    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,50" canbeselected="false" range="800.0" IsOn="true">
+    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,50" canbeselected="false" range="3200" IsOn="true">
       <Sprite texture="Content/Items/Alien/Legacy/AlienRuin_Legacy.png" sourcerect="0,486,176,176" origin="0.47, 0.3" alpha="1.0" />
     </LightComponent>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="true" itempos="264,-321" containedspritedepth="0.01" autointeractwithcontained="true">
+    <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hideitems="true" itempos="264,-321" containedspritedepth="0.01" autointeractwithcontained="true">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <StatusEffect type="Always" target="This" Charge="-10.0" interval="0.1" />
-      <Containable items="faradayartifact">
+      <Containable items="faradayartifact,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnContaining" target="This" Charge="100.0" Voltage="10" setvalue="true" duration="0.1" stackable="false" />
       </Containable>
     </ItemContainer>
-    <PowerContainer capacity="50.0" canbeselected="false" maxrechargespeed="1000.0" maxoutput="10000.0" />
+    <PowerContainer capacity="110" canbeselected="false" maxrechargespeed="1000.0" maxoutput="10000.0" />
     <ConnectionPanel canbeselected="true" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
@@ -108,7 +108,7 @@
     <DecorativeSprite texture="%ModDir:2532991202%/Items/Alien/Caveworms.png" depth="0.2" sourcerect="15,76,76,41" origin="0.5,0.5" offset="5,5" offsetanim="Noise" offsetanimspeed="3.0" randomgroupid="1" />
     <DecorativeSprite texture="%ModDir:2532991202%/Items/Alien/Caveworms.png" depth="0.2" sourcerect="93,73,76,41" origin="0.5,0.5" offset="5,5" offsetanim="Noise" offsetanimspeed="3.0" randomgroupid="1" />
     <InventoryIcon texture="%ModDir:2532991202%/Items/Alien/Caveworms.png" sourcerect="22,79,69,35" />
-    <LightComponent range="1" lightcolor="40,60,70,255" castshadows="false" IsOn="true">
+    <LightComponent range="4" lightcolor="40,60,70,255" castshadows="false" IsOn="true">
       <sprite texture="%ModDir:2532991202%/Items/Alien/Caveworms.png" sourcerect="15,117,76,41" origin="0.5,0.5" />
     </LightComponent>
     <Body width="30" height="15" density="10" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Effects/EffectItems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Effects/EffectItems.xml
index ee927985..69aa8db1 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Effects/EffectItems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Effects/EffectItems.xml	
@@ -102,7 +102,7 @@
       </ItemComponent>
     </Item>
     <!-- EFFECT ITEMS -->
-    <Item name="" identifier="effect_none" Category="Hidden" Tags="effect" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.5" spritecolor="255,255,255,0" noninteractable="true" hideinmenus="true">
+    <Item name="" identifier="effect_none" Category="Hidden" Tags="effect" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.5" spritecolor="255,255,255,0" noninteractable="true" hideinmenus="true">
       <Sprite texture="Content/Items/Tools/tools.png" depth="0.55" sourcerect="0,0,1,1" />
       <Body radius="1" density="10" />
       <Holdable handle1="0,0" slots="Any" msg="ItemMsgPickUpSelect">
@@ -112,7 +112,7 @@
         </StatusEffect>
       </Holdable>
     </Item>
-    <Item name="" identifier="effect_delete" Category="Hidden" Tags="effect" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.5" spritecolor="255,255,255,0" noninteractable="true" hideinmenus="true">
+    <Item name="" identifier="effect_delete" Category="Hidden" Tags="effect" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.5" spritecolor="255,255,255,0" noninteractable="true" hideinmenus="true">
       <Sprite texture="Content/Items/Tools/tools.png" depth="0.55" sourcerect="0,0,1,1" />
       <Body radius="1" density="10" />
       <Holdable handle1="0,0" slots="Any" msg="ItemMsgPickUpSelect">
@@ -125,7 +125,7 @@
         </StatusEffect>
       </Holdable>
     </Item>
-    <Item name="" identifier="effect_unlock" Category="Hidden" Tags="effect,unlock" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.5" spritecolor="255,255,255,0" noninteractable="true" hideinmenus="true">
+    <Item name="" identifier="effect_unlock" Category="Hidden" Tags="effect,unlock" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.5" spritecolor="255,255,255,0" noninteractable="true" hideinmenus="true">
       <Sprite texture="Content/Items/Tools/tools.png" depth="0.55" sourcerect="0,0,1,1" />
       <Body radius="1" density="10" />
       <Holdable handle1="0,0" slots="Any" msg="ItemMsgPickUpSelect">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Electricity/signalitems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Electricity/signalitems.xml
index 9f515b2a..e4a26b8a 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Electricity/signalitems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Electricity/signalitems.xml	
@@ -3,7 +3,7 @@
   <Items>
     <Item nameidentifier="alarmbuzzer" identifier="alarmbuzzerPA" variantof="alarmbuzzer" hideinmenus="true">
       <Price baseprice="100" minleveldifficulty="5" sold="false"></Price>
-      <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="2.6" range="20">
+      <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="2.6" range="80">
         <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="301,963,42,57" origin="0.5,0.5" alpha="1.0" />
         <sound file="%ModDir:2532991202%/Sounds/Items/Electricity/ReactorAlarm.ogg" type="OnActive" range="1000.0" loop="true" volume="0.5" />
         <StatusEffect type="OnContained" target="This" IsActive="false">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/EventItems/dementonitetools.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/EventItems/dementonitetools.xml
index 9d53c806..ce4e9f56 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/EventItems/dementonitetools.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/EventItems/dementonitetools.xml	
@@ -2,7 +2,7 @@
 <Override>
   <Items>
     <Item name="" identifier="wrenchdementonite" descriptionidentifier="dementonitetool" variantof="wrench" allowasextracargo="true" inventoryiconcolor="136,142,166,255" spritecolor="136,142,166" addedrepairspeedmultiplier="0.4">
-      <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="0" notcampaign="true" />
+      <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="0" notcampaign="true" />
       <PreferredContainer primary="engcab" spawnprobability="0" />
       <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab" spawnprobability="0" />
       <PreferredContainer primary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" spawnprobability="0" />
@@ -10,7 +10,7 @@
       <PreferredContainer secondary="outposttrashcan" spawnprobability="0" />
       <Price baseprice="450" sold="false">
         <Price storeidentifier="merchantoutpost" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
@@ -37,7 +37,7 @@
       </MeleeWeapon>
     </Item>
     <Item name="" identifier="crowbardementonite" descriptionidentifier="dementonitetool" variantof="crowbar" allowasextracargo="true" inventoryiconcolor="136,142,166,255" spritecolor="136,142,166" addedpickingspeedmultiplier="0.6">
-      <PreferredContainer secondary="respawncontainer" amount="1" spawnprobability="0" notcampaign="true" />
+      <PreferredContainer secondary="respawncontainer" amount="2" spawnprobability="0" notcampaign="true" />
       <PreferredContainer primary="engcab" spawnprobability="0" />
       <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab" spawnprobability="0" />
       <PreferredContainer primary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" spawnprobability="0" />
@@ -105,9 +105,9 @@
       <PreferredContainer primary="armcab,secarmcab" spawnprobability="0" />
       <Price baseprice="450" sold="false">
         <Price storeidentifier="merchantoutpost" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
         <Price storeidentifier="merchantresearch" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.75" />
         <Price storeidentifier="merchantmine" />
       </Price>
       <Deconstruct>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/EventItems/eventitems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/EventItems/eventitems.xml
index 1edfff2b..b05ee914 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/EventItems/eventitems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/EventItems/eventitems.xml	
@@ -2,7 +2,7 @@
 <Override>
   <Items>
     <!-- DE Configurator -->
-    <Item name="DE-Configurator" identifier="de_configurator" Category="Hidden" description="Used to configurate some aspects of DynamicEuropa" Tags="config" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.3" spritecolor="255,255,255,255" noninteractable="true" hideinmenus="true">
+    <Item name="DE-Configurator" identifier="de_configurator" Category="Hidden" description="Used to configurate some aspects of DynamicEuropa" Tags="config" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.3" spritecolor="255,255,255,255" noninteractable="true" hideinmenus="true">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="149,371,69,93" depth="0.8" origin="0.5,0.5" />
       <Body width="60" height="90" density="15" />
       <Holdable handle1="0,0" slots="RightHand,LeftHand" msg="ItemMsgPickUpSelect" />
@@ -24,7 +24,7 @@
       </CustomInterface>
     </Item>
     <!-- Contraband Rum -->
-    <Item hideinmenus="true" name="Mariner's Moonshine" identifier="contrabandrum" category="Medical,Misc" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" description="A special brand of rum, made with a concotion of sea mushrooms, psilotoad juices and matured in a rusty bathtub." Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true" spritecolor="255,255,120,255">
+    <Item hideinmenus="true" name="Mariner's Moonshine" identifier="contrabandrum" category="Medical,Misc" maxstacksize="16" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" description="A special brand of rum, made with a concotion of sea mushrooms, psilotoad juices and matured in a rusty bathtub." Tags="smallitem,drinkitem,alcoholitem,bottle" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="5.5" isshootable="true" requireaimtouse="true" spritecolor="255,255,120,255">
       <PreferredContainer primary="crate" />
       <Price baseprice="150" sold="false"></Price>
       <Sprite texture="%ModDir:2532991202%/Integrations/Hungry Europans/Content/Items/Food/DrinksAndIngredients.png" sourcerect="0,0,27,66" depth="0.6" origin="0.5,0.5" />
@@ -96,7 +96,7 @@
       <ContainedSprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="250,109,256,117" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.501" origin="0.5,0.5" />
       <Body width="254" height="115" density="10.5" />
       <AiTarget soundrange="50000" sonarlabel="entityname.lairbomb" staticsound="true" />
-      <LightComponent range="100.0" powerconsumption="0" lightcolor="255,195,95,111" IsOn="false" alphablend="true" blinkfrequency="0" castshadows="false" allowingameediting="false" comparison="And">
+      <LightComponent range="400" powerconsumption="0" lightcolor="255,195,95,111" IsOn="false" alphablend="true" blinkfrequency="0" castshadows="false" allowingameediting="false" comparison="And">
         <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="507,109,256,117" depth="0.6" premultiplyalpha="false" origin="0.5,0.5" />
         <StatusEffect type="OnActive" target="This" interval="1" condition="-1" disabledeltatime="true" />
         <!-- many statuseffects for blinking + sounds -->
@@ -201,11 +201,11 @@
         </StatusEffect>
       </ItemComponent>
       <TriggerComponent triggeredby="Human" force="-100" radius="130" distancebasedforce="true" />
-      <LightComponent LightColor="80,100,120,100" range="800" IsOn="true" pulseamount="0.2" pulsefrequency="0.2" offset="0,16" allowingameediting="false" />
+      <LightComponent LightColor="80,100,120,100" range="3200" IsOn="true" pulseamount="0.2" pulsefrequency="0.2" offset="0,16" allowingameediting="false" />
     </Item>
     <!-- Construction Materials -->
     <Item name="Construction Material Crate" identifier="constructionmaterialcrate" tags="crate,constructionmaterials" description="A crate full of processed construction materials. Can be delivered to construction sites." scale="0.5" impactsoundtag="impact_metal_heavy">
-      <PreferredContainer primary="cargocontainer" spawnprobability="0.1" />
+      <PreferredContainer primary="cargocontainer" spawnprobability="0.2" />
       <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" depth="0.54" sourcerect="0,0,146,82" origin="0.5,0.5" />
       <Body width="144" height="78" density="25" />
       <Price baseprice="350" sold="true" BuyingPriceMultiplier="2" CanBeSpecial="false" minavailable="0" maxavailable="3">
@@ -230,12 +230,12 @@
       <Price baseprice="950" sold="false">
         <Price storeidentifier="merchantoutpost" />
         <Price storeidentifier="merchantcity" minavailable="0" maxavailable="3" sold="false"></Price>
-        <Price storeidentifier="merchantresearch" multiplier="1.2" />
+        <Price storeidentifier="merchantresearch" multiplier="3.6" />
         <Price storeidentifier="merchantmilitary" />
-        <Price storeidentifier="merchantmine" multiplier="1.1" />
+        <Price storeidentifier="merchantmine" multiplier="3.3" />
       </Price>
-      <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.0" />
-      <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.0" />
+      <PreferredContainer primary="divingsuitcontainer" spawnprobability="0" />
+      <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0" />
       <Deconstruct time="30">
         <Item identifier="ballisticfiber" />
         <Item identifier="titaniumaluminiumalloy" />
@@ -252,7 +252,7 @@
       <Body radius="45" width="34" density="20" />
       <Wearable>
         <sprite name="Duckysuit Helmet Wearable" texture="%ModDir:2532991202%/Items/EventItems/DuckySuit.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.85" hidelimb="false" alphaclipotherwearables="true" sourcerect="300,300,122,95" origin="0.3,0.4">
-          <LightComponent range="0.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="false" allowingameediting="false">
+          <LightComponent range="0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="false" allowingameediting="false">
             <StatusEffect type="OnWearing" target="This,Character" Voltage="0.0" setvalue="true">
               <Conditional IsDead="false" />
             </StatusEffect>
@@ -364,8 +364,8 @@
         </StatusEffect>
         <StatusEffect type="OnBroken" target="This" capacity="0" allowaccess="false" drawinventory="false" setvalue="true" />
       </Holdable>
-      <ItemContainer capacity="6" keepopenwhenequipped="false" movableframe="true" spawnwithid="revolver,revolver,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel">
-        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo" />
+      <ItemContainer capacity="13" keepopenwhenequipped="false" movableframe="true" spawnwithid="revolver,revolver,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel,revolverrounddepletedfuel">
+        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
     <Item name="Duffel Bag" identifier="kumoduffelbag2" nameidentifier="duffelbag" category="Equipment" tags="mobilecontainer" fireproof="true" description="" impactsoundtag="impact_soft" scale="0.4" hideinmenus="true">
@@ -386,8 +386,8 @@
         </StatusEffect>
         <StatusEffect type="OnBroken" target="This" capacity="0" allowaccess="false" drawinventory="false" setvalue="true" />
       </Holdable>
-      <ItemContainer capacity="6" keepopenwhenequipped="false" movableframe="true" spawnwithid="smg,smgmagazine,smgmagazine,smgmagazine,smgmagazine,smgmagazinedepletedfuel,smgmagazinedepletedfuel,smgmagazinedepletedfuel,smgmagazinedepletedfuel">
-        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo" />
+      <ItemContainer capacity="13" keepopenwhenequipped="false" movableframe="true" spawnwithid="smg,smgmagazine,smgmagazine,smgmagazine,smgmagazine,smgmagazinedepletedfuel,smgmagazinedepletedfuel,smgmagazinedepletedfuel,smgmagazinedepletedfuel">
+        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
     <Item name="Duffel Bag" identifier="kumoduffelbag3" nameidentifier="duffelbag" category="Equipment" tags="mobilecontainer" fireproof="true" description="" impactsoundtag="impact_soft" scale="0.4" hideinmenus="true">
@@ -408,8 +408,8 @@
         </StatusEffect>
         <StatusEffect type="OnBroken" target="This" capacity="0" allowaccess="false" drawinventory="false" setvalue="true" />
       </Holdable>
-      <ItemContainer capacity="6" keepopenwhenequipped="false" movableframe="true" spawnwithid="shotgun,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell">
-        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo" />
+      <ItemContainer capacity="13" keepopenwhenequipped="false" movableframe="true" spawnwithid="shotgun,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell,shotgunshell">
+        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
     <Item name="Duffel Bag" identifier="kumoduffelbag4" nameidentifier="duffelbag" category="Equipment" tags="mobilecontainer" fireproof="true" description="" impactsoundtag="impact_soft" scale="0.4" hideinmenus="true">
@@ -430,8 +430,8 @@
         </StatusEffect>
         <StatusEffect type="OnBroken" target="This" capacity="0" allowaccess="false" drawinventory="false" setvalue="true" />
       </Holdable>
-      <ItemContainer capacity="6" keepopenwhenequipped="false" movableframe="true" spawnwithid="autoshotgun,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive">
-        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo" />
+      <ItemContainer capacity="13" keepopenwhenequipped="false" movableframe="true" spawnwithid="autoshotgun,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive,shotgunslugexplosive">
+        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
     <Item name="Duffel Bag" identifier="kumoduffelbag5" nameidentifier="duffelbag" category="Equipment" tags="mobilecontainer" fireproof="true" description="" impactsoundtag="impact_soft" scale="0.4" hideinmenus="true">
@@ -452,8 +452,8 @@
         </StatusEffect>
         <StatusEffect type="OnBroken" target="This" capacity="0" allowaccess="false" drawinventory="false" setvalue="true" />
       </Holdable>
-      <ItemContainer capacity="6" keepopenwhenequipped="false" movableframe="true" spawnwithid="assaultrifle,assaultriflemagazine,assaultriflemagazine,assaultriflemagazine,assaultriflemagazine,assaultriflemagazine">
-        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo" />
+      <ItemContainer capacity="13" keepopenwhenequipped="false" movableframe="true" spawnwithid="assaultrifle,assaultriflemagazine,assaultriflemagazine,assaultriflemagazine,assaultriflemagazine,assaultriflemagazine">
+        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
     <Item name="Duffel Bag" identifier="kumoduffelbag6" nameidentifier="duffelbag" category="Equipment" tags="mobilecontainer" fireproof="true" description="" impactsoundtag="impact_soft" scale="0.4" hideinmenus="true">
@@ -474,8 +474,8 @@
         </StatusEffect>
         <StatusEffect type="OnBroken" target="This" capacity="0" allowaccess="false" drawinventory="false" setvalue="true" />
       </Holdable>
-      <ItemContainer capacity="6" keepopenwhenequipped="false" movableframe="true" spawnwithid="grenadelauncher,40mmgrenade,40mmgrenade,40mmgrenade,40mmgrenade,40mmgrenade,40mmgrenade,40mmgrenade,40mmgrenade">
-        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo" />
+      <ItemContainer capacity="13" keepopenwhenequipped="false" movableframe="true" spawnwithid="grenadelauncher,40mmgrenade,40mmgrenade,40mmgrenade,40mmgrenade,40mmgrenade,40mmgrenade,40mmgrenade,40mmgrenade">
+        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
     <Item name="Duffel Bag" identifier="kumoduffelbag7" nameidentifier="duffelbag" category="Equipment" tags="mobilecontainer" fireproof="true" description="" impactsoundtag="impact_soft" scale="0.4" hideinmenus="true">
@@ -496,8 +496,8 @@
         </StatusEffect>
         <StatusEffect type="OnBroken" target="This" capacity="0" allowaccess="false" drawinventory="false" setvalue="true" />
       </Holdable>
-      <ItemContainer capacity="6" keepopenwhenequipped="false" movableframe="true" spawnwithid="hmg,hmgmagazine,hmgmagazine,hmgmagazine,hmgmagazine">
-        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo" />
+      <ItemContainer capacity="13" keepopenwhenequipped="false" movableframe="true" spawnwithid="hmg,hmgmagazine,hmgmagazine,hmgmagazine,hmgmagazine">
+        <Containable items="weapon,gun,weaponsmith,grenade,smgammo,shotgunammo,stungunammo,harpoonammo,rifleammo,hmgammo,revolverammo,pistolammoitem,ammo,ammunition,bullet,assaultrifleammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
     <!-- Sadashi Kira Items -->
@@ -523,7 +523,7 @@
       </Holdable>
     </Item>
     <!-- Fren Seynomor Items -->
-    <Item hideinmenus="true" name="Sample VAX" identifier="frentestmedicine" description="A genetically modified husk sample created by Dr. Seynomor. He claims that he &quot;perfected&quot; the formula and whoever uses it can gain the abilities of a husk without losing their mental capability. The instruction says, &quot;To use it on yourself, hold right click and then press E.&quot;" category="Misc" maxstacksize="1" Tags="smallitem" scale="0.5" impactsoundtag="impact_metal_light">
+    <Item hideinmenus="true" name="Sample VAX" identifier="frentestmedicine" description="A genetically modified husk sample created by Dr. Seynomor. He claims that he &quot;perfected&quot; the formula and whoever uses it can gain the abilities of a husk without losing their mental capability. The instruction says, &quot;To use it on yourself, hold right click and then press E.&quot;" category="Misc" maxstacksize="2" Tags="smallitem" scale="0.5" impactsoundtag="impact_metal_light">
       <PreferredContainer primary="medcab" />
       <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="769,448,64,64" origin="0.5,0.5" />
       <Sprite texture="Content/Items/Medical/Medicines.png" sourcerect="112,69,38,70" depth="0.6" origin="0.5,0.5" />
@@ -572,14 +572,14 @@
       </Holdable>
     </Item>
     <!-- Pirate Armory Alarm -->
-    <Item name="Alarm Buzzer" identifier="pa-armoryalarmbuzzer" description="TRIGGERS PIRATE ARMORY EVENT WHEN ACTIVATED TO MAKE PIRATES HOSTILE" category="Electrical" Tags="smallitem,sound" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" noninteractable="true" hideinmenus="true">
+    <Item name="Alarm Buzzer" identifier="pa-armoryalarmbuzzer" description="TRIGGERS PIRATE ARMORY EVENT WHEN ACTIVATED TO MAKE PIRATES HOSTILE" category="Electrical" Tags="smallitem,sound" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" noninteractable="true" hideinmenus="true">
       <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="128,127,64,64" origin="0.5,0.5" />
       <Sprite texture="Content/Items/Electricity/signalcomp.png" depth="0.8" sourcerect="221,138,42,57" origin="0.5,0.5" />
       <Body radius="20" density="20" />
       <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
         <RequiredItem items="wrench" type="Equipped" />
       </Holdable>
-      <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="2.6" range="20">
+      <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="2.6" range="80">
         <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="301,963,42,57" origin="0.5,0.5" alpha="1.0" />
         <sound file="Content/Items/AlarmBuzzerLoop.ogg" type="OnActive" range="10000.0" loop="true" volume="0.5" />
         <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -606,7 +606,7 @@
       </Deconstruct>
       <!-- rectangular body to prevent the egg from rolling -->
       <Body width="110" height="120" friction="1.0" restitution="0.01" angulardamping="1.0" density="12" />
-      <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+      <ItemContainer capacity="1" maxstacksize="2" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
         <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
         <StatusEffect type="OnSpawn" target="This" delay="1">
           <particleemitter particle="whitegoosplash" particleamount="20" velocitymin="0" velocitymax="300" anglemin="0" anglemax="360" scalemin="0.5" scalemax="1.0" emitinterval="0" particlespersecond="0" highqualitycollisiondetection="False" copyentityangle="False" />
@@ -624,16 +624,16 @@
           <SpawnCharacter speciesname="Crawler_hatchling" />
           <Remove />
         </StatusEffect>
-        <Containable items="antibloodloss1">
+        <Containable items="antibloodloss1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <!-- increase scale -->
           <StatusEffect type="OnContaining" target="This" Scale="0.005" />
           <StatusEffect type="OnContaining" target="Contained" Condition="-1" />
         </Containable>
       </ItemContainer>
-      <LightComponent range="5" lightcolor="255,0,0,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+      <LightComponent range="20" lightcolor="255,0,0,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
         <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="300,291,98,113" origin="0.5,0.6" alpha="1.0" />
       </LightComponent>
-      <LightComponent range="40" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+      <LightComponent range="160" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
         <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="410,301,88,95" origin="0.5,0.6" alpha="1.0" />
       </LightComponent>
     </Item>
@@ -711,7 +711,7 @@
       </ItemComponent>
     </Item>
     <!-- Submarine Charger Relay -->
-    <Item hideinmenus="true" name="Event - Charger Relay" identifier="chargerrelay" category="Electrical" Tags="smallitem,signal,logic" maxstacksize="8" cargocontaineridentifier="metalcrate" description="TRIGGERS THE CHARGING DOCK EVENT. DO NOT USE THIS IN ANY MODULE OTHER THAN THE AIRLOCK THAT IS SUPPOSED TO NOT SUPPLY POWER UNLESS PAID FOR!" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+    <Item hideinmenus="true" name="Event - Charger Relay" identifier="chargerrelay" category="Electrical" Tags="smallitem,signal,logic" maxstacksize="16" cargocontaineridentifier="metalcrate" description="TRIGGERS THE CHARGING DOCK EVENT. DO NOT USE THIS IN ANY MODULE OTHER THAN THE AIRLOCK THAT IS SUPPOSED TO NOT SUPPLY POWER UNLESS PAID FOR!" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
       <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,388,63,57" origin="0.5,0.5" />
       <Sprite texture="Content/Items/Electricity/signalcomp.png" depth="0.8" sourcerect="64,128,32,32" origin="0.5,0.5" canflipx="false" />
       <RelayComponent canbeselected="true" vulnerabletoemp="false" canbeoverloaded="false">
@@ -819,12 +819,12 @@
           <TriggerEvent identifier="militarypatrol" />
         </StatusEffect>
       </TriggerComponent>
-      <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="10" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2" />
+      <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="10" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2" />
     </Item>
     <!-- spooky alien text for event because it's smpler that way -->
     <Item name="" identifier="alienwritingdecalevent" nameidentifier="alienwriting" Tags="alienwritingdecalevent" width="285" height="160" scale="0.3" noninteractable="true" category="alien, Decorative" spritecolor="255,0,0,180" hideinmenus="true">
       <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,404,285,160" depth="0.650" premultiplyalpha="false" origin="0.5,0.5" />
-      <LightComponent range="256" IsOn="true" lightcolor="255,0,0,120" pulseamount="0.2" pulsefrequency="5" castshadows="false" allowingameediting="false">
+      <LightComponent range="1024" IsOn="true" lightcolor="255,0,0,120" pulseamount="0.2" pulsefrequency="5" castshadows="false" allowingameediting="false">
         <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,564,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
         <StatusEffect target="This" type="OnSpawn" delay="2">
           <Remove />
@@ -885,10 +885,10 @@
         </StatusEffect>
         <StatValue stattype="MovementSpeed" value="-0.5" />
       </Holdable>
-      <LightComponent LightColor="30,100,120,50" range="300" IsOn="true" pulseamount="0.2" pulsefrequency="0.2" offset="0,0" allowingameediting="false">
+      <LightComponent LightColor="30,100,120,50" range="1200" IsOn="true" pulseamount="0.2" pulsefrequency="0.2" offset="0,0" allowingameediting="false">
         <IsActiveConditional InPlayerSubmarine="false" />
       </LightComponent>
-      <LightComponent LightColor="30,100,120,255" range="50" IsOn="true" pulseamount="0.2" pulsefrequency="0.2" offset="0,0" allowingameediting="false">
+      <LightComponent LightColor="30,100,120,255" range="200" IsOn="true" pulseamount="0.2" pulsefrequency="0.2" offset="0,0" allowingameediting="false">
         <sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="0,363,144,85" origin="0.5,0.5" />
       </LightComponent>
       <AiTarget Soundrange="2000" sonardisruption="0.2" />
@@ -906,12 +906,12 @@
           <Remove />
         </StatusEffect>
       </Itemcomponent>
-      <LightComponent LightColor="30,100,120,120" range="300" IsOn="true" pulseamount="0.2" pulsefrequency="0.2" offset="0,0" allowingameediting="false" />
+      <LightComponent LightColor="30,100,120,120" range="1200" IsOn="true" pulseamount="0.2" pulsefrequency="0.2" offset="0,0" allowingameediting="false" />
       <AiTarget Soundrange="5000" sonardisruption="0.1" />
     </Item>
-    <Item name="Old pick-chisel" identifier="piezochipper" description="Chip at piezo crystals with this" hideinmenus="false" category="Misc" maxstacksize="1" maxstacksizecharacterinventory="1" cargocontaineridentifier="metalcrate" Tags="mediumitem" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Item name="Old pick-chisel" identifier="piezochipper" description="Chip at piezo crystals with this" hideinmenus="false" category="Misc" maxstacksize="2" maxstacksizecharacterinventory="2" cargocontaineridentifier="metalcrate" Tags="mediumitem" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <PreferredContainer primary="engcab" spawnprobability="0" />
-      <PreferredContainer secondary="wreckstoragecab,wreckengcab" spawnprobability="0.01" />
+      <PreferredContainer secondary="wreckstoragecab,wreckengcab" spawnprobability="0.02" />
       <InventoryIcon texture="%Moddir%/Items/DE-ItemsAtlas.png" sourcerect="180,270,118,58" origin="0.5,0.5" />
       <Sprite texture="%Moddir%/Items/DE-ItemsAtlas.png" sourcerect="180,270,118,58" depth="0.55" />
       <Body width="25" height="65" density="10.2" waterdragcoefficient="1" />
@@ -954,7 +954,7 @@
         </StatusEffect>
       </MeleeWeapon>
     </Item>
-    <Item name="Piezo Crystal Chunk" identifier="piezochunk" description="A chunk of piezo crystal. Can be used as a makeshift battery... but don't drop it." category="Equipment,Electrical" maxstacksize="1" tags="smallitem,loadable,mobilebattery" scale="0.5" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" health="30" impacttolerance="2" damagedbyexplosions="true">
+    <Item name="Piezo Crystal Chunk" identifier="piezochunk" description="A chunk of piezo crystal. Can be used as a makeshift battery... but don't drop it." category="Equipment,Electrical" maxstacksize="2" tags="smallitem,loadable,mobilebattery" scale="0.5" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" health="30" impacttolerance="2" damagedbyexplosions="true">
       <PreferredContainer primary="engcab" />
       <PreferredContainer primary="stunbaton,underwaterscooter,handheldsonar,sonarbeacon,flashlight,portablepump,poweredcontainer" />
       <Deconstruct time="5" chooserandom="true">
@@ -1008,11 +1008,11 @@
           <ParticleEmitter particle="ElectricShock" distancemin="0" distancemax="0" particlespersecond="5.0" anglemin="0" anglemax="360" scalemin="0.05" scalemax="0.1" />
         </StatusEffect>
       </ElectricalDischarger>
-      <LightComponent lightcolor="60,180,250,255" range="70.0" powerconsumption="0" flicker="0.5" flickerspeed="0.8" pulsefrequency="0.4" pulseamount="0.5" ison="true" drawbehindsubs="false">
+      <LightComponent lightcolor="60,180,250,255" range="280" powerconsumption="0" flicker="0.5" flickerspeed="0.8" pulsefrequency="0.4" pulseamount="0.5" ison="true" drawbehindsubs="false">
         <IsActiveConditional Condition="gt 0.0" />
         <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
       </LightComponent>
-      <LightComponent lightcolor="60,180,250,255" range="1.0" powerconsumption="0" pulsefrequency="0.4" pulseamount="0.5" ison="true" drawbehindsubs="false">
+      <LightComponent lightcolor="60,180,250,255" range="4" powerconsumption="0" pulsefrequency="0.4" pulseamount="0.5" ison="true" drawbehindsubs="false">
         <IsActiveConditional Condition="gt 0.0" />
         <LightTexture texture="%Moddir%/Items/DE-ItemsAtlas.png" sourcerect="320,284,49,31" origin="0.5,0.5" />
       </LightComponent>
@@ -1031,32 +1031,32 @@
       <Body width="150" height="50" density="18" />
       <AiTarget soundrange="50000" sonarlabel="entityname.biocrate" staticsound="true" />
       <Holdable slots="RightHand+LeftHand" holdpos="0,-80" holdangle="10" handle1="-50,14" handle2="90,65" aimable="false" msg="ItemMsgPickUpSelect" swingamount="10,10" swingspeed="0.2" swingwhenholding="True" />
-      <LightComponent lightcolor="255,30,30,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+      <LightComponent lightcolor="255,30,30,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
         <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.685,0.7" alpha="1.0" />
         <IsActiveConditional conditionpercentage="gte 0" />
       </LightComponent>
-      <LightComponent lightcolor="0,100,170,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+      <LightComponent lightcolor="0,100,170,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
         <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.135,0.7" alpha="1.0" />
         <IsActiveConditional conditionpercentage="gt 20" />
       </LightComponent>
-      <LightComponent lightcolor="0,130,190,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+      <LightComponent lightcolor="0,130,190,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
         <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.585,0.7" alpha="1.0" />
         <IsActiveConditional conditionpercentage="gt 40" />
       </LightComponent>
-      <LightComponent lightcolor="0,160,210,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+      <LightComponent lightcolor="0,160,210,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
         <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.035,0.7" alpha="1.0" />
         <IsActiveConditional conditionpercentage="gt 60" />
       </LightComponent>
-      <LightComponent lightcolor="0,190,230,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+      <LightComponent lightcolor="0,190,230,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
         <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-0.515,0.7" alpha="1.0" />
         <IsActiveConditional conditionpercentage="gt 80" />
       </LightComponent>
-      <LightComponent lightcolor="0,220,255,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+      <LightComponent lightcolor="0,220,255,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
         <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-1.065,0.7" alpha="1.0" />
         <IsActiveConditional conditionpercentage="gte 95" />
       </LightComponent>
-      <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" containedstateindicatorstyle="battery" spawnwithid="batterycell">
-        <Containable items="mobilebattery">
+      <ItemContainer capacity="1" maxstacksize="2" canbeselected="true" hideitems="true" hudpos="0.5,0.6" containedstateindicatorstyle="battery" spawnwithid="batterycell">
+        <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <StatusEffect type="OnContaining" target="Contained" Condition="-0.5" interval="1" disabledeltatime="true">
             <Conditional condition="gt 0" />
           </StatusEffect>
@@ -1091,7 +1091,7 @@
         </StatusEffect>
         <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
         <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-        <Containable items="loadable" />
+        <Containable items="loadable,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
     <Item name="ventleakcloud" identifier="ventleakcloud" Scale="1" tags="gas" sonarsize="0" hideinmenus="true" health="10" depth="0.1" isdangerous="true" damagedbyrepairtools="true" noninteractable="true">
@@ -1150,12 +1150,12 @@
           <ParticleEmitter particle="bubbles" particleamount="2" anglemin="0" anglemax="360" scalemin="0.25" scalemax="0.5" velocitymin="20" velocitymax="100" copyentityangle="true" />
         </StatusEffect>
         <!-- visuals -->
-        <LightComponent lightcolor="150,150,30,220" castshadows="false" pulseamount="0.5" pulsefrequency="0.5" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+        <LightComponent lightcolor="150,150,30,220" castshadows="false" pulseamount="0.5" pulsefrequency="0.5" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
           <sprite texture="Content/Characters/Defensebot/DefenseBot.png" sourcerect="64,104,25,8" origin="0.5,1.1" size="1,1" alpha="1.0" />
           <IsActiveConditional conditionpercentage="gt 20" />
         </LightComponent>
         <!-- alarm -->
-        <LightComponent lightcolor="255,30,30,220" castshadows="false" blinkfrequency="2" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+        <LightComponent lightcolor="255,30,30,220" castshadows="false" blinkfrequency="2" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
           <sprite texture="Content/Characters/Defensebot/DefenseBot.png" sourcerect="64,104,25,8" origin="0.5,1.1" size="1,1" alpha="1.0" />
           <IsActiveConditional conditionpercentage="lte 20" />
           <IsActiveConditional conditionpercentage="gt 0" />
@@ -1189,7 +1189,7 @@
           <ParticleEmitter particle="bubbles" particleamount="2" anglemin="0" anglemax="360" scalemin="0.25" scalemax="0.5" velocitymin="20" velocitymax="100" copyentityangle="true" />
         </StatusEffect>
         <!-- visuals -->
-        <LightComponent lightcolor="150,150,30,220" castshadows="false" pulseamount="0.5" pulsefrequency="0.5" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+        <LightComponent lightcolor="150,150,30,220" castshadows="false" pulseamount="0.5" pulsefrequency="0.5" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
           <sprite texture="Content/Characters/Defensebot/DefenseBot.png" sourcerect="64,104,25,8" origin="0.5,1.1" size="1,1" alpha="1.0" />
           <IsActiveConditional conditionpercentage="gt 0" />
         </LightComponent>
@@ -1202,7 +1202,7 @@
         </StatusEffect>
       </Repairable>
     </Item>
-    <Item name="" identifier="husksamplevial" hideinmenus="true" category="Medical" maxstacksize="1" maxstacksizecharacterinventory="1" cargocontaineridentifier="mediccrate" Tags="smallitem,missionitem" description="" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Item name="" identifier="husksamplevial" hideinmenus="true" category="Medical" maxstacksize="2" maxstacksizecharacterinventory="2" cargocontaineridentifier="mediccrate" Tags="smallitem,missionitem" description="" useinhealthinterface="false" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <PreferredContainer primary="medcab" secondary="medcontainer" />
       <InventoryIcon texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
       <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="419,268,16,46" depth="0.6" origin="0.5,0.5" />
@@ -1226,7 +1226,7 @@
       </DecorativeSprite>
       <BrokenSprite name="brokensprite_gradual" texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="912,598,210,210" origin="0.5,0.5" depth="0.02" fadein="true" maxcondition="50" />
       <BrokenSprite name="brokensprite_broken" texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="912,598,210,210" origin="0.5,0.5" depth="0.01" fadein="false" />
-      <LightComponent range="200" lightcolor="255,62,62,255" IsOn="true" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
+      <LightComponent range="800" lightcolor="255,62,62,255" IsOn="true" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
         <IsActiveConditional condition="lte 50" />
         <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="912,813,210,210" origin="0.5,0.5" size="1,1" alpha="1.0" />
         <StatusEffect type="OnActive" target="This">
@@ -1308,7 +1308,7 @@
           <Remove />
         </StatusEffect>
       </ItemComponent>
-      <LightComponent range="5" lightcolor="190,140,80,140" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+      <LightComponent range="20" lightcolor="190,140,80,140" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
         <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="300,291,98,113" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
       <aitarget sightrange="2000" soundrange="2000" static="true" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Fabricators/vendingmachines.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Fabricators/vendingmachines.xml
index 55614d75..51fc5339 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Fabricators/vendingmachines.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Fabricators/vendingmachines.xml	
@@ -8,10 +8,10 @@
     </Fabricator>
     <ItemContainer capacity="0" canbeselected="false" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true" />
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true" />
-    <LightComponent range="0.0" lightcolor="255,255,255,111" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="%ModDir:2532991202%/Items/Fabricators/Storemachinelight.png" sourcerect="0,0,900,900" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="0.0" lightcolor="255,255,255,0" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" blinkfrequency="1" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,0" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" blinkfrequency="1" allowingameediting="false">
       <sprite texture="%ModDir:2532991202%/Items/Fabricators/Storemachineblink.png" depth="0.025" sourcerect="0,0,900,900" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Factions/cultist_gear.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Factions/cultist_gear.xml
index 89a99198..8d150533 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Factions/cultist_gear.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Factions/cultist_gear.xml	
@@ -4,7 +4,7 @@
     <Item name="" identifier="cultistrobeshoodless" category="Equipment" tags="smallitem,clothing,huskcult" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
       <PreferredContainer primary="crewcab" />
       <Price baseprice="150" canbespecial="false" sold="false">
-        <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="4" sold="true">
+        <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="4" sold="true">
           <Reputation faction="huskcult" min="70" />
         </Price>
       </Price>
@@ -34,7 +34,7 @@
     <Item name="" identifier="cultistrobes" category="Equipment" tags="smallitem,clothing,huskcult" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
       <PreferredContainer primary="crewcab" />
       <Price baseprice="150" canbespecial="false" sold="false">
-        <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="4" sold="true">
+        <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="4" sold="true">
           <Reputation faction="huskcult" min="70" />
         </Price>
       </Price>
@@ -70,7 +70,7 @@
     <Item name="" identifier="zealotrobes" category="Equipment" tags="smallitem,clothing,huskcult" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
       <PreferredContainer primary="crewcab" />
       <Price baseprice="150" canbespecial="false" sold="false">
-        <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="4" sold="true">
+        <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="4" sold="true">
           <Reputation faction="huskcult" min="70" />
         </Price>
       </Price>
@@ -85,7 +85,7 @@
         <sprite name="Cultist Right Hand" texture="Content/Items/Jobgear/Cultist/cultist2.png" limb="RightHand" hidelimb="true" inherittexturescale="true" inheritorigin="true" inheritsourcerect="true" />
         <sprite name="Cultist Left Hand" texture="Content/Items/Jobgear/Cultist/cultist2.png" limb="LeftHand" hidelimb="true" inherittexturescale="true" inheritorigin="true" inheritsourcerect="true" />
         <sprite name="Cultist Right Lower Arm" texture="Content/Items/Jobgear/Cultist/cultist2.png" limb="RightArm" hidelimb="true" inherittexturescale="true" inheritorigin="true" inheritsourcerect="true">
-          <LightComponent range="10.0" lightcolor="30,180,80,255" powerconsumption="10" IsOn="true" pulseamount="0.5" pulsefrequency="0.5" allowingameediting="false">
+          <LightComponent range="40" lightcolor="30,180,80,255" powerconsumption="10" IsOn="true" pulseamount="0.5" pulsefrequency="0.5" allowingameediting="false">
             <LightTexture texture="Content/Lights/light_fluorescent_L2.png" origin="0.65,0.2" size="1.0,0.5" />
             <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" Interval="0.1" IsOn="true" setvalue="true" comparison="Or">
               <RequiredItem items="antibiotics" type="Contained" />
@@ -119,9 +119,9 @@
           <Conditional condition="lt 100" />
         </StatusEffect>
       </Wearable>
-      <ItemContainer capacity="1" maxstacksize="1" containedstateindicatorstyle="syringe">
+      <ItemContainer capacity="1" maxstacksize="2" containedstateindicatorstyle="syringe">
         <SlotIcon slotindex="0" texture="Content/Items/InventoryIconAtlas.png" sourcerect="576,704,64,64" origin="0.5,0.5" />
-        <Containable items="antibiotics" />
+        <Containable items="antibiotics,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
         <StatusEffect type="OnWearing" target="Character,Contained" comparison="and" playsoundonrequireditemfailure="true">
           <RequiredItem items="antibiotics" type="Contained" matchonempty="true" />
           <Conditional huskinfection="gt 75" />
@@ -142,7 +142,7 @@
       <sprite texture="Content/Map/Outposts/Art/AdminResidentAssets.png" sourcerect="771,0,54,98" depth="0.6" premultiplyalpha="false" origin="0.5,0.5" />
       <Body width="54" height="95" density="8" />
       <Price baseprice="500" canbespecial="false" sold="false">
-        <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="1" sold="true">
+        <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="1" sold="true">
           <Reputation faction="huskcult" min="70" />
         </Price>
       </Price>
@@ -171,8 +171,8 @@
           <Conditional condition="gt 0" />
         </StatusEffect>
       </Holdable>
-      <ItemContainer capacity="1" maxstacksize="1" hideitems="true" drawinventory="false" canbeselected="false" canbecombined="false" removecontaineditemsondeconstruct="true">
-        <Containable items="huskeggsbasic,huskeggs,calyxanide" />
+      <ItemContainer capacity="1" maxstacksize="2" hideitems="true" drawinventory="false" canbeselected="false" canbecombined="false" removecontaineditemsondeconstruct="true">
+        <Containable items="huskeggsbasic,huskeggs,calyxanide,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
   </Items>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Factions/soldier_gear.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Factions/soldier_gear.xml
index 82cf11e7..00613e8d 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Factions/soldier_gear.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Factions/soldier_gear.xml	
@@ -2,16 +2,16 @@
 <Items>
   <Override>
     <Item name="Revolver (Broken)" identifier="revolverbroken" category="Weapon" cargocontaineridentifier="metalcrate" hideconditionbar="true" spritecolor="240,180,140,255" InventoryIconColor="240,180,140,255" tags="smallitem,weapon,gun,pistolitem,provocativetohumanai,gunsmith,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-      <PreferredContainer secondary="outpostsecarmcab" amount="0" spawnprobability="0.0" />
-      <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="0" spawnprobability="0.0" />
+      <PreferredContainer secondary="outpostsecarmcab" amount="0" spawnprobability="0" />
+      <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="0" spawnprobability="0" />
       <PreferredContainer primary="secarmcab" secondary="armcab,weaponholder" />
       <Price baseprice="15" canbespecial="false" sold="false">
-        <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-        <Price storeidentifier="merchantcity" multiplier="1.25" />
-        <Price storeidentifier="merchantresearch" multiplier="1.25" />
-        <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-        <Price storeidentifier="merchantmine" multiplier="1.25" />
-        <Price storeidentifier="merchantarmory" multiplier="0.9" />
+        <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+        <Price storeidentifier="merchantcity" multiplier="3.75" />
+        <Price storeidentifier="merchantresearch" multiplier="3.75" />
+        <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+        <Price storeidentifier="merchantmine" multiplier="3.75" />
+        <Price storeidentifier="merchantarmory" multiplier="2.7" />
       </Price>
       <Deconstruct time="10" chooserandom="true" amount="1">
         <Item identifier="steel" />
@@ -39,9 +39,9 @@
         <RequiredItems items="revolverammo" type="Contained" msg="ItemMsgAmmoRequired" />
         <RequiredSkill identifier="weapons" level="40" />
       </RangedWeapon>
-      <ItemContainer capacity="1" maxstacksize="6" hideitems="true" containedstateindicatorstyle="bullet">
+      <ItemContainer capacity="1" maxstacksize="12" hideitems="true" containedstateindicatorstyle="bullet">
         <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
-        <Containable items="revolverammo" />
+        <Containable items="revolverammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <aitarget sightrange="2000" soundrange="5000" fadeouttime="5" />
       <Quality>
@@ -56,12 +56,12 @@
       <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="0" spawnprobability="0" />
       <PreferredContainer secondary="armcab,weaponholder" />
       <Price baseprice="39" minleveldifficulty="30" canbespecial="false" sold="false">
-        <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-        <Price storeidentifier="merchantcity" multiplier="1.25" />
-        <Price storeidentifier="merchantresearch" multiplier="1.25" />
-        <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-        <Price storeidentifier="merchantmine" multiplier="1.25" />
-        <Price storeidentifier="merchantarmory" multiplier="0.9" />
+        <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+        <Price storeidentifier="merchantcity" multiplier="3.75" />
+        <Price storeidentifier="merchantresearch" multiplier="3.75" />
+        <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+        <Price storeidentifier="merchantmine" multiplier="3.75" />
+        <Price storeidentifier="merchantarmory" multiplier="2.7" />
       </Price>
       <Deconstruct time="10" chooserandom="true" amount="1">
         <Item identifier="plastic" />
@@ -99,12 +99,12 @@
         <RequiredItems items="smgammo" type="Contained" msg="ItemMsgAmmoRequired" />
         <RequiredSkill identifier="weapons" level="50" />
       </RangedWeapon>
-      <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
-        <Containable items="smgammo" hide="false" itempos="4,-10" rotation="-30" />
+      <ItemContainer capacity="1" maxstacksize="2" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+        <Containable items="smgammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="4,-10" rotation="-30" />
         <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
         <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-        <SubContainer capacity="1" maxstacksize="1">
-          <Containable items="flashlight" hide="false" itempos="22,-1" setactive="true" />
+        <SubContainer capacity="1" maxstacksize="2">
+          <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="22,-1" setactive="true" />
         </SubContainer>
       </ItemContainer>
       <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
@@ -121,12 +121,12 @@
       <PreferredContainer secondary="wreckweaponholder" amount="0" spawnprobability="0" />
       <PreferredContainer secondary="armcab" />
       <Price baseprice="50" minleveldifficulty="30" canbespecial="false" sold="false">
-        <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-        <Price storeidentifier="merchantcity" multiplier="1.25" />
-        <Price storeidentifier="merchantresearch" multiplier="1.25" />
-        <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-        <Price storeidentifier="merchantmine" multiplier="1.25" />
-        <Price storeidentifier="merchantarmory" multiplier="0.9" />
+        <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+        <Price storeidentifier="merchantcity" multiplier="3.75" />
+        <Price storeidentifier="merchantresearch" multiplier="3.75" />
+        <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+        <Price storeidentifier="merchantmine" multiplier="3.75" />
+        <Price storeidentifier="merchantarmory" multiplier="2.7" />
       </Price>
       <Deconstruct time="10" chooserandom="true" amount="1">
         <Item identifier="titanium" />
@@ -164,12 +164,12 @@
         <RequiredItems items="shotgunammo" type="Contained" msg="ItemMsgAmmoRequired" />
         <RequiredSkill identifier="weapons" level="50" />
       </RangedWeapon>
-      <ItemContainer capacity="1" maxstacksize="6" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
-        <Containable items="shotgunammo" hide="true" />
+      <ItemContainer capacity="1" maxstacksize="12" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+        <Containable items="shotgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="true" />
         <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
         <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-        <SubContainer capacity="1" maxstacksize="1">
-          <Containable items="flashlight" hide="false" itempos="26,-3" setactive="true" />
+        <SubContainer capacity="1" maxstacksize="2">
+          <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="26,-3" setactive="true" />
         </SubContainer>
       </ItemContainer>
       <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
@@ -182,11 +182,11 @@
     <Item name="Assault Rifle (Broken)" identifier="assaultriflebroken" hideconditionbar="true" spritecolor="240,180,140,255" InventoryIconColor="240,180,140,255" category="Weapon" cargocontaineridentifier="metalcrate" allowasextracargo="true" tags="mediumitem,weapon,gun,gunsmith,mountableweapon,provocativetohumanai" Scale="0.5" impactsoundtag="impact_metal_light">
       <PreferredContainer primary="secarmcab" secondary="armcab,weaponholder" />
       <Price baseprice="72" canbespecial="false" sold="false">
-        <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-        <Price storeidentifier="merchantcity" multiplier="1.25" />
-        <Price storeidentifier="merchantresearch" multiplier="1.25" />
-        <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-        <Price storeidentifier="merchantmine" multiplier="1.25" />
+        <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+        <Price storeidentifier="merchantcity" multiplier="3.75" />
+        <Price storeidentifier="merchantresearch" multiplier="3.75" />
+        <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+        <Price storeidentifier="merchantmine" multiplier="3.75" />
       </Price>
       <Deconstruct time="35" chooserandom="true" amount="2">
         <Item identifier="physicorium" />
@@ -227,12 +227,12 @@
         <RequiredItems items="assaultriflemagazine" type="Contained" msg="ItemMsgAmmoRequired" />
         <RequiredSkill identifier="weapons" level="50" />
       </RangedWeapon>
-      <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
-        <Containable items="assaultrifleammo" itempos="4,-12" />
+      <ItemContainer capacity="1" maxstacksize="2" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+        <Containable items="assaultrifleammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" itempos="4,-12" />
         <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
         <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-        <SubContainer capacity="1" maxstacksize="1">
-          <Containable items="flashlight" hide="false" itempos="24,4" setactive="true" />
+        <SubContainer capacity="1" maxstacksize="2">
+          <Containable items="flashlight,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="24,4" setactive="true" />
         </SubContainer>
       </ItemContainer>
       <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
@@ -247,12 +247,12 @@
       <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="0" spawnprobability="0" />
       <PreferredContainer secondary="armcab,weaponholder" />
       <Price baseprice="20" minleveldifficulty="15" canbespecial="false" sold="false">
-        <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-        <Price storeidentifier="merchantcity" multiplier="1.25" />
-        <Price storeidentifier="merchantresearch" multiplier="1.25" />
-        <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-        <Price storeidentifier="merchantmine" multiplier="1.25" />
-        <Price storeidentifier="merchantarmory" multiplier="0.9" />
+        <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+        <Price storeidentifier="merchantcity" multiplier="3.75" />
+        <Price storeidentifier="merchantresearch" multiplier="3.75" />
+        <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+        <Price storeidentifier="merchantmine" multiplier="3.75" />
+        <Price storeidentifier="merchantarmory" multiplier="2.7" />
       </Price>
       <Deconstruct time="10" chooserandom="true" amount="1">
         <Item identifier="steel" />
@@ -286,9 +286,9 @@
         <RequiredItems items="smgammo" type="Contained" msg="ItemMsgAmmoRequired" />
         <RequiredSkill identifier="weapons" level="50" />
       </RangedWeapon>
-      <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+      <ItemContainer capacity="1" maxstacksize="2" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
         <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
-        <Containable items="smgammo" hide="false" itempos="3,-5" rotation="-5" />
+        <Containable items="smgammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="false" itempos="3,-5" rotation="-5" />
       </ItemContainer>
       <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
       <Quality>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Gardening/growableplants.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Gardening/growableplants.xml
index 43081914..874f9d25 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Gardening/growableplants.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Gardening/growableplants.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <!-- Those seeds are only used for decoration in hydroponics modules -->
-  <Item name="Outpost Pomegrenade seed" identifier="creepingorangevineseedoutpost" description="For decorative purposes only. Doesnt produce fruit" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="255,54,0,255">
+  <Item name="Outpost Pomegrenade seed" identifier="creepingorangevineseedoutpost" description="For decorative purposes only. Doesnt produce fruit" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="255,54,0,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="830,636,31,30" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -36,7 +36,7 @@
     <Body radius="15" density="10.1" />
     <Holdable canBeCombined="false" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
   </Item>
-  <Item name="Outpost tobacco seed" identifier="tobaccovineseedoutpost" description="For decorative purposes only. Doesnt produce fruit" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="48,122,245,255">
+  <Item name="Outpost tobacco seed" identifier="tobaccovineseedoutpost" description="For decorative purposes only. Doesnt produce fruit" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="48,122,245,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="863,636,30,31" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -70,7 +70,7 @@
     <Body radius="15" density="10.1" />
     <Holdable canBeCombined="false" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
   </Item>
-  <Item name="Outpost salt vine seed" identifier="saltvineseedoutpost" description="For decorative purposes only. Doesnt produce fruit" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
+  <Item name="Outpost salt vine seed" identifier="saltvineseedoutpost" description="For decorative purposes only. Doesnt produce fruit" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="829,666,33,35" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -104,7 +104,7 @@
     <Body radius="15" density="10.1" />
     <Holdable canBeCombined="false" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
   </Item>
-  <Item name="Outpost raptor bane seed" identifier="raptorbaneseedoutpost" description="For decorative purposes only. Doesnt produce fruit" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="238,36,98,255">
+  <Item name="Outpost raptor bane seed" identifier="raptorbaneseedoutpost" description="For decorative purposes only. Doesnt produce fruit" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="238,36,98,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="863,668,30,33" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -139,7 +139,7 @@
     <Body radius="15" density="10.1" />
     <Holdable canBeCombined="false" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
   </Item>
-  <Item name="Outpost banana seed" identifier="bananaoutpost" description="For decorative purposes only. Doesnt produce fruit" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
+  <Item name="Outpost banana seed" identifier="bananaoutpost" description="For decorative purposes only. Doesnt produce fruit" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="16" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="263,193,38,39" depth="0.2" origin="0.5,0.5" />
     <Growable growthspeed="100" maxhealth="100000" pickingtime="3" maximumvines="18" hardiness="0" floodtolerance="0" seedrate="0" productrate="0" flowerquantity="4" baseflowerscale="0.60" vinescale="0.25" vinetint="55,152,27,255" flowertint="139,56,87,255">
       <ProducedItem identifier="banana" probability="0.0" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Materials/materials.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Materials/materials.xml
index 7f9ff7f5..1a3476bf 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Materials/materials.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Materials/materials.xml	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="Rubber Duck" identifier="rubberduck" category="Material" maxstacksize="8" Tags="toy,smallitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
+  <Item name="Rubber Duck" identifier="rubberduck" category="Material" maxstacksize="16" Tags="toy,smallitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
     <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="0,768,37,35" depth="0.55" origin="0.5,0.5" />
     <Body width="5" radius="15" density="0.75" />
     <Deconstruct time="10">
@@ -20,7 +20,7 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="Rubber Duck" identifier="piraterubberduck" category="Material" maxstacksize="8" Tags="toy,smallitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
+  <Item name="Rubber Duck" identifier="piraterubberduck" category="Material" maxstacksize="16" Tags="toy,smallitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
     <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="38,763,37,40" depth="0.55" origin="0.5,0.5" />
     <Body width="5" radius="15" density="0.75" />
     <Deconstruct time="10">
@@ -40,7 +40,7 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="Big Rubber Duck" identifier="bigrubberduck" category="Material" maxstacksize="8" Tags="toy,mediumitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
+  <Item name="Big Rubber Duck" identifier="bigrubberduck" category="Material" maxstacksize="16" Tags="toy,mediumitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
     <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="0,804,107,102" depth="0.55" origin="0.5,0.5" />
     <Body width="20" radius="45" density="0.6" />
     <Deconstruct time="10">
@@ -60,7 +60,7 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="Big Rubber Duck" identifier="bigpiraterubberduck" category="Material" maxstacksize="8" Tags="toy,mediumitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
+  <Item name="Big Rubber Duck" identifier="bigpiraterubberduck" category="Material" maxstacksize="16" Tags="toy,mediumitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
     <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="0,907,107,116" depth="0.55" origin="0.5,0.5" />
     <Body width="20" radius="45" density="0.6" />
     <Deconstruct time="10">
@@ -80,7 +80,7 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="Giant Rubber Duck" identifier="giantrubberduck" category="Material" maxstacksize="8" Tags="toy,largeitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
+  <Item name="Giant Rubber Duck" identifier="giantrubberduck" category="Material" maxstacksize="16" Tags="toy,largeitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
     <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="108,733,303,290" depth="0.55" origin="0.5,0.5" />
     <Body width="50" radius="138" density="0.3" />
     <Deconstruct time="10">
@@ -100,7 +100,7 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="Giant Rubber Duck" identifier="giantpiraterubberduck" category="Material" maxstacksize="8" Tags="toy,largeitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
+  <Item name="Giant Rubber Duck" identifier="giantpiraterubberduck" category="Material" maxstacksize="16" Tags="toy,largeitem" canbepicked="true" scale="0.5" impactsoundtag="impact_rubberduck">
     <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="412,694,303,329" depth="0.55" origin="0.5,0.5" />
     <Body width="50" radius="138" density="0.3" />
     <Deconstruct time="10">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Materials/minerals.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Materials/minerals.xml
index 05b18522..8194b5b5 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Materials/minerals.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Materials/minerals.xml	
@@ -10,10 +10,10 @@
         </StatusEffect>
         <StatusEffect type="OnActive" target="NearbyItems" targettags="junctionbox" range="3000.0" setvalue="true" stackable="false" duration="1" interval="1" extraload="500" />
       </TriggerComponent>
-      <LightComponent lightcolor="178,196,207,255" range="2000.0" powerconsumption="0" flicker="0.2" flickerspeed="0.5" pulsefrequency="0.2" pulseamount="0.8" ison="true" drawbehindsubs="true">
+      <LightComponent lightcolor="178,196,207,255" range="8000" powerconsumption="0" flicker="0.2" flickerspeed="0.5" pulsefrequency="0.2" pulseamount="0.8" ison="true" drawbehindsubs="true">
         <IsActive targetitemcomponent="TriggerComponent" triggeractive="true" />
       </LightComponent>
-      <LightComponent lightcolor="178,196,207,255" range="2000.0" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0.2" ison="true" drawbehindsubs="true">
+      <LightComponent lightcolor="178,196,207,255" range="8000" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0.2" ison="true" drawbehindsubs="true">
         <IsActive targetitemcomponent="TriggerComponent" triggeractive="true" />
         <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
       </LightComponent>
@@ -73,7 +73,7 @@
   </Override>
   <Item name="Piezo Crystal (Wired)" identifier="piezocrystalPA" category="Material" Tags="" canbepicked="false" description="" scale="0.5" sonarsize="30" health="100" damagedbyexplosions="false" damagedbyprojectiles="false" damagedbymeleeweapons="false" damagedbyrepairtools="false">
     <Sprite texture="Content/Items/Materials/Crystal.png" depth="1.0" sourcerect="0,4,1024,1020" origin="0.5,0.6" />
-    <LightComponent lightcolor="178,196,207,255" range="4000.0" powerconsumption="0" flicker="0.2" flickerspeed="0.5" pulsefrequency="0.2" pulseamount="0.8" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="178,196,207,255" range="16000" powerconsumption="0" flicker="0.2" flickerspeed="0.5" pulsefrequency="0.2" pulseamount="0.8" ison="true" drawbehindsubs="true">
       <StatusEffect type="OnBroken" target="This" disabledeltatime="true">
         <particleemitter particle="iceshards" particleamount="200" velocitymin="100" velocitymax="3000" anglemin="0" anglemax="360" scalemin="0.5" scalemax="3.0" />
         <Explosion range="1000.0" ballastfloradamage="1000" structuredamage="600" itemdamage="1000" force="50.0" severlimbsprobability="1.5" decal="explosion" decalsize="1.0" camerashake="500" camerashakerange="50000" flashrange="10000" flashduration="5.0" screencolor="255,255,255,255" screencolorrange="5000" screencolorduration="3.0">
@@ -84,7 +84,7 @@
         <RemoveItem />
       </StatusEffect>
     </LightComponent>
-    <LightComponent lightcolor="178,196,207,255" range="4000.0" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="1.0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="178,196,207,255" range="16000" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="1.0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ElectricalDischarger duration="0.2" outdoorsonly="true" powerconsumption="0" range="3500" rangemultiplierinwalls="1">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Misc/misc.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Misc/misc.xml
index b81d983b..4c94de32 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Misc/misc.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Misc/misc.xml	
@@ -10,8 +10,8 @@
           <Use />
         </Statuseffect>
       </Controller>
-      <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="1" itempos="40,-40" containedspritedepth="0.831" canbeselected="True" autointeractwithcontained="true" msg="">
-        <Containable items="smallitem,mediumitem,bigitem,crate" />
+      <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="1" itempos="40,-40" containedspritedepth="0.831" canbeselected="True" autointeractwithcontained="true" msg="">
+        <Containable items="smallitem,mediumitem,bigitem,crate,ammobox,deepdiving,largeitem" />
         <!-- makes itself invisible + you can't see inside inventory on startup. Needed to make this useable in subeditor -->
         <Statuseffect type="Always" target="This" oneshot="true" spritecolor="0,0,0,0" drawinventory="false" setvalue="True" />
         <!-- makes the item delete itself IF ACTUALLY EMPTY, not just when interacting with it. Needed to prevent items from being deleted if inventory is full -->
@@ -25,10 +25,10 @@
       <sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="861,330,162,219" depth="0.855" premultiplyalpha="false" origin="0.5,0.5" />
     </Item>
     <!-- Pre-placed in cave modules and unlocked and randomized by an event. Spawns a random mineral when mined. -->
-    <Item name="Mineral Deposit" identifier="mineralspawner" category="Material" Tags="smallitem,ore,mineralspawner" maxstacksize="1" description="used in rock cave to spawn mineral" scale="0.5" spritecolor="255,255,255,255" damagedbyrepairtools="true" damagedbyprojectiles="true" health="50" noninteractable="false">
+    <Item name="Mineral Deposit" identifier="mineralspawner" category="Material" Tags="smallitem,ore,mineralspawner" maxstacksize="2" description="used in rock cave to spawn mineral" scale="0.5" spritecolor="255,255,255,255" damagedbyrepairtools="true" damagedbyprojectiles="true" health="50" noninteractable="false">
       <Upgrade gameversion="2.0.0.0" noninteractable="false" />
       <Body radius="40" width="20" density="25" />
-      <LightComponent lightcolor="255,255,180,120" range="50" ison="true" castshadows="false" drawbehindsubs="false">
+      <LightComponent lightcolor="255,255,180,120" range="200" ison="true" castshadows="false" drawbehindsubs="false">
         <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
       </LightComponent>
       <Sprite texture="Content/Items/Materials/Minerals.png" depth="0.711" sourcerect="810,893,173,131" origin="0.5,0.5" />
@@ -83,11 +83,11 @@
       </ItemComponent>
     </Item>
     <!-- Pre-placed in pools of water or flooded cave modules and unlocked and randomized by an event. Gives plantclusterresearched when researched. "unidentifiedgeneticmaterial" tag is used to be able to place it in the research station without having to create an override for that. -->
-    <Item name="Plant Cluster" identifier="plantcluster" category="Material" Tags="mediumitem,plantspawner,unidentifiedgeneticmaterial" maxstacksize="8" description="A cluster of entangled plants. It might be possible to untangle them when stabilizing them with stabilozine at a research table." scale="0.5" spritecolor="255,255,255,255" noninteractable="false" allowstealingalways="true">
+    <Item name="Plant Cluster" identifier="plantcluster" category="Material" Tags="mediumitem,plantspawner,unidentifiedgeneticmaterial" maxstacksize="16" description="A cluster of entangled plants. It might be possible to untangle them when stabilizing them with stabilozine at a research table." scale="0.5" spritecolor="255,255,255,255" noninteractable="false" allowstealingalways="true">
       <Upgrade gameversion="2.0.0.0" noninteractable="false" />
       <Body radius="30" width="20" density="10.5" />
       <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" depth="0.71" sourcerect="130,139,108,118" origin="0.5,0.5" />
-      <LightComponent lightcolor="255,255,180,120" range="50" ison="true" castshadows="false" drawbehindsubs="false">
+      <LightComponent lightcolor="255,255,180,120" range="200" ison="true" castshadows="false" drawbehindsubs="false">
         <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
       </LightComponent>
       <Deconstruct time="3" requireddeconstructor="deconstructor" />
@@ -105,7 +105,7 @@
       </Holdable>
     </Item>
     <!-- Gives random medical plants when "untagled". "unidentifiedgeneticmaterial" tag is used to be able to place it in the research station without having to create an override for that. -->
-    <Item hideinmenus="true" name="Stabilized Plant Cluster" identifier="plantclusterresearched" category="Material" Tags="mediumitem,plantspawner,unidentifiedgeneticmaterial" maxstacksize="8" description="A cluster of entangled plants. It has been stabilized and can be untangled without harming all of the plants." scale="0.5" spritecolor="255,255,255,255">
+    <Item hideinmenus="true" name="Stabilized Plant Cluster" identifier="plantclusterresearched" category="Material" Tags="mediumitem,plantspawner,unidentifiedgeneticmaterial" maxstacksize="16" description="A cluster of entangled plants. It has been stabilized and can be untangled without harming all of the plants." scale="0.5" spritecolor="255,255,255,255">
       <Body radius="30" width="20" density="10.5" />
       <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" depth="0.71" sourcerect="130,139,108,118" origin="0.5,0.5" />
       <Deconstruct time="3" requireddeconstructor="deconstructor" />
@@ -156,7 +156,7 @@
       </CustomInterface>
     </Item>
     <!-- Pressure Stabilizer for Outpost Security | Non-Player-Team-Interactable -->
-    <Item name="Biometrically Locked Pressure Stabilizer" identifier="pressurestabilizersecurity" category="Hidden" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="" allowasextracargo="false" description="" scale="0.5" impactsoundtag="impact_metal_light" nonplayerteaminteractable="true" hideinmenus="true">
+    <Item name="Biometrically Locked Pressure Stabilizer" identifier="pressurestabilizersecurity" category="Hidden" maxstacksize="64" maxstacksizecharacterinventory="16" Tags="" allowasextracargo="false" description="" scale="0.5" impactsoundtag="impact_metal_light" nonplayerteaminteractable="true" hideinmenus="true">
       <InventoryIcon texture="Content/Items/Genetic/Genetic.png" sourcerect="244,62,76,65" origin="0.5,0.5" />
       <Sprite texture="Content/Items/Genetic/Genetic.png" depth="0.6" sourcerect="67,85,73,35" origin="0.5,0.5" />
       <Body radius="15" width="45" density="25" />
@@ -173,9 +173,9 @@
       </Wearable>
     </Item>
     <Item name="Clown Delivery System" identifier="railgunshellclown" tags="railgunequipment,railgunammo" showcontentsintooltip="true" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
-      <PreferredContainer secondary="wreckrailgunammocontainer" amount="1" spawnprobability="0.01" />
+      <PreferredContainer secondary="wreckrailgunammocontainer" amount="2" spawnprobability="0.02" />
       <Price baseprice="500">
-        <Price storeidentifier="merchantclown" multiplier="1" minavailable="3" sold="true" />
+        <Price storeidentifier="merchantclown" multiplier="3" minavailable="9" sold="true" />
       </Price>
       <Deconstruct time="10">
         <Item identifier="dementonite" />
@@ -219,10 +219,10 @@
           <Remove />
         </StatusEffect>
       </Projectile>
-      <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedspritedepth="0.81">
+      <ItemContainer hideitems="true" capacity="1" maxstacksize="2" canbeselected="false" containedspritedepth="0.81">
         <SlotIcon slotindex="0" texture="Content/Map/Outposts/Art/GenericAssets2.png" sourcerect="1489,287,205,181" />
         <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
-        <Containable items="clowngear,clowns" />
+        <Containable items="clowngear,clowns,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <Controller UserPos="0,-20" direction="Right" canbeselected="true" AllowSelectingWhenSelectedByBot="false" AllowSelectingWhenSelectedByOther="false" selectkey="Use" drawuserbehind="true" forceusertostayattached="true" msg="itemmsggoinside">
         <RequiredItem items="clowngear" type="Picked" CharacterInventorySlotType="InnerClothes" />
@@ -236,14 +236,14 @@
         <limbposition limb="RightFoot" position="74,-40" />
         <limbposition limb="LeftFoot" position="74,-40" />
         <StatusEffect type="OnActive" targettype="Character" delay="0.25" stackable="true" indetectable="true" DisableFocusingOnEntities="true" invisibletimer="0.1" IgnoreMeleeWeapons="true" PressureProtection="6500.0" oxygenavailable="1000" setvalue="true" />
-        <LightComponent range="10" castshadows="false" PowerConsumption="0" lightcolor="150,0,0,0" blinkfrequency="1" AllowInGameEditing="false" IsOn="true">
+        <LightComponent range="40" castshadows="false" PowerConsumption="0" lightcolor="150,0,0,0" blinkfrequency="1" AllowInGameEditing="false" IsOn="true">
           <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="817,809,108,31" origin="-0.42,0.5" alpha="1" />
           <IsActiveConditional IsContained="false" />
         </LightComponent>
       </Controller>
     </Item>
     <!-- Overriding vanilla beers to remove them from the mod - they're unfinished and worse than Hungry Europan drinks -->
-    <Item name="" nameidentifier="beerbottle" identifier="beerbottle1" category="Medical,Misc" maxstacksize="8" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <Item name="" nameidentifier="beerbottle" identifier="beerbottle1" category="Medical,Misc" maxstacksize="16" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
       <Sprite texture="Content/Map/Outposts/Art/AdminResidentAssets.png" sourcerect="835,0,20,63" depth="0.6" origin="0.5,0.5" />
       <SuitableTreatment type="psychosis" suitability="12" />
       <Body width="20" height="63" density="20" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Misc/musicitems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Misc/musicitems.xml
index d31ae657..5da0efb5 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Misc/musicitems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Misc/musicitems.xml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
   <Items>
-    <Item name="Music Player" description="Music Player" identifier="raverplayer" category="Electrical" Tags="largeitem,musicplayer" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+    <Item name="Music Player" description="Music Player" identifier="raverplayer" category="Electrical" Tags="largeitem,musicplayer" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
       <PreferredContainer primary="crewcab" secondary="engcab" />
-      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="0" spawnprobability="0.00" />
+      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="0" spawnprobability="0" />
       <Deconstruct time="10">
         <Item identifier="fpgacircuit" />
       </Deconstruct>
@@ -79,10 +79,10 @@
           <StatusEffect type="OnUse" target="This" ManuallySelectedSound="0" setvalue="true" disabledeltatime="true" />
         </Button>
       </CustomInterface>
-      <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="0,0" iteminterval="0,0" itemrotation="0" canbeselected="true" containedspritedepth="0.79" msg="ItemMsgInteractSelect" autofill="True">
+      <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="6" itempos="0,0" iteminterval="0,0" itemrotation="0" canbeselected="true" containedspritedepth="0.79" msg="ItemMsgInteractSelect" autofill="True">
         <GuiFrame relativesize="0.1,0.15" anchor="Center" style="ItemUI" />
         <!-- uses a fuckton of different tags for mod compatibility -->
-        <Containable items="sound,music,song,cassette-playernotes" />
+        <Containable items="sound,music,song,cassette-playernotes,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
         <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -91,7 +91,7 @@
         <input name="set_state" displayname="connection.setstate" />
       </ConnectionPanel>
     </Item>
-    <Item name="Decorative Speaker" description="Speaker with animation when active" identifier="decospeaker" category="Electrical" Tags="" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" nonplayerteaminteractable="true">
+    <Item name="Decorative Speaker" description="Speaker with animation when active" identifier="decospeaker" category="Electrical" Tags="" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" nonplayerteaminteractable="true">
       <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" depth="0.8" sourcerect="147,0,102,138" origin="0.5,0.5" />
       <InventoryIcon texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="250,0,88,88" origin="0.5,0.5" />
       <DecorativeSprite name="shaking" texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" depth="0.799" sourcerect="147,0,102,138" origin="0.5,0.5" offset="10,10" offsetanim="Noise" offsetanimspeed="10.0">
@@ -121,7 +121,7 @@
         <input name="set_state" displayname="connection.setstate" />
       </ConnectionPanel>
     </Item>
-    <Item name="Outpost Music Player" description="Hidden Music Player for outpost modules" identifier="raverplayeroutpost" category="Electrical" Tags="outpostmusicplayer" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" spritecolor="255,0,0,255" noninteractable="true" hiddeningame="true">
+    <Item name="Outpost Music Player" description="Hidden Music Player for outpost modules" identifier="raverplayeroutpost" category="Electrical" Tags="outpostmusicplayer" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" spritecolor="255,0,0,255" noninteractable="true" hiddeningame="true">
       <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" depth="0.8" sourcerect="147,0,102,138" origin="0.5,0.5" />
       <InventoryIcon texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="250,0,88,88" origin="0.5,0.5" />
       <LightComponent allowingameediting="false" canbeselected="false" lightcolor="0,0,0,0" castshadows="false" range="0">
@@ -130,9 +130,9 @@
           <Conditional targetcontaineditem="true" condition="gt 0" />
         </StatusEffect>
       </LightComponent>
-      <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="0,0" iteminterval="0,0" itemrotation="0" canbeselected="true" containedspritedepth="0.79" msg="ItemMsgInteractSelect" autofill="true">
+      <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="6" itempos="0,0" iteminterval="0,0" itemrotation="0" canbeselected="true" containedspritedepth="0.79" msg="ItemMsgInteractSelect" autofill="true">
         <!-- uses a fuckton of different tags for mod compatibility -->
-        <Containable items="sound,music,song,cassette-playernotes" />
+        <Containable items="sound,music,song,cassette-playernotes,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </ItemContainer>
       <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
         <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -141,9 +141,9 @@
         <input name="set_state" displayname="connection.setstate" />
       </ConnectionPanel>
     </Item>
-    <Item name="Portable Music Player" description="A portable music player capable of playing cassettes and CDs. Keep away from water! Can be repaired with a screwdriver." identifier="portablemusicplayer" category="Electrical" Tags="mediumitem,musicplayer,short_range" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="4">
+    <Item name="Portable Music Player" description="A portable music player capable of playing cassettes and CDs. Keep away from water! Can be repaired with a screwdriver." identifier="portablemusicplayer" category="Electrical" Tags="mediumitem,musicplayer,short_range" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="4">
       <PreferredContainer primary="crewcab" secondary="engcab" />
-      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="0" spawnprobability="0.00" />
+      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="0" spawnprobability="0" />
       <Deconstruct time="10">
         <Item identifier="fpgacircuit" />
       </Deconstruct>
@@ -166,7 +166,7 @@
       <!-- add aimpos="0,25" to <Holdable> and remove <Throwable> if we want the player character to be able to put the item on their shoulder like the boombox in Sunken Tapes instead of being able to throw it -->
       <Holdable selectkey="Select" pickkey="Select" slots="RightHand,LeftHand" holdpos="10,-70" handle1="-10,40" handle2="10,40" holdangle="2" msg="ItemMsgDetachWrench" PickingTime="0.0" aimable="false" attachable="false" swingamount="10,5" swingspeed="5" swingwhenholding="false"></Holdable>
       <!-- <Throwable electkey="Select" pickkey="Select" slots="RightHand,LeftHand" holdpos="1,-70" handle1="-2,20" handle2="-2,20" holdangle="2" aimable="true" aimpos="-50,-20" throwforce="3.5" msg="ItemMsgPickUpSelect" /> -->
-      <LightComponent allowingameediting="false" canbeselected="false" lightcolor="150,255,150,150" castshadows="false" range="10" IsOn="false" PowerConsumption="1">
+      <LightComponent allowingameediting="false" canbeselected="false" lightcolor="150,255,150,150" castshadows="false" range="40" IsOn="false" PowerConsumption="1">
         <LightSprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" sourcerect="1,136,43,26" origin="0.5,0.7" />
         <StatusEffect type="OnActive" targettype="This,Contained">
           <Use />
@@ -220,12 +220,12 @@
           <StatusEffect type="OnUse" target="This" ManuallySelectedSound="0" setvalue="true" disabledeltatime="true" AllowWhenBroken="true" />
         </Button>
       </CustomInterface>
-      <ItemContainer canbeselected="true" selectkey="Action" hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="0,0" iteminterval="0,0" itemrotation="0" containedspritedepth="0.79" msg="ItemMsgInteractSelect" autofill="True">
+      <ItemContainer canbeselected="true" selectkey="Action" hideitems="true" drawinventory="true" capacity="1" maxstacksize="2" slotsperrow="6" itempos="0,0" iteminterval="0,0" itemrotation="0" containedspritedepth="0.79" msg="ItemMsgInteractSelect" autofill="True">
         <GuiFrame relativesize="0.1,0.15" anchor="Center" style="ItemUI" />
         <RequiredItem items="screwdriver" type="equipped" requireempty="true" />
         <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
         <!-- uses a fuckton of different tags for mod compatibility -->
-        <Containable items="sound,music,song,cassette-playernotes">
+        <Containable items="sound,music,song,cassette-playernotes,ammobox,deepdiving,smallitem,mediumitem,largeitem">
           <StatusEffect type="OnContaining" target="This" comparison="And">
             <Conditional IsOn="true" />
             <Conditional condition="lte 50" />
@@ -241,7 +241,7 @@
           </StatusEffect>
         </Containable>
         <SubContainer capacity="1">
-          <Containable items="mobilebattery">
+          <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
             <StatusEffect type="OnContaining" target="This" voltage="1" setvalue="true">
               <!-- <RequiredItem items="mobilebattery" type="Contained" /> -->
             </StatusEffect>
@@ -263,10 +263,10 @@
     <!-- ////////// MUSIC ////////// -->
     <!-- ////////// MUSIC ////////// -->
     <!-- ////////// MUSIC ////////// -->
-    <Item name="CD: Pirate Rave" identifier="cd_album_piraterave1" category="Electrical" Tags="smallitem,sound" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true" description="A CD featuring a variety of tracks often heard when dealing with pirates. \nTrack-List:\n1. Alien Syndicate (Re_]|M|[_ix) by _]|M|[_\n2. Abandon Ship by Simon Chylinski\n3. Scavenger Hunt Techno (EurocorpFx Remake) by EurocorpFx\n4. The Rebel Path by P.T. Adamczyk\n5. Contra la Luna by P.T. Adamczyk\n6. Cyborg by Full Kontakt">
+    <Item name="CD: Pirate Rave" identifier="cd_album_piraterave1" category="Electrical" Tags="smallitem,sound" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true" description="A CD featuring a variety of tracks often heard when dealing with pirates. \nTrack-List:\n1. Alien Syndicate (Re_]|M|[_ix) by _]|M|[_\n2. Abandon Ship by Simon Chylinski\n3. Scavenger Hunt Techno (EurocorpFx Remake) by EurocorpFx\n4. The Rebel Path by P.T. Adamczyk\n5. Contra la Luna by P.T. Adamczyk\n6. Cyborg by Full Kontakt">
       <PreferredContainer primary="crewcab" secondary="engcab" />
-      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="musicplayer" amount="1" spawnprobability="1" />
+      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="musicplayer" amount="2" spawnprobability="1" />
       <Deconstruct time="10">
         <Item identifier="plastic" />
       </Deconstruct>
@@ -382,10 +382,10 @@
         </StatusEffect>
       </Powered>
     </Item>
-    <Item name="CD: Subnautica OST" identifier="cd_album_subnautica" category="Electrical" Tags="smallitem,sound" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true" description="A CD featuring a some tracks from the Subnautica OST. \nTrack-List:\n1. Abandon Ship by Simon Chylinski\n2. Exosuit by Simon Chylinski\n3. Red Alert by Simon Chylinski\n4. Seamoth by Simon Chylinski">
+    <Item name="CD: Subnautica OST" identifier="cd_album_subnautica" category="Electrical" Tags="smallitem,sound" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true" description="A CD featuring a some tracks from the Subnautica OST. \nTrack-List:\n1. Abandon Ship by Simon Chylinski\n2. Exosuit by Simon Chylinski\n3. Red Alert by Simon Chylinski\n4. Seamoth by Simon Chylinski">
       <PreferredContainer primary="crewcab" secondary="engcab" />
-      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="musicplayer" amount="1" spawnprobability="1" />
+      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="musicplayer" amount="2" spawnprobability="1" />
       <Deconstruct time="10">
         <Item identifier="plastic" />
       </Deconstruct>
@@ -469,10 +469,10 @@
         </StatusEffect>
       </Powered>
     </Item>
-    <Item name="CD: GRIP OST" identifier="cd_album_grip" category="Electrical" Tags="smallitem,sound" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true" description="A CD featuring a some tracks from the GRIP OST. \nTrack-List:\n1. Clock Watch by Full Kontakt\n2. Cerbera by Imperium\n3. Cyborg by Full Kontakt\n4. Black Out by Full Kontakt">
+    <Item name="CD: GRIP OST" identifier="cd_album_grip" category="Electrical" Tags="smallitem,sound" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true" description="A CD featuring a some tracks from the GRIP OST. \nTrack-List:\n1. Clock Watch by Full Kontakt\n2. Cerbera by Imperium\n3. Cyborg by Full Kontakt\n4. Black Out by Full Kontakt">
       <PreferredContainer primary="crewcab" secondary="engcab" />
-      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="musicplayer" amount="1" spawnprobability="1" />
+      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="musicplayer" amount="2" spawnprobability="1" />
       <Deconstruct time="10">
         <Item identifier="plastic" />
       </Deconstruct>
@@ -556,10 +556,10 @@
         </StatusEffect>
       </Powered>
     </Item>
-    <Item name="CD: Forgive Me Father OST" identifier="cd_album_forgivemefather" category="Electrical" Tags="smallitem,sound" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true" description="A CD featuring a some tracks from the Forgive Me Father OST. \nTrack-List:\n1. Forgiveness Is Divine by Tim Fialka\n2. Good Time For You To Get Angry by Tim Fialka\n3. Big Ugly Fish Pt.1 by Tim Fialka\n4. Big Ugly Fish Pt.2 by Tim Fialka\n5. Rain And Pain by Tim Fialka\n6. Sweetie, Get Me Bazooka by Tim Fialka\n7. Welcome To Pestisville by Tim Fialka\n8. A Crow's Breakfast by Tim Fialka">
+    <Item name="CD: Forgive Me Father OST" identifier="cd_album_forgivemefather" category="Electrical" Tags="smallitem,sound" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true" description="A CD featuring a some tracks from the Forgive Me Father OST. \nTrack-List:\n1. Forgiveness Is Divine by Tim Fialka\n2. Good Time For You To Get Angry by Tim Fialka\n3. Big Ugly Fish Pt.1 by Tim Fialka\n4. Big Ugly Fish Pt.2 by Tim Fialka\n5. Rain And Pain by Tim Fialka\n6. Sweetie, Get Me Bazooka by Tim Fialka\n7. Welcome To Pestisville by Tim Fialka\n8. A Crow's Breakfast by Tim Fialka">
       <PreferredContainer primary="crewcab" secondary="engcab" />
-      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.01" />
-      <PreferredContainer secondary="musicplayer" amount="1" spawnprobability="1" />
+      <PreferredContainer secondary="wreckengcab,abandonedengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.02" />
+      <PreferredContainer secondary="musicplayer" amount="2" spawnprobability="1" />
       <Deconstruct time="10">
         <Item identifier="plastic" />
       </Deconstruct>
@@ -708,8 +708,8 @@
       </Powered>
     </Item>
     <!-- OUTPOST SONGS | Exclusive to outpost music players. Should not be obtainable. -->
-    <Item name="Outpost Song: Scavenger Hunt Techno (EurocorpFx Remake)" description="Scavenger Hunt Techno (EurocorpFx Remake) by EurocorpFx from Youtube (Link on modpage)" identifier="music_scavengerhunt_outpost" category="Electrical" Tags="smallitem,sound" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true">
-      <PreferredContainer primary="outpostmusicplayer" spawnprobability="1.0" />
+    <Item name="Outpost Song: Scavenger Hunt Techno (EurocorpFx Remake)" description="Scavenger Hunt Techno (EurocorpFx Remake) by EurocorpFx from Youtube (Link on modpage)" identifier="music_scavengerhunt_outpost" category="Electrical" Tags="smallitem,sound" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true">
+      <PreferredContainer primary="outpostmusicplayer" spawnprobability="1" />
       <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" depth="0.8" sourcerect="62,111,67,58" origin="0.5,0.5" />
       <Body width="65" height="56" density="15" />
       <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect" />
@@ -719,8 +719,8 @@
         </StatusEffect>
       </ItemComponent>
     </Item>
-    <Item name="Outpost Song: The Rebel Path" description="The Rebel Path by P.T. Adamczyk from Cyberpunk 2077 OST (Link on modpage)" identifier="music_rebelpath_outpost" category="Electrical" Tags="smallitem,sound" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true">
-      <PreferredContainer primary="outpostmusicplayer" spawnprobability="1.0" />
+    <Item name="Outpost Song: The Rebel Path" description="The Rebel Path by P.T. Adamczyk from Cyberpunk 2077 OST (Link on modpage)" identifier="music_rebelpath_outpost" category="Electrical" Tags="smallitem,sound" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true">
+      <PreferredContainer primary="outpostmusicplayer" spawnprobability="1" />
       <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" depth="0.8" sourcerect="62,111,67,58" origin="0.5,0.5" />
       <Body width="65" height="56" density="15" />
       <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect" />
@@ -730,8 +730,8 @@
         </StatusEffect>
       </ItemComponent>
     </Item>
-    <Item name="Outpost Song: Black Out" description="Black Out by Full Kontakt from GRIP: Combat Racing OST (Link on modpage)" identifier="music_blackout_outpost" category="Electrical" Tags="smallitem,sound" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true">
-      <PreferredContainer primary="outpostmusicplayer" spawnprobability="1.0" />
+    <Item name="Outpost Song: Black Out" description="Black Out by Full Kontakt from GRIP: Combat Racing OST (Link on modpage)" identifier="music_blackout_outpost" category="Electrical" Tags="smallitem,sound" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true">
+      <PreferredContainer primary="outpostmusicplayer" spawnprobability="1" />
       <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" depth="0.8" sourcerect="62,111,67,58" origin="0.5,0.5" />
       <Body width="65" height="56" density="15" />
       <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect" />
@@ -741,8 +741,8 @@
         </StatusEffect>
       </ItemComponent>
     </Item>
-    <Item name="Outpost Song: Contra la Luna" description="Contra la Luna by P.T. Adamczyk from Cyberpunk 2077 Phantom Liberty OST (Link on modpage)" identifier="music_contralaluna_outpost" category="Electrical" Tags="smallitem,sound" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true">
-      <PreferredContainer primary="outpostmusicplayer" spawnprobability="1.0" />
+    <Item name="Outpost Song: Contra la Luna" description="Contra la Luna by P.T. Adamczyk from Cyberpunk 2077 Phantom Liberty OST (Link on modpage)" identifier="music_contralaluna_outpost" category="Electrical" Tags="smallitem,sound" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true">
+      <PreferredContainer primary="outpostmusicplayer" spawnprobability="1" />
       <Sprite texture="%ModDir:2532991202%/Items/DE-ItemsAtlas.png" depth="0.8" sourcerect="62,111,67,58" origin="0.5,0.5" />
       <Body width="65" height="56" density="15" />
       <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect" />
@@ -755,7 +755,7 @@
     <!-- ////////// BACKWARDS COMPATIBILITY ////////// -->
     <!-- ////////// BACKWARDS COMPATIBILITY ////////// -->
     <!-- ////////// BACKWARDS COMPATIBILITY ////////// -->
-    <Item name="Song: Alien Syndicate (Re_]|M|[_ix)" description="Alien Syndicate (Re_]|M|[_ix) by _]|M|[_ (myself) made for this mod" identifier="music_aliensyndicateremix" category="Electrical" Tags="smallitem,sound" maxstacksize="1" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true">
+    <Item name="Song: Alien Syndicate (Re_]|M|[_ix)" description="Alien Syndicate (Re_]|M|[_ix) by _]|M|[_ (myself) made for this mod" identifier="music_aliensyndicateremix" category="Electrical" Tags="smallitem,sound" maxstacksize="2" cargocontaineridentifier="metalcrate" scale="0.3" impactsoundtag="impact_metal_light" isshootable="true">
       <Deconstruct time="10">
         <Item identifier="plastic" />
       </Deconstruct>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Pirates/PirateItems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Pirates/PirateItems.xml
index 19da185b..4d16c297 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Pirates/PirateItems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Pirates/PirateItems.xml	
@@ -2,15 +2,15 @@
 <Override>
   <Items>
     <Item name="" identifier="banditclothes1" nameidentifier="banditoutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-      <PreferredContainer primary="abandonedcrewcabinet" amount="1" spawnprobability="0.2" />
+      <PreferredContainer primary="abandonedcrewcabinet" amount="2" spawnprobability="0.4" />
       <PreferredContainer primary="crewcab" />
       <Price baseprice="75" sold="false">
         <Price storeidentifier="merchantoutpost" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantpirate" minavailable="1" maxavailable="6" sold="true">
+        <Price storeidentifier="merchantpirate" minavailable="3" maxavailable="6" sold="true">
           <Reputation faction="bandits" min="0" />
         </Price>
       </Price>
@@ -41,15 +41,15 @@
       </Wearable>
     </Item>
     <Item name="" identifier="banditclothes2" nameidentifier="banditoutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-      <PreferredContainer primary="abandonedcrewcabinet" amount="1" spawnprobability="0.2" />
+      <PreferredContainer primary="abandonedcrewcabinet" amount="2" spawnprobability="0.4" />
       <PreferredContainer primary="crewcab" />
       <Price baseprice="75" sold="false">
         <Price storeidentifier="merchantoutpost" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantpirate" minavailable="1" maxavailable="6" sold="true">
+        <Price storeidentifier="merchantpirate" minavailable="3" maxavailable="6" sold="true">
           <Reputation faction="bandits" min="0" />
         </Price>
       </Price>
@@ -79,21 +79,21 @@
         <damagemodifier armorsector="0.0,360.0" afflictionidentifiers="bitewounds, blunttrauma" damagemultiplier="0.9" />
       </Wearable>
     </Item>
-    <Item name="" identifier="dirtybomb" category="Weapon" Tags="smallitem,explosive,separatists" allowasextracargo="true" maxstacksize="8" Scale="0.5" impactsoundtag="impact_soft">
+    <Item name="" identifier="dirtybomb" category="Weapon" Tags="smallitem,explosive,separatists" allowasextracargo="true" maxstacksize="16" Scale="0.5" impactsoundtag="impact_soft">
       <PreferredContainer primary="secarmcab" secondary="armcab" />
       <Price baseprice="240" sold="false">
-        <Price storeidentifier="merchantoutpost" multiplier="1.25" minavailable="0" maxavailable="2" sold="true">
+        <Price storeidentifier="merchantoutpost" multiplier="3.75" minavailable="0" maxavailable="2" sold="true">
           <Reputation faction="separatists" min="50" />
         </Price>
-        <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" maxavailable="4" sold="true">
+        <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" maxavailable="4" sold="true">
           <Reputation faction="separatists" min="50" />
         </Price>
-        <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" maxavailable="8" sold="true">
+        <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" maxavailable="8" sold="true">
           <Reputation faction="separatists" min="50" />
         </Price>
-        <Price storeidentifier="merchantresearch" multiplier="1.25" />
+        <Price storeidentifier="merchantresearch" multiplier="3.75" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantpirate" multiplier="1.25" minavailable="0" maxavailable="2" sold="true">
+        <Price storeidentifier="merchantpirate" multiplier="3.75" minavailable="0" maxavailable="2" sold="true">
           <Reputation faction="bandits" min="10" />
         </Price>
       </Price>
@@ -147,7 +147,7 @@
       <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select" allowusewhenworn="true">
         <sprite name="Exosuit Helmet Wearable" texture="%ModDir:2532991202%/Items/Pirates/Exosuit.png" limb="Head" hidelimb="true" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hideotherwearables="true" hidewearablesoftype="" sourcerect="0,0,1,1" origin="0.5,0.5" />
         <sprite name="Exosuit Torso" texture="%ModDir:2532991202%/Items/Pirates/Exosuit.png" limb="Torso" scale="1.2" hidelimb="true" inherittexturescale="true" hideotherwearables="true" inheritorigin="false" origin="0.5,0.8" inheritlimbdepth="true" inheritsourcerect="false" sourcerect="167,1,203,193">
-          <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false" offset="-50,-50">
+          <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false" offset="-50,-50">
             <LightTexture texture="Content/Lights/divinghelmetlight.png" origin="0.05, 0.5" size="1.0,1.0" />
           </LightComponent>
         </sprite>
@@ -243,11 +243,11 @@
       <ItemContainer capacity="0" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0">
         <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="1,93,120,29" origin="0.5,0.45" />
         <SlotIcon slotindex="1" texture="Content/UI/ContainerIndicators.png" sourcerect="2,184,120,32" origin="0.5,0.5" />
-        <SubContainer capacity="1" maxstacksize="1">
-          <Containable items="oxygensource,weldingtoolfuel" />
+        <SubContainer capacity="1" maxstacksize="2">
+          <Containable items="oxygensource,weldingtoolfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
         </SubContainer>
-        <SubContainer capacity="1" maxstacksize="1">
-          <Containable items="mobilebattery">
+        <SubContainer capacity="1" maxstacksize="2">
+          <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
             <StatusEffect type="OnContaining" target="This" Voltage="1.0" setvalue="true" />
           </Containable>
         </SubContainer>
@@ -277,7 +277,7 @@
       <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select" allowusewhenworn="true">
         <sprite name="Exosuit Helmet Wearable" texture="%ModDir:2532991202%/Items/Pirates/Exosuit.png" limb="Head" hidelimb="true" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hideotherwearables="true" hidewearablesoftype="" sourcerect="0,0,1,1" origin="0.5,0.5" />
         <sprite name="Exosuit Torso" texture="%ModDir:2532991202%/Items/Pirates/Exosuit.png" limb="Torso" scale="1.2" hidelimb="true" inherittexturescale="true" hideotherwearables="true" inheritorigin="false" origin="0.5,0.8" inheritlimbdepth="true" inheritsourcerect="false" sourcerect="167,1,203,193">
-          <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false" offset="-50,-50">
+          <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false" offset="-50,-50">
             <LightTexture texture="Content/Lights/divinghelmetlight.png" origin="0.05, 0.5" size="1.0,1.0" />
           </LightComponent>
         </sprite>
@@ -371,21 +371,21 @@
       <ItemContainer capacity="0" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0">
         <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="1,93,120,29" origin="0.5,0.45" />
         <SlotIcon slotindex="1" texture="Content/UI/ContainerIndicators.png" sourcerect="2,184,120,32" origin="0.5,0.5" />
-        <SubContainer capacity="1" maxstacksize="1">
-          <Containable items="oxygensource,weldingtoolfuel" />
+        <SubContainer capacity="1" maxstacksize="2">
+          <Containable items="oxygensource,weldingtoolfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
         </SubContainer>
-        <SubContainer capacity="1" maxstacksize="1">
-          <Containable items="mobilebattery">
+        <SubContainer capacity="1" maxstacksize="2">
+          <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem">
             <StatusEffect type="OnContaining" target="This" Voltage="1.0" setvalue="true" />
           </Containable>
         </SubContainer>
-        <SubContainer capacity="10">
-          <Containable items="smallitem" />
+        <SubContainer capacity="22">
+          <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
         </SubContainer>
       </ItemContainer>
       <aitarget maxsightrange="1500" />
     </Item>
-    <Item name="Damaged Pirate Exosuit Parts" identifier="exosuitpartsPA" category="Misc,Material" maxstacksize="8" cargocontaineridentifier="metalcrate" description="Damaged parts from a modified pirate exosuit." Tags="mediumitem,material" scale="0.5" impactsoundtag="impact_metal_heavy">
+    <Item name="Damaged Pirate Exosuit Parts" identifier="exosuitpartsPA" category="Misc,Material" maxstacksize="16" cargocontaineridentifier="metalcrate" description="Damaged parts from a modified pirate exosuit." Tags="mediumitem,material" scale="0.5" impactsoundtag="impact_metal_heavy">
       <PreferredContainer primary="storagecab" secondary="engcab" />
       <Sprite texture="%ModDir:2532991202%/Items/Pirates/ExosuitParts.png" sourcerect="0,0,164,113" depth="0.6" origin="0.5,0.5" />
       <Deconstruct time="15">
@@ -407,14 +407,14 @@
       <Body radius="45" width="34" density="20" />
       <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
         <sprite name="Pirate Diving Suit Helmet Wearable" texture="%ModDir:2532991202%/Items/Pirates/Piratesuit.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="280,414,103,103" origin="0.5,0.5">
-          <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+          <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
             <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
               <Conditional IsDead="false" />
             </StatusEffect>
             <LightTexture texture="Content/Lights/divinghelmetlight.png" origin="0.05, 0.5" size="1.0,1.0" />
             <IsActive condition="gt 10.0" />
           </LightComponent>
-          <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" flicker="0.8" flickerspeed="1.0" pulsefrequency="0.1" pulseamount="0.5">
+          <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" flicker="0.8" flickerspeed="1.0" pulsefrequency="0.1" pulseamount="0.5">
             <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
               <Conditional IsDead="false" />
             </StatusEffect>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Waste Items/WasteItems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Waste Items/WasteItems.xml
index 736d304a..dc3cc384 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Waste Items/WasteItems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2532991202/Items/Waste Items/WasteItems.xml	
@@ -42,7 +42,7 @@
       <DecorativeSprite texture="Content/Particles/ParticleAtlas.png" depth="0.52" sourcerect="96,64,32,32" randomrotation="0,360" randomscale="2,3" origin="0.5,0.5" randomgroupid="1" />
       <DecorativeSprite texture="Content/Particles/ParticleAtlas.png" depth="0.52" sourcerect="128,64,32,32" randomrotation="0,360" randomscale="2,3" origin="0.5,0.5" randomgroupid="1" />
       <Body radius="25" density="12" />
-      <LightComponent range="25" castshadows="False" drawbehindsubs="False" ison="True" lightcolor="45,70,45,150" vulnerabletoemp="False" />
+      <LightComponent range="100" castshadows="False" drawbehindsubs="False" ison="True" lightcolor="45,70,45,150" vulnerabletoemp="False" />
       <Projectile characterusable="false" launchimpulse="20" sticktocharacters="false" sticktoitems="false" sticktodoors="false" sticktostructures="true" friendlyfire="false" damagedoors="true">
         <Attack structuredamage="50" itemdamage="15" targetforce="10" severlimbsprobability="0">
           <Affliction identifier="acidburn" strength="15" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Ammopack/Ammopack.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Ammopack/Ammopack.xml
index 4494e982..90149a55 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Ammopack/Ammopack.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Ammopack/Ammopack.xml	
@@ -11,18 +11,18 @@
       <Item identifier="rubber" />
     </Fabricate>
     <Price baseprice="50">
-      <Price locationtype="outpost" multiplier="1.75" minavailable="0" />
-      <Price locationtype="city" multiplier="1.5" minavailable="0" />
-      <Price locationtype="research" multiplier="2.0" minavailable="0" />
-      <Price locationtype="military" multiplier="0.5" minavailable="3" />
-      <Price locationtype="mine" multiplier="2.0" minavailable="0" />
+      <Price locationtype="outpost" multiplier="5.25" minavailable="0" />
+      <Price locationtype="city" multiplier="4.5" minavailable="0" />
+      <Price locationtype="research" multiplier="6" minavailable="0" />
+      <Price locationtype="military" multiplier="1.5" minavailable="9" />
+      <Price locationtype="mine" multiplier="6" minavailable="0" />
     </Price>
     <InventoryIcon texture="Ammopack.png" sourcerect="33,38,461,423" origin="0.5,0.6" />
     <Sprite texture="Ammopack.png" sourcerect="33,38,461,423" depth="0.55" origin="0.5,1" />
     <Body width="45" height="31" density="20" />
     <Holdable slots="RightHand,LeftHand,Any" holdpos="10,-90" handle1="-5,360" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="6" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="harpoonammo,revolverammo,pistolammoitem,smgammo,demolitionsexpert,mobilebattery,grenade,shotgunammo,stungunammo,reactorfuel,assaultrifleammo,ek_piperound,ek_piperound_alien,ek_revolver_flare,ek_handgun_mag,ek_handgun_magextended,ek_handgun_alienmag,ek_handgun_riot_mag,ek_smg_mag,ek_smg_alienmag,ek_smg_riot_mag,ek_torpedorifle_round_slug,ek_torpedorifle_round,ek_torpedorifle_round_shortfuse,ek_torpedorifle_round_tazer,ek_torpedorifle_round_alien,ek_flare_round,ek_impact_mine,ek_proximity_mine,ek_shotgun_shell,ek_shotgun_beanbag,ek_shotgun_slug,ek_shotgun_hollowpoint,ek_shotgun_alien_slug,ek_shotgun_grenade,ek_shotgun_flechette,ek_tazer_mag,ek_tazer_round,ek_flamer_fuel,ek_flame_fuel,ek_flamer_incendium,ek_alienrifle_mag,ek_petrobomb,ek_dart_hemostat,ek_dart_stabilozine,ek_dart_morphine,ek_dart_fentanyl,ek_dart_deusizine,ek_dart_calyxanide,ek_dart_haloperidol,ek_dart_oxygenite,ek_dart_steroids,ek_dart_antiparalysis,ek_dart_ethanol,ek_dart_chloralhydrate,ek_dart_deliriumine,ek_dart_acid,ek_dart_cyanide,ek_dart_radiotoxin,ek_dart_morbusine,ek_dart_sufforin,ek_dart_paralyzant,ek_dart_raptorbane,ek_dart_explosive,ek_mini_smg_mag,ek_mini_smg_alienmag,ek_mini_smg_riot_mag,ek_rocketammo_explosive,ek_rocketammo_shortfuse,ek_rocketammo_armorpiercing,ek_rocketammo_alien,ek_gausspistol_mag,ek_gaussrifle_mag,ek_drumlmg_mag,ek_drumlmg_alienmag,ek_smokegrenade,ek_battlerifle_mag,ek_battlerifle_alien_mag,ek_battlerifle_riot_mag,ek_ssl_magazine,ek_ied,ek_breachingcharge,ek_explosivecharge_uex,ek_explosivecharge_c4,ek_thermiteblock,ek_thermitegrenade,ek_explosivecharge_thermite,ek_laserpistol_mag,ek_laserrifle_mag,ek_hypergolic_fuel,ek_flame_hypergolic,ek_dynamite,ek_explosivecharge_dynamite,ek_revolverammo,ek_revolverspeedloader,ek_revolverammo_physicorium,ek_revolverspeedloader_physicorium,ek_revolverammo_riot,ek_revolverspeedloader_riot,ek_flashgrenade,ek_spear_rocket,ek_divinggrenade,ek_40mmbeehive,ek_40mmthermite,explosive,demolitionsexpert,ehaammo" excludeditems="mobilecontainer" />
+    <ItemContainer capacity="13" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="harpoonammo,revolverammo,pistolammoitem,smgammo,demolitionsexpert,mobilebattery,grenade,shotgunammo,stungunammo,reactorfuel,assaultrifleammo,ek_piperound,ek_piperound_alien,ek_revolver_flare,ek_handgun_mag,ek_handgun_magextended,ek_handgun_alienmag,ek_handgun_riot_mag,ek_smg_mag,ek_smg_alienmag,ek_smg_riot_mag,ek_torpedorifle_round_slug,ek_torpedorifle_round,ek_torpedorifle_round_shortfuse,ek_torpedorifle_round_tazer,ek_torpedorifle_round_alien,ek_flare_round,ek_impact_mine,ek_proximity_mine,ek_shotgun_shell,ek_shotgun_beanbag,ek_shotgun_slug,ek_shotgun_hollowpoint,ek_shotgun_alien_slug,ek_shotgun_grenade,ek_shotgun_flechette,ek_tazer_mag,ek_tazer_round,ek_flamer_fuel,ek_flame_fuel,ek_flamer_incendium,ek_alienrifle_mag,ek_petrobomb,ek_dart_hemostat,ek_dart_stabilozine,ek_dart_morphine,ek_dart_fentanyl,ek_dart_deusizine,ek_dart_calyxanide,ek_dart_haloperidol,ek_dart_oxygenite,ek_dart_steroids,ek_dart_antiparalysis,ek_dart_ethanol,ek_dart_chloralhydrate,ek_dart_deliriumine,ek_dart_acid,ek_dart_cyanide,ek_dart_radiotoxin,ek_dart_morbusine,ek_dart_sufforin,ek_dart_paralyzant,ek_dart_raptorbane,ek_dart_explosive,ek_mini_smg_mag,ek_mini_smg_alienmag,ek_mini_smg_riot_mag,ek_rocketammo_explosive,ek_rocketammo_shortfuse,ek_rocketammo_armorpiercing,ek_rocketammo_alien,ek_gausspistol_mag,ek_gaussrifle_mag,ek_drumlmg_mag,ek_drumlmg_alienmag,ek_smokegrenade,ek_battlerifle_mag,ek_battlerifle_alien_mag,ek_battlerifle_riot_mag,ek_ssl_magazine,ek_ied,ek_breachingcharge,ek_explosivecharge_uex,ek_explosivecharge_c4,ek_thermiteblock,ek_thermitegrenade,ek_explosivecharge_thermite,ek_laserpistol_mag,ek_laserrifle_mag,ek_hypergolic_fuel,ek_flame_hypergolic,ek_dynamite,ek_explosivecharge_dynamite,ek_revolverammo,ek_revolverspeedloader,ek_revolverammo_physicorium,ek_revolverspeedloader_physicorium,ek_revolverammo_riot,ek_revolverspeedloader_riot,ek_flashgrenade,ek_spear_rocket,ek_divinggrenade,ek_40mmbeehive,ek_40mmthermite,explosive,demolitionsexpert,ehaammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="%ModDir%/Ammopack/Ammopack.png" sourcerect="190,209,145,147" origin="0.5,0.45" />
       <SlotIcon slotindex="1" texture="%ModDir%/Ammopack/Ammopack.png" sourcerect="190,209,145,147" origin="0.5,0.45" />
       <SlotIcon slotindex="2" texture="%ModDir%/Ammopack/Ammopack.png" sourcerect="190,209,145,147" origin="0.5,0.45" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Backpack Belt-Fed Minigun/Backpack Belt-Fed Minigun.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Backpack Belt-Fed Minigun/Backpack Belt-Fed Minigun.xml
index f588f127..b7292de6 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Backpack Belt-Fed Minigun/Backpack Belt-Fed Minigun.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Backpack Belt-Fed Minigun/Backpack Belt-Fed Minigun.xml	
@@ -3,11 +3,11 @@
   <!-- -->
   <Item name="" identifier="minigun1" category="Equipment" cargocontaineridentifier="metalcrate" tags="weapon,gun,backpack" Scale="0.12" impactsoundtag="impact_metal_heavy" description="">
     <Price baseprice="1000">
-      <Price locationtype="outpost" multiplier="2" minavailable="0" />
-      <Price locationtype="city" multiplier="1" minavailable="0" />
-      <Price locationtype="research" multiplier="1.25" minavailable="0" />
-      <Price locationtype="military" multiplier="0.9" minavailable="1" />
-      <Price locationtype="mine" multiplier="1.25" minavailable="0" />
+      <Price locationtype="outpost" multiplier="6" minavailable="0" />
+      <Price locationtype="city" multiplier="3" minavailable="0" />
+      <Price locationtype="research" multiplier="3.75" minavailable="0" />
+      <Price locationtype="military" multiplier="2.7" minavailable="3" />
+      <Price locationtype="mine" multiplier="3.75" minavailable="0" />
     </Price>
     <Deconstruct time="60">
       <Item identifier="titaniumaluminiumalloy" />
@@ -60,7 +60,7 @@
       <RequiredSkill identifier="weapons" level="80" />
     </RangedWeapon>
     <ItemContainer hideitems="true" capacity="1" drawinventory="false" SpawnWithId="minigunround1" removecontaineditemsondeconstruct="true" canbeselected="false">
-      <Containable items="minigunround1" />
+      <Containable items="minigunround1,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
     <Quality>
@@ -70,11 +70,11 @@
   <!-- -->
   <Item name="" identifier="minigunammunitiontank" category="Equipment" tags="mediumitem" fireproof="true" waterproof="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_heavy" description="">
     <Price baseprice="500">
-      <Price locationtype="outpost" multiplier="2" minavailable="0" />
-      <Price locationtype="city" multiplier="1" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" minavailable="0" />
-      <Price locationtype="military" multiplier="0.75" minavailable="1" />
-      <Price locationtype="mine" multiplier="1.25" minavailable="0" />
+      <Price locationtype="outpost" multiplier="6" minavailable="0" />
+      <Price locationtype="city" multiplier="3" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" minavailable="0" />
+      <Price locationtype="military" multiplier="2.25" minavailable="3" />
+      <Price locationtype="mine" multiplier="3.75" minavailable="0" />
     </Price>
     <Deconstruct time="60">
       <Item identifier="titaniumaluminiumalloy" />
@@ -119,7 +119,7 @@
       <Upgrade gameversion="0.1401.0.0" msg="ItemMsgPickUpUse" />
     </Holdable>
     <ItemContainer hideitems="true" capacity="1" drawinventory="true" canbeselected="false" ShowConditionInContainedStateIndicator="false" removecontaineditemsondeconstruct="false">
-      <Containable items="minigun1">
+      <Containable items="minigun1,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <Conditional condition="lt 100" />
       </Containable>
     </ItemContainer>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Backpack/Backpack.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Backpack/Backpack.xml
index de25cb3d..ae734c94 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Backpack/Backpack.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Backpack/Backpack.xml	
@@ -2,11 +2,11 @@
 <Items>
   <Item name="" identifier="backpack1" category="Equipment" tags="mediumitem,backpack" fireproof="true" waterproof="true" cargocontaineridentifier="metalcrate" scale="0.28" impactsoundtag="impact_soft" description="">
     <Price baseprice="350">
-      <Price locationtype="outpost" multiplier="1" minavailable="4" />
-      <Price locationtype="city" multiplier="0.9" minavailable="6" />
-      <Price locationtype="research" multiplier="1.25" minavailable="1" />
-      <Price locationtype="military" multiplier="1.25" minavailable="1" />
-      <Price locationtype="mine" multiplier="1.25" minavailable="8" />
+      <Price locationtype="outpost" multiplier="3" minavailable="12" />
+      <Price locationtype="city" multiplier="2.7" minavailable="18" />
+      <Price locationtype="research" multiplier="3.75" minavailable="3" />
+      <Price locationtype="military" multiplier="3.75" minavailable="3" />
+      <Price locationtype="mine" multiplier="3.75" minavailable="24" />
     </Price>
     <Deconstruct time="40">
       <Item identifier="ballisticfiber" />
@@ -23,8 +23,8 @@
     <Body width="100" height="60" density="30" />
     <Wearable slots="Bag" msg="ItemMsgPickUpSelect">
       <sprite name="Backpack on character" texture="%ModDir%/Backpack/Backpack.png" limb="Torso" depth="0.8" hidelimb="false" canbehiddenbyotherwearables="false" inherittexturescale="true" origin="1,0.5" sourcerect="1,1,101,137" />
-      <ItemContainer capacity="15" hideitems="true">
-        <Containable items="smallitem,weapon,gun" excludeditems="backpack,toolbox,cargoscooter" />
+      <ItemContainer capacity="33" hideitems="true">
+        <Containable items="smallitem,weapon,gun,ammobox,deepdiving,mediumitem,largeitem" />
       </ItemContainer>
       <!-- -->
       <StatusEffect type="Always" target="Character">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Deep Diving Operation Suit/Deep Diving Operation Suit.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Deep Diving Operation Suit/Deep Diving Operation Suit.xml
index c8fe828a..e1244dab 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Deep Diving Operation Suit/Deep Diving Operation Suit.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Deep Diving Operation Suit/Deep Diving Operation Suit.xml	
@@ -2,13 +2,13 @@
 <Items>
   <Item name="" identifier="ddossuit" category="Diving,Equipment" tags="diving,deepdiving,provocative,divingsuit" scale="0.48" fireproof="true" waterproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy">
     <Price baseprice="3500">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="0" />
-      <Price storeidentifier="merchantcity" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1" minavailable="0" />
-      <Price storeidentifier="merchantmilitary" multiplier="1" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.5" minavailable="0" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="0" />
+      <Price storeidentifier="merchantcity" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3" minavailable="0" />
+      <Price storeidentifier="merchantmilitary" multiplier="3" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="4.5" minavailable="0" />
     </Price>
-    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.01" />
+    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.02" />
     <Deconstruct time="60">
       <Item identifier="combatdivingsuit" />
       <Item identifier="abyssdivingsuit" />
@@ -59,7 +59,7 @@
     <Body radius="45" width="100" density="30" />
     <Wearable slots="OuterClothes+Bag+InnerClothes+Head" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Diving Mask Wearable" texture="%ModDir%/Deep Diving Operation Suit/Deep Diving Operation Suit.png" limb="Head" inheritlimbdepth="true" inheritscale="false" ignorelimbscale="true" scale="0.5" hidelimb="false" hideotherwearables="true" sourcerect="711,0,64,70" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -159,21 +159,21 @@
       <Upgrade gameversion="0.1401.0.0" msg="ItemMsgPickUpUse" />
     </Holdable>
     <ItemContainer capacity="0" maxstacksize="0" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0">
-      <Containable items="none" />
+      <Containable items="none,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="1,93,120,29" origin="0.5,0.45" />
       <SlotIcon slotindex="1" texture="%ModDir%/Deep Diving Operation Suit/Toolbox icon.png" sourcerect="2,2,50,30" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/WeaponUI.png" sourcerect="64,961,32,22" origin="0.5,0.45" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="oxygensource" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="toolbelt,toolbox,ammopack,medipack" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="toolbelt,toolbox,ammopack,medipack,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="mobilebattery" excludeditems="backpack,minigun,cargoscooter" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="mobilebattery,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
-      <SubContainer capacity="9" maxstacksize="64">
-        <Containable items="smallitem,mediumitem" excludeditems="backpack,minigun,toolbox,toolbelt,cargoscooter" />
+      <SubContainer capacity="20" maxstacksize="128">
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       </SubContainer>
       <StatusEffect type="OnWearing" target="Contained">
         <RequiredItem items="oxygensource" type="Contained" targetslot="0" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Diving suits.old/Diving Suits.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Diving suits.old/Diving Suits.xml
index e40b6d4a..3ff78011 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Diving suits.old/Diving Suits.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Diving suits.old/Diving Suits.xml	
@@ -2,13 +2,13 @@
 <Override>
   <Item name="" identifier="divingsuit" category="Equipment" tags="diving,deepdiving,provocative,respawnsuit" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy">
     <Price baseprice="250">
-      <Price locationtype="outpost" multiplier="0.9" minavailable="2" />
-      <Price locationtype="city" multiplier="0.85" minavailable="4" />
-      <Price locationtype="research" multiplier="1" minavailable="3" />
-      <Price locationtype="military" multiplier="1" minavailable="3" />
-      <Price locationtype="mine" multiplier="1.25" minavailable="5" />
+      <Price locationtype="outpost" multiplier="2.7" minavailable="6" />
+      <Price locationtype="city" multiplier="2.55" minavailable="12" />
+      <Price locationtype="research" multiplier="3" minavailable="9" />
+      <Price locationtype="military" multiplier="3" minavailable="9" />
+      <Price locationtype="mine" multiplier="3.75" minavailable="15" />
     </Price>
-    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.8" />
+    <PreferredContainer primary="divingsuitcontainer" spawnprobability="1" />
     <Deconstruct time="30">
       <Item identifier="titaniumaluminiumalloy" />
       <Item identifier="rubber" />
@@ -30,7 +30,7 @@
     <Body radius="45" width="34" density="15" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Diving Suit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="true" hideotherwearables="true" sourcerect="5,4,92,94" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <Upgrade gameversion="0.1300.0.3" allowingameediting="false" />
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
@@ -99,8 +99,8 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use">
       <Upgrade gameversion="0.1401.0.0" msg="ItemMsgPickUpUse" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
-      <Containable items="oxygensource,weldingtoolfuel" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="tank">
+      <Containable items="oxygensource,weldingtoolfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnWearing" target="Contained" playsoundonrequireditemfailure="true">
         <RequiredItem items="oxygensource" type="Contained" matchonempty="true" />
         <Conditional condition="lt 5.0" />
@@ -111,13 +111,13 @@
   </Item>
   <Item name="" identifier="abyssdivingsuit" category="Equipment" tags="diving,deepdiving,provocative,respawnsuitdeep" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy">
     <Price baseprice="430" minleveldifficulty="25">
-      <Price locationtype="outpost" multiplier="0.9" minavailable="1" />
-      <Price locationtype="city" multiplier="0.85" minavailable="2" />
-      <Price locationtype="research" multiplier="1" minavailable="1" />
-      <Price locationtype="military" multiplier="1" minavailable="2" />
-      <Price locationtype="mine" multiplier="1.25" minavailable="2" />
+      <Price locationtype="outpost" multiplier="2.7" minavailable="3" />
+      <Price locationtype="city" multiplier="2.55" minavailable="6" />
+      <Price locationtype="research" multiplier="3" minavailable="3" />
+      <Price locationtype="military" multiplier="3" minavailable="6" />
+      <Price locationtype="mine" multiplier="3.75" minavailable="6" />
     </Price>
-    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.8" />
+    <PreferredContainer primary="divingsuitcontainer" spawnprobability="1" />
     <Deconstruct time="30">
       <Item identifier="titaniumaluminiumalloy" />
       <Item identifier="titaniumaluminiumalloy" />
@@ -140,7 +140,7 @@
     <Body radius="45" width="34" density="15" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Abyss Diving Suit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="true" hideotherwearables="true" sourcerect="0,409,103,103" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -206,8 +206,8 @@
       <damagemodifier armorsector="0.0,360.0" afflictionidentifiers="huskinfection" damagemultiplier="0.5" probabilitymultiplier="0.5" damagesound="LimbArmor" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" />
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
-      <Containable items="oxygensource,weldingtoolfuel" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="tank">
+      <Containable items="oxygensource,weldingtoolfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnWearing" target="Contained" playsoundonrequireditemfailure="true">
         <RequiredItem items="oxygensource" type="Contained" matchonempty="true" />
         <Conditional condition="lt 5.0" />
@@ -218,13 +218,13 @@
   </Item>
   <Item name="" identifier="combatdivingsuit" category="Equipment" tags="diving,deepdiving,provocative" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy">
     <Price baseprice="430" minleveldifficulty="25">
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="0.85" minavailable="2" />
-      <Price locationtype="research" multiplier="1" sold="false" />
-      <Price locationtype="military" multiplier="1" minavailable="3" />
-      <Price locationtype="mine" multiplier="1.25" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="2.55" minavailable="6" />
+      <Price locationtype="research" multiplier="3" sold="false" />
+      <Price locationtype="military" multiplier="3" minavailable="9" />
+      <Price locationtype="mine" multiplier="3.75" sold="false" />
     </Price>
-    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.8" />
+    <PreferredContainer primary="divingsuitcontainer" spawnprobability="1" />
     <Deconstruct time="30">
       <Item identifier="ballisticfiber" />
       <Item identifier="titaniumaluminiumalloy" />
@@ -249,7 +249,7 @@
     <Body radius="45" width="34" density="15" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Combat Diving Suit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="true" hideotherwearables="true" sourcerect="326,0,103,103" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -315,8 +315,8 @@
       <damagemodifier armorsector="0.0,360.0" afflictionidentifiers="huskinfection" damagemultiplier="0.5" probabilitymultiplier="0.5" damagesound="LimbArmor" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" />
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
-      <Containable items="oxygensource,weldingtoolfuel" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="tank">
+      <Containable items="oxygensource,weldingtoolfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnWearing" target="Contained" playsoundonrequireditemfailure="true">
         <RequiredItem items="oxygensource" type="Contained" matchonempty="true" />
         <Conditional condition="lt 5.0" />
@@ -327,13 +327,13 @@
   </Item>
   <Item name="" identifier="slipsuit" variantof="combatdivingsuit" category="Equipment" tags="diving,deepdiving,provocative" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy">
     <Price baseprice="480" minleveldifficulty="25">
-      <Price locationtype="outpost" multiplier="0.9" sold="false" />
-      <Price locationtype="city" multiplier="0.85" sold="false" />
-      <Price locationtype="research" multiplier="1" sold="false" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="1.25" sold="false" />
+      <Price locationtype="outpost" multiplier="2.7" sold="false" />
+      <Price locationtype="city" multiplier="2.55" sold="false" />
+      <Price locationtype="research" multiplier="3" sold="false" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="3.75" sold="false" />
     </Price>
-    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.0" />
+    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0" />
     <Deconstruct time="30">
       <Item identifier="combatdivingsuit" />
       <Item identifier="rubber" />
@@ -351,7 +351,7 @@
     <Body radius="45" width="34" density="15" />
     <Wearable>
       <sprite name="Slipsuit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="true" hideotherwearables="true" sourcerect="0,520,105,124" origin="0.5,0.4">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -377,13 +377,13 @@
     </Wearable>
   </Item>
   <Item name="" identifier="pucs" category="Equipment" tags="diving,deepdiving,divinggear_wearableindoors,provocative" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.0" />
+    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0" />
     <Price baseprice="570">
-      <Price locationtype="outpost" multiplier="1" sold="false" />
-      <Price locationtype="city" multiplier="1" sold="false" />
-      <Price locationtype="research" multiplier="1.2" sold="false" />
-      <Price locationtype="military" multiplier="1" sold="false" />
-      <Price locationtype="mine" multiplier="1.1" sold="false" />
+      <Price locationtype="outpost" multiplier="3" sold="false" />
+      <Price locationtype="city" multiplier="3" sold="false" />
+      <Price locationtype="research" multiplier="3.6" sold="false" />
+      <Price locationtype="military" multiplier="3" sold="false" />
+      <Price locationtype="mine" multiplier="3.3" sold="false" />
     </Price>
     <Deconstruct time="45">
       <Item identifier="titaniumaluminiumalloy" />
@@ -408,7 +408,7 @@
     <Body radius="45" width="34" density="15" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="PUCS Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="true" hideotherwearables="true" sourcerect="127,520,105,124" origin="0.5,0.35">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -493,14 +493,14 @@
     </Wearable>
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" />
     <ItemContainer capacity="0" maxstacksize="0" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0" autoinject="true">
-      <Containable items="none" />
+      <Containable items="none,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="1,93,120,29" origin="0.5,0.45" />
       <SlotIcon slotindex="1" texture="Content/UI/ContainerIndicators.png" sourcerect="2,155,120,29" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="oxygensource,weldingtoolfuel" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="oxygensource,weldingtoolfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="chem,medical" />
+      <SubContainer capacity="1" maxstacksize="2">
+        <Containable items="chem,medical,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
   </Item>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Duffel Bag/Duffel Bag.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Duffel Bag/Duffel Bag.xml
index 7660a1cf..94dd53c7 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Duffel Bag/Duffel Bag.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Duffel Bag/Duffel Bag.xml	
@@ -12,8 +12,8 @@
         <Remove />
       </StatusEffect>
     </Holdable>
-    <ItemContainer capacity="20" keepopenwhenequipped="false" movableframe="true">
-      <Containable items="smallitem,mediumitem,backpack,minigun" excludeditems="duffelbag" />
+    <ItemContainer capacity="44" keepopenwhenequipped="false" movableframe="true">
+      <Containable items="smallitem,mediumitem,backpack,minigun,ammobox,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
 </Override>
\ No newline at end of file
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Heavy Backpack/Heavy Backpack.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Heavy Backpack/Heavy Backpack.xml
index 0731e213..e3c9224b 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Heavy Backpack/Heavy Backpack.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Heavy Backpack/Heavy Backpack.xml	
@@ -2,11 +2,11 @@
 <Items>
   <Item name="" identifier="heavybackpack" category="Equipment" tags="mediumitem,backpack" fireproof="true" waterproof="true" cargocontaineridentifier="metalcrate" scale="0.25" impactsoundtag="impact_metal_heavy" description="">
     <Price baseprice="200">
-      <Price locationtype="outpost" multiplier="1" minavailable="4" />
-      <Price locationtype="city" multiplier="0.9" minavailable="6" />
-      <Price locationtype="research" multiplier="1.25" minavailable="1" />
-      <Price locationtype="military" multiplier="1.25" minavailable="1" />
-      <Price locationtype="mine" multiplier="1.25" minavailable="8" />
+      <Price locationtype="outpost" multiplier="3" minavailable="12" />
+      <Price locationtype="city" multiplier="2.7" minavailable="18" />
+      <Price locationtype="research" multiplier="3.75" minavailable="3" />
+      <Price locationtype="military" multiplier="3.75" minavailable="3" />
+      <Price locationtype="mine" multiplier="3.75" minavailable="24" />
     </Price>
     <Deconstruct time="60">
       <Item identifier="steel" />
@@ -26,22 +26,22 @@
     <Body width="100" height="60" density="30" />
     <Wearable slots="Bag" msg="ItemMsgPickUpSelect">
       <sprite name="Heavy Backpack on character" texture="%ModDir%/Heavy Backpack/Heavy Backpack.png" canbehiddenbyotherwearables="false" limb="Torso" depth="0.8" hidelimb="false" inherittexturescale="true" origin="1,0.5" sourcerect="2,2,90,173" />
-      <ItemContainer capacity="0" maxstacksize="0" hideitems="true" slotsperrow="3" containedstateindicatorslot="1">
-        <Containable items="none" />
+      <ItemContainer capacity="0" maxstacksize="0" hideitems="true" slotsperrow="1" containedstateindicatorslot="1">
+        <Containable items="none,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
         <SlotIcon slotindex="0" texture="%ModDir%/Icons/Heavy.png" origin="0.5,0.5" />
         <SlotIcon slotindex="1" texture="%ModDir%/Icons/Heavy.png" origin="0.5,0.5" />
         <SlotIcon slotindex="2" texture="%ModDir%/Icons/Heavy.png" origin="0.5,0.5" />
         <SlotIcon slotindex="3" texture="%ModDir%/Icons/Toolbox.png" origin="0.5,0.5" />
         <SlotIcon slotindex="4" texture="%ModDir%/Icons/Toolbox.png" origin="0.5,0.5" />
         <SlotIcon slotindex="5" texture="%ModDir%/Icons/Toolbox.png" origin="0.5,0.5" />
-        <SubContainer capacity="3" maxstacksize="64">
-          <Containable items="crate,deepdiving,ammobox,railgunammo,depthchargeammo,alienartifact,toolbox" excludeditems="backpack,cargoscooter" />
+        <SubContainer capacity="7" maxstacksize="128">
+          <Containable items="crate,deepdiving,ammobox,railgunammo,depthchargeammo,alienartifact,toolbox,smallitem,mediumitem,largeitem" />
         </SubContainer>
-        <SubContainer capacity="3" maxstacksize="64">
-          <Containable items="toolbox,toolbelt,ammopack,medipack" excludeditems="backpack" />
+        <SubContainer capacity="7" maxstacksize="128">
+          <Containable items="toolbox,toolbelt,ammopack,medipack,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
         </SubContainer>
-        <SubContainer capacity="3" maxstacksize="64">
-          <Containable items="smallitem,mediumitem" excludeditems="backpack,toolbox,toolbelt,cargoscooter" />
+        <SubContainer capacity="7" maxstacksize="128">
+          <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
         </SubContainer>
       </ItemContainer>
       <!---->
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Heavy Crate/Heavy Crate.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Heavy Crate/Heavy Crate.xml
index 623fa1c9..2b96e09a 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Heavy Crate/Heavy Crate.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Heavy Crate/Heavy Crate.xml	
@@ -2,11 +2,11 @@
 <Items>
   <Item name="" identifier="heavycrate" tags="crate" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" waterproof="true" description="">
     <Price baseprice="100">
-      <Price locationtype="outpost" multiplier="1" minavailable="1" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" minavailable="1" />
-      <Price locationtype="military" multiplier="1.25" minavailable="3" />
-      <Price locationtype="mine" multiplier="1.25" minavailable="0" />
+      <Price locationtype="outpost" multiplier="3" minavailable="3" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" minavailable="3" />
+      <Price locationtype="military" multiplier="3.75" minavailable="9" />
+      <Price locationtype="mine" multiplier="3.75" minavailable="0" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="steel" />
@@ -64,8 +64,8 @@
         <Affliction identifier="encombranceheavybackpack" amount="1" />
       </StatusEffect>
     </Holdable>
-    <ItemContainer capacity="10" slotsperrow="2" maxstacksize="64" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="deepdiving,ammobox,railgunammo,depthchargeammo,alienartifact,toolbox" excludeditems="backpack" />
+    <ItemContainer capacity="22" slotsperrow="5" maxstacksize="128" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="deepdiving,ammobox,railgunammo,depthchargeammo,alienartifact,toolbox,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="%ModDir%/Icons/Heavy.png" origin="0.5,0.45" />
       <SlotIcon slotindex="1" texture="%ModDir%/Icons/Heavy.png" origin="0.5,0.45" />
       <SlotIcon slotindex="2" texture="%ModDir%/Icons/Heavy.png" origin="0.5,0.45" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Medical Backpack/Medical Backpack.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Medical Backpack/Medical Backpack.xml
index a1b03454..81717719 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Medical Backpack/Medical Backpack.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Medical Backpack/Medical Backpack.xml	
@@ -2,11 +2,11 @@
 <Items>
   <Item name="" identifier="medicalbackpack" category="Equipment" tags="medical,mediumitem,backpack" fireproof="true" waterproof="true" cargocontaineridentifier="metalcrate" scale="0.28" impactsoundtag="impact_soft" description="">
     <Price baseprice="350">
-      <Price locationtype="outpost" multiplier="1" minavailable="4" />
-      <Price locationtype="city" multiplier="0.9" minavailable="6" />
-      <Price locationtype="research" multiplier="1.25" minavailable="1" />
-      <Price locationtype="military" multiplier="1.25" minavailable="1" />
-      <Price locationtype="mine" multiplier="1.25" minavailable="8" />
+      <Price locationtype="outpost" multiplier="3" minavailable="12" />
+      <Price locationtype="city" multiplier="2.7" minavailable="18" />
+      <Price locationtype="research" multiplier="3.75" minavailable="3" />
+      <Price locationtype="military" multiplier="3.75" minavailable="3" />
+      <Price locationtype="mine" multiplier="3.75" minavailable="24" />
     </Price>
     <Deconstruct time="40">
       <Item identifier="ballisticfiber" />
@@ -22,8 +22,8 @@
     <Body width="100" height="60" density="30" />
     <Wearable slots="Bag" msg="ItemMsgPickUpSelect">
       <sprite name="Backpack on character" texture="%ModDir%/Medical Backpack/Medical Backpack.png" canbehiddenbyotherwearables="false" limb="Torso" depth="0.8" hidelimb="false" inherittexturescale="true" origin="1,0.5" sourcerect="6,14,73,124" />
-      <ItemContainer capacity="0" maxstacksize="0" hideitems="true" slotsperrow="3" containedstateindicatorslot="1">
-        <Containable items="none" />
+      <ItemContainer capacity="0" maxstacksize="0" hideitems="true" slotsperrow="1" containedstateindicatorslot="1">
+        <Containable items="none,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
         <SlotIcon slotindex="0" texture="%ModDir%/Icons/Medical.png" origin="0.5,0.5" />
         <SlotIcon slotindex="1" texture="%ModDir%/Icons/Medical.png" origin="0.5,0.5" />
         <SlotIcon slotindex="2" texture="%ModDir%/Icons/Medical.png" origin="0.5,0.5" />
@@ -40,11 +40,11 @@
         <SlotIcon slotindex="13" texture="%ModDir%/Icons/Medical.png" origin="0.5,0.5" />
         <SlotIcon slotindex="14" texture="%ModDir%/Icons/Medical.png" origin="0.5,0.5" />
         <SlotIcon slotindex="15" texture="%ModDir%/Icons/Medical.png" origin="0.5,0.5" />
-        <SubContainer capacity="16" maxstacksize="64">
-          <Containable items="chem,medical,syringe,huskeggs,organicfiber,paralyxis,plant,surgerytool,surgery,organ" excludeditems="backpack,toolbox" />
+        <SubContainer capacity="35" maxstacksize="128">
+          <Containable items="chem,medical,syringe,huskeggs,organicfiber,paralyxis,plant,surgerytool,surgery,organ,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
         </SubContainer>
-        <SubContainer capacity="8" maxstacksize="64">
-          <Containable items="smallitem,mediumitem" excludeditems="backpack,toolbox,cargoscooter" />
+        <SubContainer capacity="18" maxstacksize="128">
+          <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
         </SubContainer>
       </ItemContainer>
       <SkillModifier skillidentifier="medical" skillvalue="20" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Medipack/Medipack.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Medipack/Medipack.xml
index 57717038..005b9168 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Medipack/Medipack.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Medipack/Medipack.xml	
@@ -11,18 +11,18 @@
       <Item identifier="rubber" />
     </Fabricate>
     <Price baseprice="50">
-      <Price locationtype="outpost" multiplier="1.75" minavailable="0" />
-      <Price locationtype="city" multiplier="1.5" minavailable="0" />
-      <Price locationtype="research" multiplier="0.5" minavailable="3" />
-      <Price locationtype="military" multiplier="1.0" minavailable="1" />
-      <Price locationtype="mine" multiplier="2.0" minavailable="0" />
+      <Price locationtype="outpost" multiplier="5.25" minavailable="0" />
+      <Price locationtype="city" multiplier="4.5" minavailable="0" />
+      <Price locationtype="research" multiplier="1.5" minavailable="9" />
+      <Price locationtype="military" multiplier="3" minavailable="3" />
+      <Price locationtype="mine" multiplier="6" minavailable="0" />
     </Price>
     <InventoryIcon texture="Medipack.png" sourcerect="33,38,461,423" origin="0.5,0.6" />
     <Sprite texture="Medipack.png" sourcerect="33,38,461,423" depth="0.55" origin="0.5,1" />
     <Body width="45" height="31" density="20" />
     <Holdable slots="RightHand,LeftHand,Any" holdpos="10,-90" handle1="-5,360" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="6" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="chem,medical,syringe,huskeggs,organicfiber,paralyxis,plant" excludeditems="mobilecontainer" />
+    <ItemContainer capacity="13" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="chem,medical,syringe,huskeggs,organicfiber,paralyxis,plant,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="2,155,120,29" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/ContainerIndicators.png" sourcerect="2,155,120,29" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/ContainerIndicators.png" sourcerect="2,155,120,29" origin="0.5,0.5" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Oxy-Gen. Backpack/Oxy-Gen. Backpack.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Oxy-Gen. Backpack/Oxy-Gen. Backpack.xml
index c2ad5778..5e8c0fee 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Oxy-Gen. Backpack/Oxy-Gen. Backpack.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Oxy-Gen. Backpack/Oxy-Gen. Backpack.xml	
@@ -2,11 +2,11 @@
 <Items>
   <Item name="" identifier="oxy-genbackpack" category="Equipment" tags="mediumitem,backpack" scale="0.4" fireproof="true" waterproof="true" description="" impactsoundtag="impact_metal_light">
     <Price baseprice="500">
-      <Price locationtype="outpost" multiplier="1" minavailable="1" />
-      <Price locationtype="city" multiplier="1" minavailable="2" />
-      <Price locationtype="research" multiplier="1.25" minavailable="1" />
-      <Price locationtype="military" multiplier="1.25" minavailable="2" />
-      <Price locationtype="mine" multiplier="0.8" minavailable="1" />
+      <Price locationtype="outpost" multiplier="3" minavailable="3" />
+      <Price locationtype="city" multiplier="3" minavailable="6" />
+      <Price locationtype="research" multiplier="3.75" minavailable="3" />
+      <Price locationtype="military" multiplier="3.75" minavailable="6" />
+      <Price locationtype="mine" multiplier="2.4" minavailable="3" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="steel" />
@@ -55,12 +55,12 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,0" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use">
       <Upgrade gameversion="0.1401.0.0" msg="ItemMsgPickUpUse" />
     </Holdable>
-    <ItemContainer capacity="2" maxstacksize="1" slotsperrow="2" hideitems="true" containedstateindicatorslot="2">
-      <Containable items="oxygentank" excludeditems="backpack,toolbox" />
+    <ItemContainer capacity="4" maxstacksize="2" slotsperrow="2" hideitems="true" containedstateindicatorslot="2">
+      <Containable items="oxygentank,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/CampaignUIAtlas2.png" sourcerect="789,786,90,85" origin="0.5,0.45" />
       <SlotIcon slotindex="1" texture="Content/UI/CampaignUIAtlas2.png" sourcerect="789,786,90,85" origin="0.5,0.45" />
-      <SubContainer capacity="2" maxstacksize="64">
-        <Containable items="smallitem,mediumitem" excludeditems="backpack,toolbox,cargoscooter" />
+      <SubContainer capacity="4" maxstacksize="128">
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       </SubContainer>
     </ItemContainer>
   </Item>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Power-Backpack/Power-Backpack.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Power-Backpack/Power-Backpack.xml
index 870cf471..a7e342f4 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Power-Backpack/Power-Backpack.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Power-Backpack/Power-Backpack.xml	
@@ -2,11 +2,11 @@
 <Items>
   <Item name="" identifier="power-backpack" category="Equipment" tags="mediumitem,backpack" scale="0.4" fireproof="true" waterproof="true" description="" impactsoundtag="impact_metal_light">
     <Price baseprice="400">
-      <Price locationtype="outpost" multiplier="1" minavailable="1" />
-      <Price locationtype="city" multiplier="1" minavailable="2" />
-      <Price locationtype="research" multiplier="1.25" minavailable="1" />
-      <Price locationtype="military" multiplier="1.25" minavailable="1" />
-      <Price locationtype="mine" multiplier="0.8" minavailable="6" />
+      <Price locationtype="outpost" multiplier="3" minavailable="3" />
+      <Price locationtype="city" multiplier="3" minavailable="6" />
+      <Price locationtype="research" multiplier="3.75" minavailable="3" />
+      <Price locationtype="military" multiplier="3.75" minavailable="3" />
+      <Price locationtype="mine" multiplier="2.4" minavailable="18" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="aluminium" />
@@ -35,7 +35,7 @@
     <Body radius="45" width="34" density="15" />
     <Wearable slots="Bag" msg="ItemMsgEquipSelect">
       <sprite texture="%ModDir%/Power-Backpack/Power-Backpack.png" canbehiddenbyotherwearables="false" limb="Torso" inheritlimbdepth="true" hidelimb="false" inheritorigin="false" inherittexturescale="true" sourcerect="0,0,61,137" origin="1.1,0.5">
-        <LightComponent range="1500.0" lightcolor="255,255,150,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="6000" lightcolor="255,255,150,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true" comparison="Or">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -127,13 +127,13 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,0" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use">
       <Upgrade gameversion="0.1401.0.0" msg="ItemMsgPickUpUse" />
     </Holdable>
-    <ItemContainer capacity="3" maxstacksize="1" slotsperrow="3" hideitems="true" containedstateindicatorslot="2">
-      <Containable items="mobilebattery,ek_laserpistol_mag,ek_laserrifle_mag,ek_alienrifle_mag,40kloadable,40kammo,m6h2_batterymagazine,m6_magazine,mcbatteryrod,marinebatteryrod" excludeditems="backpack,toolbox,cargoscooter" />
+    <ItemContainer capacity="7" maxstacksize="2" slotsperrow="3" hideitems="true" containedstateindicatorslot="2">
+      <Containable items="mobilebattery,ek_laserpistol_mag,ek_laserrifle_mag,ek_alienrifle_mag,40kloadable,40kammo,m6h2_batterymagazine,m6_magazine,mcbatteryrod,marinebatteryrod,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/WeaponUI.png" sourcerect="64,961,32,22" origin="0.5,0.45" />
       <SlotIcon slotindex="1" texture="Content/UI/WeaponUI.png" sourcerect="64,961,32,22" origin="0.5,0.45" />
       <SlotIcon slotindex="2" texture="Content/UI/WeaponUI.png" sourcerect="64,961,32,22" origin="0.5,0.45" />
-      <SubContainer capacity="9" maxstacksize="64">
-        <Containable items="smallitem,mediumitem" excludeditems="backpack,toolbox,cargoscooter" />
+      <SubContainer capacity="20" maxstacksize="128">
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       </SubContainer>
     </ItemContainer>
   </Item>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Safety Harness.old/Safety Harness.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Safety Harness.old/Safety Harness.xml
index d60082d6..93dcd445 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Safety Harness.old/Safety Harness.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Safety Harness.old/Safety Harness.xml	
@@ -5,11 +5,11 @@
       <PreferredContainer primary="crewcab,engcab" />
       <PreferredContainer secondary="locker" />
       <Price baseprice="120" soldeverywhere="false">
-        <Price locationtype="outpost" multiplier="1.2" sold="false" />
-        <Price locationtype="city" multiplier="1.2" sold="false" />
-        <Price locationtype="research" multiplier="1.0" sold="false" />
-        <Price locationtype="military" multiplier="1.0" sold="false" />
-        <Price locationtype="mine" multiplier="1.2" sold="false" />
+        <Price locationtype="outpost" multiplier="3.6" sold="false" />
+        <Price locationtype="city" multiplier="3.6" sold="false" />
+        <Price locationtype="research" multiplier="3" sold="false" />
+        <Price locationtype="military" multiplier="3" sold="false" />
+        <Price locationtype="mine" multiplier="3.6" sold="false" />
       </Price>
       <Deconstruct time="20">
         <Item identifier="rubber" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Shield Backpack/Shield Backpack.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Shield Backpack/Shield Backpack.xml
index e7d9eb4e..92454690 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Shield Backpack/Shield Backpack.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Shield Backpack/Shield Backpack.xml	
@@ -2,11 +2,11 @@
 <Items>
   <Item name="" identifier="shieldbackpack" category="Equipment" tags="mediumitem,backpack" scale="0.51" fireproof="true" waterproof="true" description="" impactsoundtag="impact_metal_light">
     <Price baseprice="1500">
-      <Price locationtype="outpost" multiplier="2" minavailable="0" />
-      <Price locationtype="city" multiplier="1.5" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" minavailable="1" />
-      <Price locationtype="military" multiplier="0.9" minavailable="3" />
-      <Price locationtype="mine" multiplier="3" minavailable="0" />
+      <Price locationtype="outpost" multiplier="6" minavailable="0" />
+      <Price locationtype="city" multiplier="4.5" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" minavailable="3" />
+      <Price locationtype="military" multiplier="2.7" minavailable="9" />
+      <Price locationtype="mine" multiplier="9" minavailable="0" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="power-backpack" />
@@ -36,7 +36,7 @@
     <Body radius="45" width="34" density="15" />
     <Wearable slots="Bag" msg="ItemMsgEquipSelect">
       <sprite texture="%ModDir%/Shield Backpack/Shield Backpack.png" canbehiddenbyotherwearables="false" limb="Torso" inheritlimbdepth="true" hidelimb="false" inheritorigin="false" inherittexturescale="true" sourcerect="3,2,43,179" origin="1.55,0.65">
-        <LightComponent range="150.0" lightcolor="0,255,0,25" flicker="2" castshadows="true" powerconsumption="10" IsOn="true">
+        <LightComponent range="600" lightcolor="0,255,0,25" flicker="2" castshadows="true" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" setvalue="true" Voltage="1.0" PressureProtection="20000.0">
             <RequiredItem item="batterycell" type="Contained" condition="gt 0" />
             <Conditional IsDead="false" />
@@ -90,8 +90,8 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,0" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use">
       <Upgrade gameversion="0.1401.0.0" msg="ItemMsgPickUpUse" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true">
-      <Containable items="batterycell,alienpowercell,fulguriumbatterycell" excludeditems="backpack" />
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true">
+      <Containable items="batterycell,alienpowercell,fulguriumbatterycell,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/WeaponUI.png" sourcerect="64,961,32,22" origin="0.5,0.45" />
     </ItemContainer>
   </Item>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Tactical Body Armor/Tactical Body Armor.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Tactical Body Armor/Tactical Body Armor.xml
index dc5192db..bf8c6887 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Tactical Body Armor/Tactical Body Armor.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Tactical Body Armor/Tactical Body Armor.xml	
@@ -3,12 +3,12 @@
   <Item name="" identifier="tacticalbodyarmor" category="Equipment" tags="smallitem,clothing" scale="0.35" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.35" />
     <Price baseprice="600">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="9" />
     </Price>
     <Deconstruct time="45">
       <Item identifier="bodyarmor" />
@@ -29,8 +29,8 @@
       <damagemodifier afflictiontypes="bleeding" armorsector="0.0,360.0" damagemultiplier="0.1" damagesound="LimbArmor" deflectprojectiles="true" />
       <sprite name="Security Vest Wearable" texture="%ModDir%/Tactical Body Armor/Tactical Body Armor.png" limb="Torso" hidelimb="false" inheritscale="true" scale="0.65" inheritorigin="false" origin="0.5,0.5" inheritsourcerect="false" sourcerect="14,45,103,180" />
     </Wearable>
-    <ItemContainer capacity="4">
-      <Containable items="smallitem,mediumitem" excludeditems="toolbelt,toolbox,bandolier,cargoscooter,backpack" />
+    <ItemContainer capacity="9">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Techno-Backpack/Techno-Backpack.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Techno-Backpack/Techno-Backpack.xml
index 9b341cd1..42f90d63 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Techno-Backpack/Techno-Backpack.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Techno-Backpack/Techno-Backpack.xml	
@@ -2,11 +2,11 @@
 <Items>
   <Item name="" identifier="techno-backpack" category="Equipment" tags="mediumitem,backpack" fireproof="true" waterproof="true" cargocontaineridentifier="metalcrate" scale="0.55" impactsoundtag="impact_soft" description="">
     <Price baseprice="1200">
-      <Price locationtype="outpost" multiplier="1" minavailable="0" />
-      <Price locationtype="city" multiplier="0.9" minavailable="1" />
-      <Price locationtype="research" multiplier="1.25" minavailable="2" />
-      <Price locationtype="military" multiplier="1.25" minavailable="1" />
-      <Price locationtype="mine" multiplier="1.25" minavailable="0" />
+      <Price locationtype="outpost" multiplier="3" minavailable="0" />
+      <Price locationtype="city" multiplier="2.7" minavailable="3" />
+      <Price locationtype="research" multiplier="3.75" minavailable="6" />
+      <Price locationtype="military" multiplier="3.75" minavailable="3" />
+      <Price locationtype="mine" multiplier="3.75" minavailable="0" />
     </Price>
     <Deconstruct time="60">
       <Item identifier="power-backpack" />
@@ -28,8 +28,8 @@
     <Body width="100" height="60" density="30" />
     <Wearable slots="Bag" msg="ItemMsgPickUpSelect">
       <sprite name="Backpack on character" texture="%ModDir%/Techno-Backpack/Techno-Backpack.png" canbehiddenbyotherwearables="false" limb="Torso" depth="0.8" hidelimb="false" inherittexturescale="true" origin="0.55,0.55" sourcerect="10,22,218,157" />
-      <ItemContainer capacity="9" hideitems="true">
-        <Containable items="smallitem,weapon,gun" excludeditems="backpack,toolbox,cargoscooter" />
+      <ItemContainer capacity="20" hideitems="true">
+        <Containable items="smallitem,weapon,gun,ammobox,deepdiving,mediumitem,largeitem" />
       </ItemContainer>
       <Sonar range="6000.0" powerconsumption="0" drawhudwhenequipped="true" detectsubmarinewalls="false" displaybordersize="-0.1" characterusable="false" hasmineralscanner="true" allowuioverlap="true">
         <sound file="%ModDir%/Techno-Backpack/Sonar Ping - Navigation.ogg" type="OnUse" range="500.0" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Vanilla Crates/Vanilla Crates.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Vanilla Crates/Vanilla Crates.xml
index d0acff6f..a0bc4e98 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Vanilla Crates/Vanilla Crates.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Vanilla Crates/Vanilla Crates.xml	
@@ -13,8 +13,8 @@
       <Sprite texture="containers.png" depth="0.54" sourcerect="407,376,152,89" origin="0.5,0.5" />
       <Body width="150" height="80" density="50" />
       <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect" />
-      <ItemContainer capacity="20" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-        <Containable items="smallitem,mediumitem" excludeditems="toolbox,cargoscooter" />
+      <ItemContainer capacity="44" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       </ItemContainer>
     </Item>
     <Item name="" identifier="securemetalcrate" tags="crate,securecrate" scale="0.5" linkable="true" pickdistance="150" impactsoundtag="impact_metal_heavy">
@@ -29,9 +29,9 @@
       <Sprite texture="containers.png" depth="0.54" sourcerect="561,377,151,86" origin="0.5,0.5" />
       <Body width="150" height="80" density="50" />
       <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect" />
-      <ItemContainer capacity="20" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <ItemContainer capacity="44" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
         <RequiredItem items="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
-        <Containable items="smallitem,mediumitem" excludeditems="toolbox,cargoscooter" />
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       </ItemContainer>
     </Item>
     <Item name="" identifier="explosivecrate" tags="crate,allowcleanup" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" waterproof="true">
@@ -46,8 +46,8 @@
       <Sprite texture="containers.png" depth="0.54" sourcerect="410,466,150,88" origin="0.5,0.5" />
       <Body width="150" height="80" density="50" />
       <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-      <ItemContainer capacity="12" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-        <Containable items="smallitem" excludeditems="toolbox,cargoscooter" />
+      <ItemContainer capacity="26" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+        <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
     <Item name="" identifier="chemicalcrate" tags="crate,allowcleanup" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" waterproof="true">
@@ -62,8 +62,8 @@
       <Sprite texture="containers.png" depth="0.54" sourcerect="562,467,148,87" origin="0.5,0.5" />
       <Body width="145" height="85" density="50" />
       <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-      <ItemContainer capacity="12" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-        <Containable items="smallitem" excludeditems="toolbox,cargoscooter" />
+      <ItemContainer capacity="26" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+        <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
     <Item name="" identifier="mediccrate" tags="crate,allowcleanup" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" waterproof="true">
@@ -77,8 +77,8 @@
       <Sprite texture="containers.png" depth="0.54" sourcerect="410,563,148,87" origin="0.5,0.5" />
       <Body width="145" height="85" density="50" />
       <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-      <ItemContainer capacity="12" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-        <Containable items="smallitem" excludeditems="toolbox,cargoscooter" />
+      <ItemContainer capacity="26" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+        <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
       </ItemContainer>
     </Item>
   </Items>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Xeno-Backpack/Xeno-Backpack.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Xeno-Backpack/Xeno-Backpack.xml
index cbc4e07d..feb8efa5 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Xeno-Backpack/Xeno-Backpack.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2613901395/Xeno-Backpack/Xeno-Backpack.xml	
@@ -2,7 +2,7 @@
 <Items>
   <Item name="" identifier="xeno-backpack" category="Equipment" tags="mediumitem,backpack" scale="0.4" fireproof="true" waterproof="true" description="" impactsoundtag="impact_metal_light">
     <Price baseprice="2600">
-      <Price locationtype="research" multiplier="1.25" minavailable="0" />
+      <Price locationtype="research" multiplier="3.75" minavailable="0" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="power-backpack" />
@@ -45,7 +45,7 @@
     <Body radius="45" width="34" density="15" />
     <Wearable slots="Bag" msg="ItemMsgEquipSelect">
       <sprite texture="%ModDir%/Xeno-Backpack/Xeno-Backpack.png" canbehiddenbyotherwearables="false" limb="Torso" inheritlimbdepth="true" hidelimb="false" inheritorigin="false" inherittexturescale="true" sourcerect="0,0,61,137" origin="1.1,0.5">
-        <LightComponent range="1000.0" lightcolor="0,200,255,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="4000" lightcolor="0,200,255,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true" comparison="Or">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -71,8 +71,8 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,0" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use">
       <Upgrade gameversion="0.1401.0.0" msg="ItemMsgPickUpUse" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="64" hideitems="true">
-      <Containable items="ammobox,smallitem,mediumitem,weapon,gun,mobilebattery,ek_laserpistol_mag,ek_laserrifle_mag,ek_alienrifle_mag,40kloadable,40kammo,halo_fluorescentrod,halo_magazine,mcbatteryrod,marinebatteryrod,geneticmaterial,ehaammo" excludeditems="backpack" />
+    <ItemContainer capacity="1" maxstacksize="128" hideitems="true">
+      <Containable items="ammobox,smallitem,mediumitem,weapon,gun,mobilebattery,ek_laserpistol_mag,ek_laserrifle_mag,ek_alienrifle_mag,40kloadable,40kammo,halo_fluorescentrod,halo_magazine,mcbatteryrod,marinebatteryrod,geneticmaterial,ehaammo,deepdiving,largeitem" />
       <SlotIcon slotindex="0" texture="%ModDir%/Icons/Xeno.png" origin="0.5,0.5" />
     </ItemContainer>
   </Item>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2651492771/Items/Command/command.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2651492771/Items/Command/command.xml
index 466ba589..adbd86e2 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2651492771/Items/Command/command.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2651492771/Items/Command/command.xml	
@@ -15,11 +15,11 @@
         <MaintainPosIndicator texture="Content/Items/Command/NavUI.png" sourcerect="50,0,60,61" />
         <MaintainPosOriginIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,0,50,54" />
         <SteeringIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,135,362,16" origin="0,0.5" />
-        <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+        <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
           <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
           <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,0,384,304" origin="0.5,0.5" alpha="1.0" />
         </LightComponent>
-        <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" blinkfrequency="1" allowingameediting="false">
+        <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" blinkfrequency="1" allowingameediting="false">
           <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
           <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="400,0,384,304" origin="0.5,0.5" alpha="1.0" />
         </LightComponent>
@@ -100,7 +100,7 @@
       <Sprite texture="Content/Items/Command/CommandDevices.png" depth="0.8" sourcerect="400,0,288,240" origin="0.5,0.5" />
       <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,256,288,240" depth="0.8" maxcondition="80" fadein="true" origin="0.5,0.5" />
       <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,512,288,240" depth="0.8" maxcondition="0" origin="0.5,0.5" />
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="256,320,288,240" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
@@ -249,7 +249,7 @@
       <Sprite texture="Content/Items/Command/CommandDevices.png" sourcerect="720,0,160,128" depth="0.8" origin="0.5,0.5" />
       <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="720,144,160,128" depth="0.8" maxcondition="80" fadein="true" origin="0.5,0.5" />
       <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="720,288,160,128" depth="0.8" maxcondition="0" origin="0.5,0.5" />
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,320,160,128" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/CreatureLoot/creatureloot.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/CreatureLoot/creatureloot.xml
index 4b607d4f..75a1e805 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/CreatureLoot/creatureloot.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/CreatureLoot/creatureloot.xml	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
   <Items>
-    <Item name="" identifier="alienblood" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" RequireAimToUse="True">
+    <Item name="" identifier="alienblood" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-      <PreferredContainer secondary="storageorgan" minamount="1" maxamount="2" spawnprobability="1" />
+      <PreferredContainer secondary="storageorgan" minamount="2" maxamount="4" spawnprobability="1" />
       <Price baseprice="100" sold="false">
-        <Price storeidentifier="merchantoutpost" multiplier="0.85" />
-        <Price storeidentifier="merchantcity" multiplier="0.85" />
-        <Price storeidentifier="merchantresearch" sold="true" multiplier="1.2" minavailable="2" />
-        <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-        <Price storeidentifier="merchantmine" multiplier="0.85" />
+        <Price storeidentifier="merchantoutpost" multiplier="2.55" />
+        <Price storeidentifier="merchantcity" multiplier="2.55" />
+        <Price storeidentifier="merchantresearch" sold="true" multiplier="3.6" minavailable="6" />
+        <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+        <Price storeidentifier="merchantmine" multiplier="2.55" />
       </Price>
       <SuitableTreatment type="bloodloss" suitability="10" />
       <SuitableTreatment type="psychosis" suitability="-45" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Electricity/poweritems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Electricity/poweritems.xml
index 7dcb2bf8..276f2ce1 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Electricity/poweritems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Electricity/poweritems.xml	
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
-  <Item name="" identifier="batterycell" category="Equipment,Electrical" maxstacksize="32" tags="smallitem,loadable,mobilebattery" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="batterycell" category="Equipment,Electrical" maxstacksize="64" tags="smallitem,loadable,mobilebattery" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="batterycellrecharger" maxcondition="80" />
-    <PreferredContainer primary="stunbaton,underwaterscooter,handheldsonar,sonarbeacon,flashlight,portablepump,poweredcontainer" spawnprobability="1.0" mincondition="25" />
-    <PreferredContainer secondary="divingcab" amount="3" spawnprobability="1" notcampaign="true" />
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab,outpostengcab" minamount="1" maxamount="2" spawnprobability="0.1" />
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="stunbaton,underwaterscooter,handheldsonar,sonarbeacon,flashlight,portablepump,poweredcontainer" spawnprobability="1" mincondition="25" />
+    <PreferredContainer secondary="divingcab" amount="6" spawnprobability="1" notcampaign="true" />
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab,outpostengcab" minamount="2" maxamount="4" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.2" />
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <Price baseprice="125" minavailable="7">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantcity" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" minavailable="6" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="6" />
+    <Price baseprice="125" minavailable="21">
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchantcity" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" minavailable="18" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="18" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="zinc" />
@@ -34,19 +34,19 @@
       <QualityStat stattype="Condition" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="fulguriumbatterycell" category="Equipment,Electrical" maxstacksize="32" tags="smallitem,loadable,mobilebattery" health="200" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fulguriumbatterycell" category="Equipment,Electrical" maxstacksize="64" tags="smallitem,loadable,mobilebattery" health="200" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="batterycellrecharger" maxcondition="80" />
-    <PreferredContainer primary="stunbaton,underwaterscooter,handheldsonar,sonarbeacon,flashlight,portablepump,poweredcontainer" spawnprobability="1.0" mincondition="25" />
+    <PreferredContainer primary="stunbaton,underwaterscooter,handheldsonar,sonarbeacon,flashlight,portablepump,poweredcontainer" spawnprobability="1" mincondition="25" />
     <PreferredContainer secondary="divingcab,engcab,reactorcab" />
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.05" />
-    <Price baseprice="250" minavailable="1" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.25" />
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.1" />
+    <Price baseprice="250" minavailable="3" minleveldifficulty="15">
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.75" />
       <Price storeidentifier="merchantcity" />
-      <Price storeidentifier="merchantresearch" minavailable="2" />
+      <Price storeidentifier="merchantresearch" minavailable="6" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="zinc" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Electricity/signalitems.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Electricity/signalitems.xml
index 14bbd47b..1ad0d058 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Electricity/signalitems.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Electricity/signalitems.xml	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
-  <Item name="" identifier="wire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="32" spritecolor="210,215,218,255" InventoryIconColor="210,215,218,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="wire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="64" spritecolor="210,215,218,255" InventoryIconColor="210,215,218,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1" />
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,64,64,64" origin="0.5,0.5" />
     <Sprite texture="signalcomp.png" depth="0.8" sourcerect="169,224,84,32" origin="0.5,0.5" />
@@ -18,17 +18,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="redwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="32" spritecolor="254,23,17,255" InventoryIconColor="254,23,17,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="redwire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="64" spritecolor="254,23,17,255" InventoryIconColor="254,23,17,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1" />
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -40,17 +40,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="bluewire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="32" spritecolor="51,121,173,255" InventoryIconColor="51,121,173,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="bluewire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="64" spritecolor="51,121,173,255" InventoryIconColor="51,121,173,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1" />
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -62,17 +62,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="orangewire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="32" spritecolor="255,140,13,255" InventoryIconColor="255,140,13,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="orangewire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="64" spritecolor="255,140,13,255" InventoryIconColor="255,140,13,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1" />
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -84,17 +84,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="greenwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="32" spritecolor="56,143,111,255" InventoryIconColor="56,143,111,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="greenwire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="64" spritecolor="56,143,111,255" InventoryIconColor="56,143,111,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1" />
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -106,17 +106,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="blackwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="32" spritecolor="50,50,50,255" InventoryIconColor="50,50,50,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="blackwire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="64" spritecolor="50,50,50,255" InventoryIconColor="50,50,50,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1" />
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -128,17 +128,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="brownwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="32" spritecolor="123,77,62,255" InventoryIconColor="123,77,62,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="brownwire" category="Electrical" Tags="smallitem,wire" maxstacksize="64" maxstacksizecharacterinventory="64" spritecolor="123,77,62,255" InventoryIconColor="123,77,62,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1" />
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -150,17 +150,17 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="fpgacircuit" category="Electrical" Tags="smallitem,signal" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fpgacircuit" category="Electrical" Tags="smallitem,signal" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="80">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" />
     </Price>
     <PreferredContainer primary="engcab" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="5">
       <Item identifier="copper" />
     </Deconstruct>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Gardening/growableplants.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Gardening/growableplants.xml
index 4bf0e5d6..cc767396 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Gardening/growableplants.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Gardening/growableplants.xml	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
   <!-- -->
-  <Item name="" identifier="creepingorangevineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="32" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="255,54,0,255">
+  <Item name="" identifier="creepingorangevineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="64" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="255,54,0,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="830,636,31,30" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -48,16 +48,16 @@
       <Growable growthspeed="0.070" hardiness="0.15" floodtolerance="0.4" productrate="0.022" />
     </Upgrade>
   </Item>
-  <Item name="" identifier="tobaccovineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="32" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="48,122,245,255">
+  <Item name="" identifier="tobaccovineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="64" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="48,122,245,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="863,636,30,31" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -94,16 +94,16 @@
       <Growable growthspeed="0.065" hardiness="0.071" floodtolerance="0.5" productrate="0.0056" />
     </Upgrade>
   </Item>
-  <Item name="" identifier="saltvineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="32" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
+  <Item name="" identifier="saltvineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="64" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="829,666,33,35" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -140,16 +140,16 @@
       <Growable growthspeed="0.076" hardiness="0.162" floodtolerance="0.2" productrate="0.0056" />
     </Upgrade>
   </Item>
-  <Item name="" identifier="raptorbaneseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="32" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="238,36,98,255">
+  <Item name="" identifier="raptorbaneseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="64" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="238,36,98,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="863,668,30,33" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.25" />
     </Price>
     <Deconstruct time="30">
       <Item identifier="carbon" mincondition="0.5" />
@@ -187,17 +187,17 @@
       <Growable growthspeed="0.065" hardiness="0.062" floodtolerance="0.4" productrate="0.022" />
     </Upgrade>
   </Item>
-  <Item name="" identifier="banana" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="32" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
+  <Item name="" identifier="banana" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="64" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
     <!-- TODO: sprite -->
     <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="263,193,38,39" depth="0.2" origin="0.5,0.5" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.06" />
     <Price baseprice="50" canbespecial="false">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="5" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="9" maxavailable="5" sold="true">
         <Reputation faction="clowns" min="50" />
       </Price>
     </Price>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Gardening/plantproducts.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Gardening/plantproducts.xml
index 453a3418..1be22795 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Gardening/plantproducts.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Gardening/plantproducts.xml	
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
-  <Item name="" identifier="creepingorange" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="creepingorange" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="971,649,43,55" origin="0.5,0.5" />
     <Body radius="30" density="9" />
     <Price baseprice="20" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="30" fabricationlimitmin="3" fabricationlimitmax="5" />
     <Deconstruct time="35">
@@ -31,15 +31,15 @@
     <PreferredContainer primary="plantcontainer" />
     <PreferredContainer secondary="medfabcab,storagecab" />
   </Item>
-  <Item name="" identifier="tobaccobud" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,plantitem" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="tobaccobud" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,plantitem" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="904,646,56,61" origin="0.5,0.5" />
     <Body radius="30" density="9" waterdragcoefficient="20" />
     <Price baseprice="40" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="35">
       <Item identifier="carbon" mincondition="0.5" />
@@ -59,7 +59,7 @@
     <PreferredContainer primary="plantcontainer" />
     <PreferredContainer secondary="medfabcab,storagecab" />
   </Item>
-  <Item name="" identifier="badraptorbane" descriptionidentifier="raptorbane" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="badraptorbane" descriptionidentifier="raptorbane" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="907,838,44,50" origin="0.5,0.5" />
     <Body radius="30" density="9" />
     <Deconstruct time="35">
@@ -92,15 +92,15 @@
     <PreferredContainer primary="plantcontainer" />
     <PreferredContainer secondary="storagecab" />
   </Item>
-  <Item name="" identifier="saltbulb" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,plantitem,explodesinwater" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="saltbulb" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,plantitem,explodesinwater" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="968,712,49,55" origin="0.5,0.5" />
     <Body radius="30" density="9" />
     <Price baseprice="65" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="35">
       <Item identifier="sodium" />
@@ -129,15 +129,15 @@
     <PreferredContainer primary="plantcontainer" />
     <PreferredContainer secondary="storagecab" />
   </Item>
-  <Item name="" identifier="raptorbane" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="raptorbane" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="971,777,44,50" origin="0.5,0.5" />
     <Body radius="30" density="9" waterdragcoefficient="10" />
     <Price baseprice="40" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.8" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.4" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="35">
       <Item identifier="carbon" mincondition="0.5" />
@@ -158,7 +158,7 @@
     <PreferredContainer primary="plantcontainer" />
     <PreferredContainer secondary="storagecab" />
   </Item>
-  <Item name="" identifier="badcreepingorange" descriptionidentifier="creepingorange" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="5.5" allowasextracargo="true">
+  <Item name="" identifier="badcreepingorange" descriptionidentifier="creepingorange" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="5.5" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="971,835,43,55" origin="0.5,0.5" />
     <Body radius="30" density="9" />
     <Deconstruct time="35">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/captain_talent_items.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/captain_talent_items.xml
index e2eedb33..f904adf8 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/captain_talent_items.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/captain_talent_items.xml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
-  <Item name="" identifier="handcannonround" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="32" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" Scale="0.5" tags="smallitem,handcannonammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="handcannonround" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="64" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" Scale="0.5" tags="smallitem,handcannonammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="secarmcab" secondary="armcab" />
-    <PreferredContainer primary="handcannon" amount="6" spawnprobability="1.0" />
-    <PreferredContainer secondary="wrecksecarmcab" minamount="1" maxamount="6" spawnprobability="0.02" />
+    <PreferredContainer primary="handcannon" amount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab" minamount="2" maxamount="12" spawnprobability="0.04" />
     <Price baseprice="50" sold="false" />
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="6">
       <RequiredSkill identifier="weapons" level="45" />
@@ -33,10 +33,10 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Rum name="" identifier="rum" category="Medical,Misc" maxstacksize="32" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.01" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true" />
+  <Rum name="" identifier="rum" category="Medical,Misc" maxstacksize="64" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true" />
     <PreferredContainer primary="medfabcab" secondary="medcab" />
     <Price baseprice="130" sold="false">
       <Price storeidentifier="merchantclown" minavailable="0" maxavailable="3">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/engineer_talent_items.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/engineer_talent_items.xml
index 13c38cd9..da74e0cb 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/engineer_talent_items.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/engineer_talent_items.xml	
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
-  <Item name="" identifier="depletedfuel" category="Fuel,Material" maxstacksize="32" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="depletedfuel" category="Fuel,Material" maxstacksize="64" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="reactorcab" />
     <Price baseprice="75" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="15" requiresrecipe="true">
       <RequiredSkill identifier="electrical" level="35" />
@@ -42,14 +42,14 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="fulguriumfuelrodvolatile" category="Fuel" Tags="smallitem,reactorfuel" maxstacksize="32" allowasextracargo="true" cargocontaineridentifier="metalcrate" health="400" scale="0.5">
+  <Item name="" identifier="fulguriumfuelrodvolatile" category="Fuel" Tags="smallitem,reactorfuel" maxstacksize="64" allowasextracargo="true" cargocontaineridentifier="metalcrate" health="400" scale="0.5">
     <PreferredContainer primary="reactorcab" />
     <Price baseprice="400" sold="false" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="steel" />
@@ -73,14 +73,14 @@
     <InventoryIcon texture="Content/Items/JobGear/TalentGear.png" sourcerect="67,176,62,61" origin="0.5,0.5" />
     <Sprite texture="Content/Items/JobGear/TalentGear.png" depth="0.55" sourcerect="190,60,20,71" origin="0.5,0.5" />
     <Body radius="6" height="55" density="30" />
-    <LightComponent allowingameediting="false" lightcolor="60,200,150,150" canbeselected="false" range="300.0" ison="true" />
+    <LightComponent allowingameediting="false" lightcolor="60,200,150,150" canbeselected="false" range="1200" ison="true" />
     <Holdable handle1="0,0" slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect">
       <StatusEffect type="Always" target="NearbyCharacters" range="125" interval="1" disabledeltatime="true">
         <Affliction identifier="radiationsickness" strength="1" />
       </StatusEffect>
     </Holdable>
     <ItemContainer hideitems="true" capacity="1" itemrotation="90" drawinventory="false" canbeselected="false" SpawnWithId="nucleargunbolt" removecontaineditemsondeconstruct="true" showcontainedstateindicator="false">
-      <Containable items="nucleargunbolt" />
+      <Containable items="nucleargunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-20" disabledeltatime="true">
         <SpawnItem identifiers="nucleargunbolt" spawnposition="ThisInventory" />
       </StatusEffect>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/medic_talent_items.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/medic_talent_items.xml
index d74586fe..575dd1c4 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/medic_talent_items.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/medic_talent_items.xml	
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
-  <Item name="" identifier="combatstimulantsyringe" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="combatstimulantsyringe" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab" />
     <Price baseprice="340" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="55" requiresrecipe="true">
       <RequiredSkill identifier="medical" level="40" />
@@ -51,14 +51,14 @@
     <Projectile characterusable="false" launchimpulse="18.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon" inheritrequiredskillsfrom="MeleeWeapon" />
     <SkillRequirementHint identifier="medical" level="35" />
   </Item>
-  <Item name="" identifier="pressurestabilizer" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="pressurestabilizer" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab" />
     <Price baseprice="200" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="20" requiresrecipe="true">
       <RequiredSkill identifier="medical" level="40" />
@@ -99,13 +99,13 @@
     <Projectile characterusable="false" launchimpulse="18.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon" inheritrequiredskillsfrom="MeleeWeapon" />
     <SkillRequirementHint identifier="medical" level="35" />
   </Item>
-  <Item name="" identifier="endocrinebooster" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="endocrinebooster" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab" />
     <Price baseprice="1400" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="50" amount="1" requiresrecipe="true">
@@ -153,16 +153,16 @@
     <Projectile characterusable="false" launchimpulse="18.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon" inheritrequiredskillsfrom="MeleeWeapon" />
     <SkillRequirementHint identifier="medical" level="60" />
   </Item>
-  <Item name="" identifier="sulphuricacidsyringe" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Item name="" identifier="sulphuricacidsyringe" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer secondary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer" />
     <Price baseprice="160" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" amount="2" requiredtime="5" requiresrecipe="true">
       <RequiredSkill identifier="medical" level="30" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/securityofficer_talent_items.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/securityofficer_talent_items.xml
index 05089395..439f7216 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/securityofficer_talent_items.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Jobgear/securityofficer_talent_items.xml	
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
-  <Item name="" identifier="assaultriflemagazine" maxstacksize="32" maxstacksizecharacterinventory="4" scale="0.5" category="Weapon" allowasextracargo="true" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,assaultrifleammo,handheldammo" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="assaultrifle" minamount="1" maxamount="1" spawnprobability="1" />
+  <Item name="" identifier="assaultriflemagazine" maxstacksize="64" maxstacksizecharacterinventory="8" scale="0.5" category="Weapon" allowasextracargo="true" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,assaultrifleammo,handheldammo" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="assaultrifle" minamount="2" maxamount="2" spawnprobability="1" />
     <PreferredContainer primary="armcab" secondary="secarmcab" />
     <Price baseprice="300" sold="false" minleveldifficulty="60" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="0" maxavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="0" maxavailable="4" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="35" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="40" />
@@ -33,21 +33,21 @@
     <Sprite texture="Content/Items/JobGear/TalentGear.png" sourcerect="476,3,36,48" depth="0.55" origin="0.5,0.5" />
     <Body width="28" height="40" density="25" />
     <ItemContainer hideitems="true" capacity="1" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true" SpawnWithId="assaultrifleround" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
-      <Containable items="assaultrifleround" />
+      <Containable items="assaultrifleround,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-3.3" disabledeltatime="true">
         <SpawnItem identifiers="assaultrifleround" spawnposition="ThisInventory" />
       </StatusEffect>
     </ItemContainer>
     <Holdable canBeCombined="true" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
   </Item>
-  <Item name="" identifier="shotgunslugexplosive" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="32" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="shotgunslugexplosive" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="64" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="armcab" secondary="secarmcab" />
     <Price baseprice="75" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="5"></Deconstruct>
     <Fabricate suitablefabricators="fabricator" requiredtime="10" requiresrecipe="true" amount="6">
@@ -77,14 +77,14 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="stungundartfulgurium" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="32" interactthroughwalls="true" allowasextracargo="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="stungundartfulgurium" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="64" interactthroughwalls="true" allowasextracargo="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="armcab" secondary="secarmcab" />
     <Price baseprice="120" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="25" amount="2" requiresrecipe="true">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/materials.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/materials.xml
index 6e61d1ee..979fe898 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/materials.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/materials.xml	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- I CAN IMPORT ALL ITEMS FROM THE ORIGINAL FILE AND REPLACE 'maxstacksizecharacterinventory="8"' -->
+<!-- I CAN IMPORT ALL ITEMS FROM THE ORIGINAL FILE AND REPLACE 'maxstacksizecharacterinventory="16"' -->
 <Override>
   <!-- Elements ************************************************************************************************ -->
-  <Item name="" identifier="carbon" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="carbon" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="10" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="384,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="5,55,46,38" depth="0.55" origin="0.5,0.5" />
@@ -22,15 +22,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="iron" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,munition_jacket,petfood3,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="iron" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,munition_jacket,petfood3,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="8" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="5,92,46,38" depth="0.55" origin="0.5,0.5" />
@@ -60,15 +60,15 @@
     </Projectile>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="tin" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,petfood3" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="tin" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,petfood3" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="11" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="832,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="150,92,47,38" depth="0.55" origin="0.5,0.5" />
@@ -81,15 +81,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="lead" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,petfood3,munition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="lead" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,petfood3,munition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <Price baseprice="18" sold="true" minavailable="3">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" minavailable="20" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <Price baseprice="18" sold="true" minavailable="9">
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="768,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="101,92,47,38" depth="0.55" origin="0.5,0.5" />
@@ -119,15 +119,15 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="phosphorus" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="phosphorus" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="25" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="153,6,23,44" depth="0.55" origin="0.5,0.5" />
@@ -139,15 +139,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="copper" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,petfood3,munition_core,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="copper" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,petfood3,munition_core,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="22" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="576,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="53,92,48,38" depth="0.55" origin="0.5,0.5" />
@@ -160,15 +160,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="zinc" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="zinc" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="26" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="640,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="102,55,46,37" depth="0.55" origin="0.5,0.5" />
@@ -180,21 +180,21 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="sodium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="sodium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medfabcab" />
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="33" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="29,7,23,44" depth="0.55" origin="0.5,0.5" />
     <Body width="22" height="42" density="20" />
     <Holdable canBeCombined="true" removeOnCombined="true" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="100" IsOn="false">
+    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="400" IsOn="false">
       <StatusEffect type="OnActive" target="This" IsOn="false">
         <Conditional target="This" InWater="false" />
       </StatusEffect>
@@ -221,15 +221,15 @@
       </StatusEffect>
     </LightComponent>
   </Item>
-  <Item name="" identifier="silicon" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="silicon" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="17" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="960,128,64,64" />
     <Sprite texture="minerals.png" sourcerect="196,54,46,38" depth="0.55" origin="0.5,0.5" />
@@ -241,15 +241,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="calcium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="calcium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" secondary="medfabcab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="31" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="256,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="129,6,23,44" depth="0.55" origin="0.5,0.5" />
@@ -261,15 +261,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="aluminium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="aluminium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="42" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="53,53,47,39" depth="0.55" origin="0.5,0.5" />
@@ -282,15 +282,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="uranium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,advmunition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+  <Item name="" identifier="uranium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,advmunition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <PreferredContainer primary="storagecab" />
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="5" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="15" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="898,192,61,63" origin="0.5,0.5" />
     <Sprite texture="minerals.png" sourcerect="4,130,49,41" depth="0.55" origin="0.5,0.5" />
@@ -320,20 +320,20 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="potassium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="potassium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
     <Price baseprice="10" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="128,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="77,6,23,44" depth="0.55" origin="0.5,0.5" />
     <Body width="22" height="42" density="15" />
     <Holdable canBeCombined="true" removeOnCombined="true" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="100" IsOn="false">
+    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="400" IsOn="false">
       <StatusEffect type="OnActive" target="This" IsOn="false">
         <Conditional target="This" InWater="false" />
       </StatusEffect>
@@ -360,15 +360,15 @@
       </StatusEffect>
     </LightComponent>
   </Item>
-  <Item name="" identifier="titanium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,petfood3,advmunition_core,advmunition_tip" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="titanium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,petfood3,advmunition_core,advmunition_tip" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.04" />
     <Price baseprice="65" sold="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="9" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="150,55,46,37" depth="0.55" origin="0.5,0.5" />
@@ -381,15 +381,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="magnesium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="magnesium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="65">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="2.4" minavailable="18" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="192,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="102,6,23,44" depth="0.55" origin="0.5,0.5" />
@@ -401,21 +401,21 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="lithium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="lithium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="88" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="5" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="15" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="0,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="3,7,24,44" depth="0.55" origin="0.5,0.5" />
     <Body width="27" height="47" density="15" />
     <Holdable canBeCombined="true" removeOnCombined="true" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,0,0,255" Flicker="1.0" range="100" IsOn="false">
+    <LightComponent LightColor="255,0,0,255" Flicker="1.0" range="400" IsOn="false">
       <StatusEffect type="OnActive" target="This" IsOn="false">
         <Conditional target="This" InWater="false" />
       </StatusEffect>
@@ -442,15 +442,15 @@
       </StatusEffect>
     </LightComponent>
   </Item>
-  <Item name="" identifier="chlorine" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chlorine" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="11" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="0,256,64,64" />
     <Sprite texture="minerals.png" sourcerect="55,7,22,44" depth="0.6" origin="0.5,0.5" />
@@ -462,15 +462,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="thorium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="thorium" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.04" />
     <Price baseprice="125" sold="false" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="5" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.4" minavailable="15" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="960,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="54,131,46,39" depth="0.55" origin="0.5,0.5" />
@@ -483,15 +483,15 @@
     </Holdable>
   </Item>
   <!-- Compounds ************************************************************************************************ -->
-  <Item name="" identifier="steel" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,petfood3,munition_core,advmunition_core,advmunition_tip,scrapcannonammo" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="steel" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,petfood3,munition_core,advmunition_core,advmunition_tip,scrapcannonammo" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="28">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="7" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="10" />
-      <Price storeidentifier="merchantresearch" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="21" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="30" />
+      <Price storeidentifier="merchantresearch" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="45" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="60" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="20" />
@@ -530,15 +530,15 @@
     </Projectile>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="titaniumaluminiumalloy" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="titaniumaluminiumalloy" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.04" />
     <Price baseprice="150" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="9" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="30" />
@@ -560,15 +560,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="plastic" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="plastic" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="45">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="7" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="10" />
-      <Price storeidentifier="merchantresearch" minavailable="12" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="21" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="30" />
+      <Price storeidentifier="merchantresearch" minavailable="36" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="27" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="45" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="20" />
@@ -589,15 +589,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="ballisticfiber" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="ballisticfiber" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1" />
     <Price baseprice="160" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="6" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="40" />
@@ -618,15 +618,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="organicfiber" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+  <Item name="" identifier="organicfiber" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <PreferredContainer primary="medfabcab" />
     <Price baseprice="30">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantresearch" minavailable="7" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantresearch" minavailable="21" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,768,64,64" />
     <Sprite texture="minerals.png" sourcerect="178,8,42,45" depth="0.55" origin="0.5,0.5" />
@@ -638,15 +638,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="rubber" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="rubber" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.2" />
     <Price baseprice="20">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="9" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="13" />
-      <Price storeidentifier="merchantresearch" minavailable="7" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.9" minavailable="27" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="39" />
+      <Price storeidentifier="merchantresearch" minavailable="21" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="18" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="0,770,64,64" />
     <Sprite texture="minerals.png" sourcerect="133,221,35,32" depth="0.55" origin="0.5,0.5" />
@@ -658,15 +658,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="flashpowder" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,explosive" impacttolerance="8" useinhealthinterface="true" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="flashpowder" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,explosive" impacttolerance="8" useinhealthinterface="true" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="90">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="7" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="21" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Fabricate suitablefabricators="fabricator,medicalfabricator" requiredtime="5">
       <RequiredItem identifier="magnesium" />
@@ -696,9 +696,9 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="" identifier="scrap" sonarsize="2" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" aliases="scrap1,scrap2,scrap3,scrap4,scrap5,scrap6,scrap7,scrap8">
+  <Item name="" identifier="scrap" sonarsize="2" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" aliases="scrap1,scrap2,scrap3,scrap4,scrap5,scrap6,scrap7,scrap8">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,wreckreactorcab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="wreckstoragecab,wreckreactorcab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="1" />
     <Price baseprice="5" sold="false" />
     <Deconstruct time="10" chooserandom="true" amount="2">
       <Item identifier="iron" commonness="0.8" />
@@ -739,18 +739,18 @@
     </Projectile>
   </Item>
   <!-- ALIEN MATERIALS -->
-  <Item name="" identifier="incendium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="incendium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" sold="false" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" />
       <Price storeidentifier="merchantresearch" sold="true" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.7" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="260,835,53,61" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienMaterials.png" sourcerect="105,439,52,61" depth="0.55" origin="0.5,0.5" />
@@ -783,18 +783,18 @@
       <RequiredItem items="cuttingequipment" type="Equipped" />
     </LevelResource>
   </Item>
-  <Item name="" identifier="fulgurium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fulgurium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.3" minavailable="3" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="3" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="328,833,51,63" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienMaterials.png" sourcerect="186,351,59,67" depth="0.55" origin="0.5,0.5" />
@@ -815,18 +815,18 @@
       <RequiredItem items="cuttingequipment" type="Equipped" />
     </LevelResource>
   </Item>
-  <Item name="" identifier="physicorium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
+  <Item name="" identifier="physicorium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" sold="false" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" />
       <Price storeidentifier="merchantresearch" sold="true" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.7" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="70,835,52,59" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienMaterials.png" sourcerect="97,349,58,71" depth="0.55" origin="0.5,0.5" />
@@ -847,18 +847,18 @@
       <RequiredItem items="cuttingequipment" type="Equipped" />
     </LevelResource>
   </Item>
-  <Item name="" identifier="dementonite" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
+  <Item name="" identifier="dementonite" category="Material,Alien" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" sold="false" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" />
       <Price storeidentifier="merchantresearch" sold="true" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="2.7" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="0,830,64,64" />
     <Sprite texture="Content/Items/Alien/AlienMaterials.png" sourcerect="15,356,60,54" depth="0.55" origin="0.5,0.5" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/medmaterials.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/medmaterials.xml
index 4cce994e..0d1cb3b2 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/medmaterials.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/medmaterials.xml	
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- I CAN IMPORT ALL ITEMS FROM THIS FILE FROM THE GAME AND REPLACE 'maxstacksizecharacterinventory="8"' -->
+<!-- I CAN IMPORT ALL ITEMS FROM THIS FILE FROM THE GAME AND REPLACE 'maxstacksizecharacterinventory="16"' -->
 <Override>
-  <Item name="" identifier="fiberplant" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="fiberplant" category="Material" Tags="smallitem,plant" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="100">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="organicfiber" />
@@ -18,7 +18,7 @@
     </Deconstruct>
     <!--   <InventoryIcon texture="Content/Items/Materials/Minerals.png" sourcerect="0,0,108,166" -->
     <ContainedSprite texture="Content/Items/Materials/Minerals.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="257,0,96,128" origin="0.5,0.5" />
-    <LightComponent lightcolor="208,139,211,150" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="208,139,211,150" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Sprite texture="Content/Items/Materials/Minerals.png" depth="0.2" sourcerect="545,386,54,78" origin="0.5,0.5" />
@@ -43,18 +43,18 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="elastinplant" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="elastinplant" category="Material" Tags="smallitem,plant" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="139,211,197,100" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="139,211,197,100" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="elastin" />
@@ -84,18 +84,18 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="aquaticpoppy" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="aquaticpoppy" category="Material" Tags="smallitem,plant" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="139,211,197,100" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="139,211,197,100" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="opium" />
@@ -123,18 +123,18 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="yeastshroom" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="yeastshroom" category="Material" Tags="smallitem,plant" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="112,174,199,150" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="112,174,199,150" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="200">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="ethanol" />
@@ -161,18 +161,18 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="slimebacteria" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="slimebacteria" category="Material" Tags="smallitem,plant" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="222,153,79,150" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="222,153,79,150" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.9" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="antibiotics" />
@@ -199,15 +199,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="paralyxis" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,ore" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
+  <Item name="" identifier="paralyxis" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,ore" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.1" />
     <Price baseprice="190" sold="false" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="1.25" />
-      <Price storeidentifier="merchantcity" multiplier="1.15" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.75" />
+      <Price storeidentifier="merchantcity" multiplier="3.45" />
       <Price storeidentifier="merchantresearch" sold="true" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="960,832,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienMaterials.png" sourcerect="266,430,45,76" depth="0.55" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/minerals.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/minerals.xml
index 5cc62b36..3b02ae3d 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/minerals.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Materials/minerals.xml	
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- I CAN IMPORT ALL ITEMS FROM THE ORIGINAL FILE AND REPLACE 'maxstacksizecharacterinventory="8"' -->
+<!-- I CAN IMPORT ALL ITEMS FROM THE ORIGINAL FILE AND REPLACE 'maxstacksizecharacterinventory="16"' -->
 <!-- EXCLUDE 'piezocrystal' AT THE BOTTOM OF THE ORIGINAL FILE -->
 <Override>
-  <Item name="" identifier="titanite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="titanite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="1" />
     <Price baseprice="250" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titanium" />
@@ -20,7 +20,7 @@
       <Item identifier="iron" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,730,86,147" origin="0.5,0.5" />
@@ -43,23 +43,23 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="brockite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="brockite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="1" />
     <Price baseprice="150" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="phosphorus" />
       <Item identifier="thorium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="178,108,109,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="178,108,109,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,731,86,147" origin="0.5,0.5" />
@@ -82,21 +82,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="thorianite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="thorianite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="300" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="thorium" />
       <Item identifier="thorium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="85,877,88,147" origin="0.5,0.5" />
@@ -119,16 +119,16 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="amblygonite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="amblygonite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="1" />
     <Price baseprice="200" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lithium" />
@@ -136,7 +136,7 @@
       <Item identifier="sodium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="211,189,89,120" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="211,189,89,120" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.5" sourcerect="0,5,84,144" origin="0.5,0.5" />
@@ -159,14 +159,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="sphalerite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="sphalerite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="zinc" />
@@ -174,7 +174,7 @@
       <Item identifier="zinc" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="196,196,196,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="196,196,196,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="172,585,84,147" origin="0.5,0.5" />
@@ -196,21 +196,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="pyromorphite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="pyromorphite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="30" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="chlorine" />
       <Item identifier="chlorine" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="115,154,127,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="115,154,127,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="853,292,86,147" origin="0.5,0.5" />
@@ -232,20 +232,20 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="quartz" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="quartz" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="silicon" />
       <Item identifier="silicon" />
     </Deconstruct>
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,585,86,147" origin="0.5,0.5" />
@@ -268,21 +268,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="diamond" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="diamond" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="30" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="carbon" />
       <Item identifier="carbon" />
       <Item identifier="carbon" />
     </Deconstruct>
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="938,0,86,147" origin="0.5,0.5" />
@@ -305,14 +305,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="hydroxyapatite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="hydroxyapatite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calcium" />
@@ -320,7 +320,7 @@
       <Item identifier="phosphorus" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="179,173,154,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="179,173,154,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="426,292,86,147" origin="0.5,0.5" />
@@ -343,14 +343,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="uraniumore" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="uraniumore" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="200" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="uranium" />
@@ -358,7 +358,7 @@
       <Item identifier="uranium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="83,160,100,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="83,160,100,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="768,731,86,147" origin="0.5,0.5" />
@@ -381,20 +381,20 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="ilmenite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ilmenite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="titanium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="117,143,123,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="117,143,123,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="597,292,84,147" origin="0.5,0.5" />
@@ -417,14 +417,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="stannite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="stannite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" />
@@ -432,7 +432,7 @@
       <Item identifier="tin" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="766,883,88,133" origin="0.5,0.5" />
@@ -455,21 +455,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="chalcopyrite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chalcopyrite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="60" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" />
       <Item identifier="copper" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="162,135,83,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="162,135,83,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,438,86,148" origin="0.5,0.5" />
@@ -491,14 +491,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="esperite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="esperite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="zinc" />
@@ -523,21 +523,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="galena" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="galena" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" />
     <Price baseprice="70" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lead" />
       <Item identifier="lead" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="117,139,162,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="117,139,162,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="341,877,86,147" origin="0.5,0.5" />
@@ -559,20 +559,20 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="triphylite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="triphylite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="lithium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="127,174,170,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="127,174,170,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="256,0,86,147" origin="0.5,0.5" />
@@ -594,14 +594,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="langbeinite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="langbeinite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="200" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="potassium" />
@@ -609,7 +609,7 @@
       <Item identifier="magnesium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="150,125,105,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="150,125,105,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,146,86,147" origin="0.5,0.5" />
@@ -632,14 +632,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="chamosite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chamosite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="130" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" />
@@ -648,7 +648,7 @@
       <Item identifier="aluminium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="69,158,142,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="69,158,142,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="341,438,86,148" origin="0.5,0.5" />
@@ -671,14 +671,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="ironore" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ironore" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="25" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" />
@@ -687,7 +687,7 @@
       <Item identifier="iron" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,438,86,148" origin="0.5,0.5" />
@@ -710,21 +710,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="polyhalite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="polyhalite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="potassium" />
       <Item identifier="calcium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="134,99,88" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="134,99,88" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="768,146,86,147" origin="0.5,0.5" />
@@ -747,21 +747,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="graphite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="graphite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="25" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="carbon" />
       <Item identifier="carbon" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,0,86,147" origin="0.5,0.5" />
@@ -784,14 +784,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="sylvite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="sylvite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="70" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sodium" />
@@ -799,7 +799,7 @@
       <Item identifier="potassium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,89,67,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,89,67,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="256,146,86,147" origin="0.5,0.5" />
@@ -822,21 +822,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="lazulite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="lazulite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="25" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="phosphorus" />
       <Item identifier="iron" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="88,121,142,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="88,121,142,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="341,731,86,147" origin="0.5,0.5" />
@@ -859,21 +859,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="bornite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="bornite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="60" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="copper" />
       <Item identifier="copper" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="119,82,124,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="119,82,124,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="853,438,86,148" origin="0.5,0.5" />
@@ -896,14 +896,14 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="cassiterite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="cassiterite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="40" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="tin" />
@@ -911,7 +911,7 @@
       <Item identifier="tin" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="153,82,66,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="153,82,66,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="597,877,84,147" origin="0.5,0.5" />
@@ -933,21 +933,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="cryolite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="cryolite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="80" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="sodium" />
       <Item identifier="sodium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,144,86,147" origin="0.5,0.5" />
@@ -970,21 +970,21 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="aragonite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="aragonite" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="80" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="calcium" />
       <Item identifier="calcium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="187,157,67,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="187,157,67,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,292,86,147" origin="0.5,0.5" />
@@ -1007,20 +1007,20 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="chrysoprase" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="32" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chrysoprase" category="Material" Tags="smallitem,ore" maxstacksize="64" maxstacksizecharacterinventory="64" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="40" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
-      <Price storeidentifier="merchantmine" multiplier="0.75" />
+      <Price storeidentifier="merchantmine" multiplier="2.25" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="silicon" amount="2" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="115,148,82,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="115,148,82,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="853,585,86,147" origin="0.5,0.5" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/buffs.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/buffs.xml
index 2a6751b0..c55b9f42 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/buffs.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/buffs.xml	
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- I CAN IMPORT ALL ITEMS FROM THE ORIGINAL FILE AND REPLACE 'maxstacksizecharacterinventory="8"' -->
+<!-- I CAN IMPORT ALL ITEMS FROM THE ORIGINAL FILE AND REPLACE 'maxstacksizecharacterinventory="16"' -->
 <!-- START WITH 'mindsense' FROM THE BOTTOM -->
 <Override>
   <Items>
     <!-- Name: Methamphetamine -->
     <!-- Description: A potent nervous system stimulant. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Methamphetamine name="" identifier="meth" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Methamphetamine name="" identifier="meth" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="medcab" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true" />
       <Price baseprice="50">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="3" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantnightclub" minavailable="4" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="9" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantnightclub" minavailable="12" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
         <RequiredSkill identifier="medical" level="30" />
@@ -80,18 +80,18 @@
     <!-- Name: Anabolic Steroids -->
     <!-- Description: Temporarily increases muscular strength and physical performance. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <AnabolicSteroids name="" identifier="steroids" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <AnabolicSteroids name="" identifier="steroids" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="medcab" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true" />
       <Price baseprice="350">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="2" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="3" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="3" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="6" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
         <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="45">
@@ -149,19 +149,19 @@
     <!-- Name: Hyperzine -->
     <!-- Description: An extremely potent muscle stimulant for those moments when you gotta go fast. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Hyperzine name="" identifier="hyperzine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Hyperzine name="" identifier="hyperzine" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="medcab" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true" />
-      <Price baseprice="450" minavailable="1">
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true" />
+      <Price baseprice="450" minavailable="3">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" sold="false" multiplier="0.9" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantnightclub" minavailable="3" />
+        <Price storeidentifier="merchantcity" sold="false" multiplier="2.7" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantnightclub" minavailable="9" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
         <RequiredSkill identifier="medical" level="40" />
@@ -224,21 +224,21 @@
     <!-- Medical alcohol used as an ingredient in the manufacture of various medicines. Drinking while on duty is not advised. 
        Pouring on skin treats mild infections yet causes small burns.-->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Ethanol name="" identifier="ethanol" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical,petfood2" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <Ethanol name="" identifier="ethanol" category="Medical,Material" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical,petfood2" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer primary="sprayer" amount="1" spawnprobability="1" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="2" spawnprobability="0.3" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true" />
+      <PreferredContainer primary="sprayer" amount="2" spawnprobability="1" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="4" spawnprobability="0.6" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
       <PreferredContainer primary="medfabcab" secondary="medcab" />
-      <Price baseprice="60" minavailable="6">
+      <Price baseprice="60" minavailable="18">
         <Price storeidentifier="merchantoutpost" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="8" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="10" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" multiplier="1.1" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="24" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="30" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" multiplier="3.3" />
         <Price storeidentifier="merchantclown" minavailable="0" maxavailable="2" />
-        <Price storeidentifier="merchantnightclub" minavailable="4" />
+        <Price storeidentifier="merchantnightclub" minavailable="12" />
       </Price>
       <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="80" fabricationlimitmin="5" fabricationlimitmax="10" />
       <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="256,768,64,64" origin="0.5,0.5" />
@@ -277,12 +277,12 @@
     <!-- Name: Energy Drink -->
     <!-- Applies heightened speed for a while, but also has a probability to cause nausea. Only at vending machines. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <EnergyDrink name="" identifier="energydrink" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <EnergyDrink name="" identifier="energydrink" category="Medical,Material" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="2" spawnprobability="0.15" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="4" spawnprobability="0.3" />
       <Price baseprice="40" sold="false">
-        <Price storeidentifier="merchantnightclub" minavailable="4" />
+        <Price storeidentifier="merchantnightclub" minavailable="12" />
       </Price>
       <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="40" fabricationlimitmin="5" fabricationlimitmax="10" />
       <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="64,768,64,64" origin="0.5,0.5" />
@@ -309,10 +309,10 @@
     <!-- Name: Protein bar -->
     <!-- Provides slow healing for damage and burns. Only at vending machines. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <ProteinBar name="" identifier="proteinbar" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <ProteinBar name="" identifier="proteinbar" category="Medical,Material" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="2" spawnprobability="0.15" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="4" spawnprobability="0.3" />
       <PreferredContainer primary="crewcab" />
       <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="40" fabricationlimitmin="5" fabricationlimitmax="10" />
       <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="0,768,64,64" origin="0.5,0.5" />
@@ -340,17 +340,17 @@
     <!-- Name: Mind Sense -->
     <!-- Gives the user temporarily the ability to highlight enemies, similar to Thermal Goggles -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <MindSense identifier="mindsense" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <MindSense identifier="mindsense" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
       <PreferredContainer primary="medcab" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-      <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+      <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true" />
       <Price baseprice="450" sold="false">
         <Price storeidentifier="merchantoutpost" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
-        <Price storeidentifier="merchantresearch" sold="true" maxavailable="1" mindifficulty="35" multiplier="0.9" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" multiplier="1.1" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
+        <Price storeidentifier="merchantresearch" sold="true" maxavailable="1" mindifficulty="35" multiplier="2.7" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" multiplier="3.3" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
         <RequiredSkill identifier="medical" level="40" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/medical.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/medical.xml
index c3ef0ec0..97bea9a1 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/medical.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/medical.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- I CAN IMPORT ALL ITEMS FROM THE ORIGINAL FILE AND REPLACE 'maxstacksizecharacterinventory="8"' -->
+<!-- I CAN IMPORT ALL ITEMS FROM THE ORIGINAL FILE AND REPLACE 'maxstacksizecharacterinventory="16"' -->
 <Override>
   <Items>
     <!-- ********************************************************************************************* -->
@@ -8,22 +8,22 @@
     <!-- Name: Bandage -->
     <!-- Description: Basic bandages, useful in the treatment of bleeding wounds and burns. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Bandage name="" identifier="antibleeding1" aliases="Bandage" category="Medical" Tags="smallitem,medical" maxstacksize="32" maxstacksizecharacterinventory="32" useinhealthinterface="true" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
+    <Bandage name="" identifier="antibleeding1" aliases="Bandage" category="Medical" Tags="smallitem,medical" maxstacksize="64" maxstacksizecharacterinventory="64" useinhealthinterface="true" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="supplycab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true" />
-      <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.3" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.8" />
-      <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.5" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="researchcontainer" spawnprobability="0.02" />
+      <PreferredContainer secondary="supplycab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" />
+      <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.6" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="1" />
+      <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="1" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="researchcontainer" spawnprobability="0.04" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
-      <Price baseprice="30" minavailable="25">
+      <Price baseprice="30" minavailable="75">
         <Price storeidentifier="merchantoutpost" />
         <Price storeidentifier="merchantcity" />
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="15" amount="2">
         <RequiredSkill identifier="medical" level="5" />
@@ -59,15 +59,15 @@
     <!-- Name: Plastiseal -->
     <!-- Description: A synthetic skin with hemostatic properties, able to quickly seal most wounds. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Plastiseal name="" identifier="antibleeding2" category="Medical" Tags="smallitem,medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
+    <Plastiseal name="" identifier="antibleeding2" category="Medical" Tags="smallitem,medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.4" />
-      <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.3" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="researchcontainer" spawnprobability="0.02" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.8" />
+      <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="0.6" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="researchcontainer" spawnprobability="0.04" />
       <Price baseprice="100">
-        <Price storeidentifier="merchantmedical" minavailable="12" />
+        <Price storeidentifier="merchantmedical" minavailable="36" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="25" amount="3">
         <RequiredSkill identifier="medical" level="16" />
@@ -105,14 +105,14 @@
     <!-- Description: An antibiotic glue with hemostatic properties. Seals bleeding wounds almost immediately and treats burns and infections very effectively. Use with care as it may cause mobile 
   clots in the bloodstream. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <AntibioticGlue name="" identifier="antibleeding3" category="Medical" Tags="smallitem,medical" maxstacksize="8" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <AntibioticGlue name="" identifier="antibleeding3" category="Medical" Tags="smallitem,medical" maxstacksize="16" maxstacksizecharacterinventory="2" MaxStackSizeHoldableOrWearableInventory="1" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.3" />
-      <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.05" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.6" />
+      <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.1" />
       <Price baseprice="190">
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="10" minleveldifficulty="25" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="30" minleveldifficulty="25" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="45" amount="1">
         <RequiredSkill identifier="medical" level="48" />
@@ -163,23 +163,23 @@
     <!-- Name: Morphine -->
     <!-- Description: A powerful opiate for treating pain associated with internal injuries, but will cause shortness of breath and eventual dependency with overuse. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Morphine name="" identifier="antidama1" aliases="Corrigodone" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Morphine name="" identifier="antidama1" aliases="Corrigodone" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="supplycab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true" notpvp="true" />
-      <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.3" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.8" />
-      <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.5" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="researchcontainer" spawnprobability="0.02" />
+      <PreferredContainer secondary="supplycab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true" />
+      <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.6" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="1" />
+      <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="1" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="researchcontainer" spawnprobability="0.04" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
-      <Price baseprice="100" minavailable="12">
+      <Price baseprice="100" minavailable="36">
         <Price storeidentifier="merchantoutpost" />
         <Price storeidentifier="merchantcity" />
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" />
       </Price>
       <SuitableTreatment type="damage" suitability="40" />
       <SuitableTreatment identifier="opiatewithdrawal" suitability="5" />
@@ -238,16 +238,16 @@
     <!-- Name: Fentanyl -->
     <!-- Description: A powerful opiate for treating pain associated with internal injuries, but will cause shortness of breath and eventual dependency with overuse. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Fentanyl name="" identifier="antidama2" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Fentanyl name="" identifier="antidama2" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.4" />
-      <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.3" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.05" />
-      <PreferredContainer secondary="researchcontainer" spawnprobability="0.02" />
-      <Price baseprice="190" minavailable="1">
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="12" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.8" />
+      <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="0.6" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.1" />
+      <PreferredContainer secondary="researchcontainer" spawnprobability="0.04" />
+      <Price baseprice="190" minavailable="3">
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="36" />
       </Price>
       <SuitableTreatment type="damage" suitability="75" />
       <SuitableTreatment identifier="opiateoverdose" suitability="-50" />
@@ -312,18 +312,18 @@
     <!-- Name: Pomegrenade Extract -->
     <!-- Description: A crappy but non lethal alternative to opiods, made from pomegrenades.-->
     <!-- *************************************************************************************************************************************************************************** -->
-    <pomegrenadeextract name="" identifier="pomegrenadeextract" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <pomegrenadeextract name="" identifier="pomegrenadeextract" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer primary="medcab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true" />
-      <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+      <PreferredContainer primary="medcab" minamount="4" maxamount="8" spawnprobability="1" notcampaign="true" notpvp="true" />
+      <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.4" />
       <PreferredContainer secondary="medcontainer" />
-      <Price baseprice="80" minavailable="4">
+      <Price baseprice="80" minavailable="12">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="1.2" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-        <Price storeidentifier="merchantmine" multiplier="0.75" />
+        <Price storeidentifier="merchantcity" multiplier="3.6" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+        <Price storeidentifier="merchantmine" multiplier="2.25" />
       </Price>
       <SuitableTreatment type="damage" suitability="8" />
       <SuitableTreatment type="burn" suitability="8" />
@@ -379,18 +379,18 @@
     <!-- Name: Saline -->
     <!-- Description: A sodium chloride infusion mildly useful in the treatment of blood loss. Small relief when used on infected tissue. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Saline name="" identifier="antibloodloss1" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1,petfood2,petfood3" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
+    <Saline name="" identifier="antibloodloss1" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1,petfood2,petfood3" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="3" spawnprobability="0.5" />
+      <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="6" spawnprobability="1" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
-      <Price baseprice="50" minavailable="12">
+      <Price baseprice="50" minavailable="36">
         <Price storeidentifier="merchantoutpost" />
         <Price storeidentifier="merchantcity" />
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="15" amount="2">
         <RequiredSkill identifier="medical" level="5" />
@@ -432,16 +432,16 @@
     <!-- Name: Blood Pack -->
     <!-- Description: A pack of blood substitute for the treatment of blood loss. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <BloodPack name="" identifier="antibloodloss2" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
+    <BloodPack name="" identifier="antibloodloss2" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer primary="medcab" minamount="2" maxamount="3" notcampaign="true" />
-      <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="2" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.05" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+      <PreferredContainer primary="medcab" minamount="4" maxamount="6" notcampaign="true" />
+      <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="4" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.1" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.4" />
       <PreferredContainer secondary="medcontainer" />
-      <PreferredContainer secondary="researchcontainer" spawnprobability="0.02" />
+      <PreferredContainer secondary="researchcontainer" spawnprobability="0.04" />
       <Price baseprice="240">
-        <Price storeidentifier="merchantmedical" multiplier="0.9" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" />
         <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="25" amount="2">
@@ -481,13 +481,13 @@
     <!-- Description: A highly potent stimulant effective in the treatment of internal damage, oxygen deprivation, blood loss and, to a lesser extent, bleeding. Produces mild burns as a side 
   effect. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Deusizine name="" identifier="deusizine" aliases="Auxiliriozine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Deusizine name="" identifier="deusizine" aliases="Auxiliriozine" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.2" />
-      <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.02" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.4" />
+      <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.04" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
       <Price baseprice="500">
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minleveldifficulty="50" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minleveldifficulty="50" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
         <RequiredSkill identifier="medical" level="70" />
@@ -585,18 +585,18 @@
     <!-- Name: Liquid Oxygenite -->
     <!-- Description: A mildly toxic solution that slowly releases oxygen into the bloodstream when injected. Avoid dropping. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <LiquidOxygenite name="" identifier="liquidoxygenite" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" impacttolerance="8" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <LiquidOxygenite name="" identifier="liquidoxygenite" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" impacttolerance="8" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <Price baseprice="80">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="4" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="9" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="12" />
         <Price storeidentifier="merchantmilitary" sold="false" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="4" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="2.7" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="12" />
       </Price>
       <PreferredContainer primary="medcab" secondary="medcontainer" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.1" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.2" />
       <SuitableTreatment identifier="organdamage" suitability="-30" />
       <SuitableTreatment identifier="oxygenlow" suitability="30" />
       <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,640,64,64" origin="0.5,0.5" />
@@ -622,20 +622,20 @@
     <!-- Name: Calyxanide -->
     <!-- An antiparasitic drug used in the treatment of husk parasite infections. Might require higher dosage to cure the infection at later stages. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Calyxanide name="" identifier="calyxanide" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Calyxanide name="" identifier="calyxanide" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.03" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.06" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
       <Price baseprice="510">
-        <Price storeidentifier="merchantoutpost" minavailable="5" />
-        <Price storeidentifier="merchantcity" minavailable="5" />
-        <Price storeidentifier="merchantresearch" minavailable="7" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="5" />
-        <Price storeidentifier="merchantmine" multiplier="1.1" minavailable="5" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="7" />
-        <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="5">
+        <Price storeidentifier="merchantoutpost" minavailable="15" />
+        <Price storeidentifier="merchantcity" minavailable="15" />
+        <Price storeidentifier="merchantresearch" minavailable="21" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="15" />
+        <Price storeidentifier="merchantmine" multiplier="3.3" minavailable="15" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="21" />
+        <Price storeidentifier="merchanthusk" minavailable="9" maxavailable="5">
           <Reputation faction="huskcult" min="30" />
         </Price>
       </Price>
@@ -704,19 +704,19 @@
     <!-- Name: Haloperidol -->
     <!-- A strong antipsychotic drug. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Haloperidol name="" identifier="antipsychosis" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Haloperidol name="" identifier="antipsychosis" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
-      <Price baseprice="130" minavailable="4">
+      <Price baseprice="130" minavailable="12">
         <Price storeidentifier="merchantoutpost" />
         <Price storeidentifier="merchantcity" />
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
         <RequiredSkill identifier="medical" level="21" />
@@ -767,14 +767,14 @@
     <!-- Name: Naloxone -->
     <!-- An opioid antagonist for the treatment of opiate-based withdrawal and overdose. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Naloxone name="" identifier="antinarc" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Naloxone name="" identifier="antinarc" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.5" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.2" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="1" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.4" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
-      <Price baseprice="100" minavailable="2">
-        <Price storeidentifier="merchantmedical" multiplier="0.9" />
+      <Price baseprice="100" minavailable="6">
+        <Price storeidentifier="merchantmedical" multiplier="2.7" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
         <RequiredSkill identifier="medical" level="23" />
@@ -827,12 +827,12 @@
     <!-- Name: Morbusine Antidote -->
     <!-- An antidote for acute morbusine poisoning. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <MorbusineAntidote name="" identifier="morbusineantidote" aliases="Morbusanide" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <MorbusineAntidote name="" identifier="morbusineantidote" aliases="Morbusanide" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+      <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
       <PreferredContainer secondary="medcontainer" />
       <Price baseprice="250" minleveldifficulty="15">
         <Price storeidentifier="merchantoutpost" />
@@ -840,7 +840,7 @@
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="2" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="6" />
         <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
@@ -887,12 +887,12 @@
     <!-- Name: Cyanide Antidote -->
     <!-- An antidote for acute cyanide poisoning. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <CyanideAntidote name="" identifier="cyanideantidote" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <CyanideAntidote name="" identifier="cyanideantidote" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+      <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
       <PreferredContainer secondary="medcontainer" />
       <Price baseprice="350" minleveldifficulty="15">
         <Price storeidentifier="merchantoutpost" />
@@ -900,7 +900,7 @@
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="2" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="6" />
         <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
@@ -947,12 +947,12 @@
     <!-- Name: Sufforin Antidote -->
     <!-- An antidote for acute sufforin poisoning. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <SufforinAntidote name="" identifier="sufforinantidote" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <SufforinAntidote name="" identifier="sufforinantidote" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+      <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
       <PreferredContainer secondary="medcontainer" />
       <Price baseprice="125" minleveldifficulty="15">
         <Price storeidentifier="merchantoutpost" />
@@ -960,7 +960,7 @@
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="2" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="6" />
         <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
@@ -1007,12 +1007,12 @@
     <!-- Name: Deliriumine Antidote -->
     <!-- An antidote for acute deliriumine poisoning. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <DeliriumineAntidote name="" identifier="deliriumineantidote" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <DeliriumineAntidote name="" identifier="deliriumineantidote" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+      <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
       <PreferredContainer secondary="medcontainer" />
       <Price baseprice="125" minleveldifficulty="15">
         <Price storeidentifier="merchantoutpost" />
@@ -1020,7 +1020,7 @@
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantmedical" minavailable="2" multiplier="0.9" />
+        <Price storeidentifier="merchantmedical" minavailable="2" multiplier="2.7" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
         <RequiredSkill identifier="medical" level="25" />
@@ -1066,11 +1066,11 @@
     <!-- Name: AntiRad -->
     <!-- Slows down cellular degradation caused by radiation. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <AntiRad name="" identifier="antirad" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <AntiRad name="" identifier="antirad" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-      <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+      <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
       <Price baseprice="125" minleveldifficulty="11">
         <Price storeidentifier="merchantoutpost" />
@@ -1078,7 +1078,7 @@
         <Price storeidentifier="merchantresearch" />
         <Price storeidentifier="merchantmilitary" />
         <Price storeidentifier="merchantmine" />
-        <Price storeidentifier="merchantmedical" minavailable="2" multiplier="0.9" />
+        <Price storeidentifier="merchantmedical" minavailable="2" multiplier="2.7" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
         <RequiredSkill identifier="medical" level="35" />
@@ -1124,20 +1124,20 @@
     <!-- Name: Paralysis Antidote -->
     <!-- An antidote for paralysis. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <ParalysisAntidote name="" identifier="antiparalysis" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <ParalysisAntidote name="" identifier="antiparalysis" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wrecksupplycab" amount="1" spawnprobability="0.3" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.8" />
-      <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-      <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+      <PreferredContainer secondary="wrecksupplycab" amount="2" spawnprobability="0.6" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="1" />
+      <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+      <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
       <PreferredContainer primary="medcab" secondary="medcontainer" />
       <Price baseprice="200" minleveldifficulty="15">
         <Price storeidentifier="merchantoutpost" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" multiplier="1.1" />
-        <Price storeidentifier="merchantmedical" minavailable="2" multiplier="0.9" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" multiplier="3.3" />
+        <Price storeidentifier="merchantmedical" minavailable="2" multiplier="2.7" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
         <RequiredSkill identifier="medical" level="24" />
@@ -1189,17 +1189,17 @@
     <!-- Name: Elastin -->
     <!-- A highly elastic, naturally occurring protein. Useful for crafting. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Elastin name="" identifier="elastin" category="Material" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,chem" cargocontaineridentifier="mediccrate" scale="0.5" impactsoundtag="impact_soft">
+    <Elastin name="" identifier="elastin" category="Material" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,chem" cargocontaineridentifier="mediccrate" scale="0.5" impactsoundtag="impact_soft">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-      <PreferredContainer primary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+      <PreferredContainer primary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
       <Price baseprice="40">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="8" />
-        <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="8" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="18" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="24" />
+        <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="24" />
       </Price>
       <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="772,771,52,59" origin="0.5,0.5" />
       <Sprite texture="Content/Items/Medical/Medicines.png" sourcerect="465,452,47,60" depth="0.6" origin="0.5,0.5" />
@@ -1214,19 +1214,19 @@
     <!-- Name: Opium -->
     <!-- A relatively mild opioid obtained from aquatic poppy. Most commonly used to manufacture morphine and fentanyl. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Opium name="" identifier="opium" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,chem" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
+    <Opium name="" identifier="opium" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,chem" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+      <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
       <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-      <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.2" />
+      <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.4" />
       <Price baseprice="40">
-        <Price storeidentifier="merchantoutpost" minavailable="4" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="8" />
-        <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="8" />
-        <Price storeidentifier="merchantnightclub" minavailable="4" />
+        <Price storeidentifier="merchantoutpost" minavailable="12" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="18" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="24" />
+        <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="24" />
+        <Price storeidentifier="merchantnightclub" minavailable="12" />
       </Price>
       <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="60" fabricationlimitmin="5" fabricationlimitmax="10" />
       <SuitableTreatment type="damage" suitability="20" />
@@ -1268,17 +1268,17 @@
     <!-- Name: Broad-spectrum Antibiotics -->
     <!-- An antibiotic that acts against a wide range of disease-causing bacteria, though with the side effect of internal damage and Alcohol Sensitivity. Used as an ingredient in many medical compounds. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Antibiotics name="" identifier="antibiotics" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,chem,medical,syringe" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
+    <Antibiotics name="" identifier="antibiotics" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,chem,medical,syringe" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+      <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
       <PreferredContainer primary="medfabcab" secondary="medcontainer" />
       <Price baseprice="40">
-        <Price storeidentifier="merchantoutpost" minavailable="6" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="12" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="10" />
-        <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="10" />
+        <Price storeidentifier="merchantoutpost" minavailable="18" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="36" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="30" />
+        <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="30" />
         <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2" />
       </Price>
       <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="60" fabricationlimitmin="5" fabricationlimitmax="10" />
@@ -1345,17 +1345,17 @@
     </Antibiotics>
     <!-- Name: Stabilozine -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Stabilozine name="" identifier="stabilozine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" tags="smallitem,chem,medical,syringe" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Stabilozine name="" identifier="stabilozine" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" tags="smallitem,chem,medical,syringe" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+      <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
       <PreferredContainer primary="medfabcab" secondary="medcontainer" />
       <Price baseprice="40">
-        <Price storeidentifier="merchantoutpost" minavailable="6" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" sold="false" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="15" />
-        <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="15" />
+        <Price storeidentifier="merchantoutpost" minavailable="18" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" sold="false" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="45" />
+        <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="45" />
       </Price>
       <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="384,640,64,64" origin="0.5,0.5" />
       <Sprite texture="Medicines.png" sourcerect="112,139,37,70" depth="0.6" origin="0.5,0.5" />
@@ -1398,17 +1398,17 @@
     <!-- Name: Adrenaline -->
     <!-- A naturally occurring hormone, useful as short-term treatment and prevention for stun, while also keeping the patient from falling to life-threatening unconsciousness. Can be used to manufacture medicine or combat stimulants. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Adrenaline name="" identifier="adrenaline" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Adrenaline name="" identifier="adrenaline" category="Medical,Material" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-      <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+      <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
       <Price baseprice="60">
-        <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.25" />
-        <Price storeidentifier="merchantcity" sold="false" multiplier="1.25" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="4" />
-        <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="4" />
+        <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.75" />
+        <Price storeidentifier="merchantcity" sold="false" multiplier="3.75" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="12" />
+        <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantmedical" multiplier="2.7" minavailable="12" />
       </Price>
       <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="129,448,62,64" origin="0.5,0.5" />
       <Sprite texture="Content/Items/Medical/Medicines.png" sourcerect="301,209,37,72" depth="0.6" origin="0.5,0.5" />
@@ -1439,22 +1439,22 @@
     <!-- Name: Tonic Liquid  -->
     <!-- Description: A medical solution that's mildly effective as a treatment for internal damage, but is more commonly used to increase the duration of performance enhancing drugs. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <TonicLiquid name="" identifier="tonicliquid" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.3" impactsoundtag="impact_metal_light">
+    <TonicLiquid name="" identifier="tonicliquid" category="Medical,Material" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.3" impactsoundtag="impact_metal_light">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.1" />
+      <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.2" />
       <SuitableTreatment type="damage" suitability="1" />
       <SuitableTreatment type="burn" suitability="-10" />
       <SuitableTreatment identifier="opiateoverdose" suitability="-10" />
       <SuitableTreatment identifier="oxygenlow" suitability="-10" />
       <SuitableTreatment identifier="opiatewithdrawal" suitability="-10" />
-      <Price baseprice="75" minavailable="3">
+      <Price baseprice="75" minavailable="9">
         <Price storeidentifier="merchantoutpost" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="7" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="10" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="8" />
-        <Price storeidentifier="merchantmine" multiplier="1.1" />
-        <Price storeidentifier="merchantnightclub" minavailable="1" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="21" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="30" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" minavailable="24" />
+        <Price storeidentifier="merchantmine" multiplier="3.3" />
+        <Price storeidentifier="merchantnightclub" minavailable="3" />
       </Price>
       <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="100" fabricationlimitmin="5" fabricationlimitmax="10" />
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="20" amount="2">
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/poisons.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/poisons.xml
index b1648d6e..64aeacf8 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/poisons.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Medical/poisons.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- I CAN IMPORT ALL ITEMS FROM THE ORIGINAL FILE AND REPLACE 'maxstacksizecharacterinventory="8"' -->
+<!-- I CAN IMPORT ALL ITEMS FROM THE ORIGINAL FILE AND REPLACE 'maxstacksizecharacterinventory="16"' -->
 <Override>
   <Items>
     <!-- ********************************************************************************************* -->
@@ -8,16 +8,16 @@
     <!-- Name: Morbusine -->
     <!-- Description: Causes oxygen deprivation. Kills relatively quickly, but not effective on bigger creatures -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Morbusine name="" identifier="morbusine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Morbusine name="" identifier="morbusine" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="toxcab" secondary="toxcontainer" />
-      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.02" />
-      <Price baseprice="200" minavailable="1">
+      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.04" />
+      <Price baseprice="200" minavailable="3">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
         <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="1">
           <Reputation faction="huskcult" min="50" />
         </Price>
@@ -74,16 +74,16 @@
     <!-- Name: Chloral Hydrate -->
     <!-- Description: A sedative that can be used to knock someone out for a short period of time. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <ChloralHydrate name="" identifier="chloralhydrate" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <ChloralHydrate name="" identifier="chloralhydrate" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="toxcab" secondary="toxcontainer" />
-      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
-      <Price baseprice="100" minavailable="1">
+      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.2" />
+      <Price baseprice="100" minavailable="3">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="6" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
         <RequiredSkill identifier="medical" level="50" />
@@ -131,16 +131,16 @@
     <!-- Name: Cyanide -->
     <!-- Description: Sudden death for normal characters. Works even on the strongest creatures, but it might take time. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Cyanide name="" identifier="cyanide" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Cyanide name="" identifier="cyanide" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="toxcab" secondary="toxcontainer" />
-      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-      <Price baseprice="250" minavailable="1">
+      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+      <Price baseprice="250" minavailable="3">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
         <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="1">
           <Reputation faction="huskcult" min="50" />
         </Price>
@@ -195,16 +195,16 @@
     <!-- Name: Radiotoxin -->
     <!-- Description: A highly potent neurotoxin. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Radiotoxin name="" identifier="radiotoxin" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Radiotoxin name="" identifier="radiotoxin" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="toxcab" secondary="toxcontainer" />
-      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-      <Price baseprice="200" minavailable="1">
+      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+      <Price baseprice="200" minavailable="3">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
         <RequiredSkill identifier="medical" level="56" />
@@ -250,16 +250,16 @@
     <!-- Name: Sufforin -->
     <!-- Description: disables slowly, makes very sick, eventually lethal. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Sufforin name="" identifier="sufforin" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Sufforin name="" identifier="sufforin" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="toxcab" secondary="toxcontainer" />
-      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-      <Price baseprice="100" minavailable="1">
+      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+      <Price baseprice="100" minavailable="3">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
         <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="1">
           <Reputation faction="huskcult" min="50" />
         </Price>
@@ -313,16 +313,16 @@
     <!-- Name: Deliriumine -->
     <!-- Description: A psychosis-inducing toxin. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Deliriumine name="" identifier="deliriumine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Deliriumine name="" identifier="deliriumine" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="toxcab" secondary="toxcontainer" />
-      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-      <Price baseprice="250" minavailable="1">
+      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+      <Price baseprice="250" minavailable="3">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="60" amount="2">
         <RequiredSkill identifier="medical" level="50" />
@@ -366,16 +366,16 @@
     <!-- Name: Paralyzant -->
     <!-- Description: slows down effectively, but doesn't kill. In high doses effective even on the biggest monsters.-->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Paralyzant name="" identifier="paralyzant" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Paralyzant name="" identifier="paralyzant" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="toxcab" secondary="toxcontainer" />
-      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-      <Price baseprice="380" minavailable="1">
+      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+      <Price baseprice="380" minavailable="3">
         <Price storeidentifier="merchantoutpost" sold="false" />
-        <Price storeidentifier="merchantcity" multiplier="0.9" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" />
-        <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+        <Price storeidentifier="merchantcity" multiplier="2.7" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" />
+        <Price storeidentifier="merchantmilitary" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
         <RequiredSkill identifier="medical" level="40" />
@@ -427,16 +427,16 @@
     <!-- Name: Raptor bane extract -->
     <!-- Description: Causes vomiting in humans, severely harms raptors. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <raptorbaneextract name="" identifier="raptorbaneextract" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <raptorbaneextract name="" identifier="raptorbaneextract" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
       <PreferredContainer primary="toxcab" secondary="toxcontainer" />
-      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-      <Price baseprice="250" minavailable="1">
-        <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantcity" multiplier="1.3" />
+      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+      <Price baseprice="250" minavailable="3">
+        <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantcity" multiplier="3.9" />
         <Price storeidentifier="merchantresearch" />
-        <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
-        <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
+        <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.3" />
+        <Price storeidentifier="merchantmine" sold="false" multiplier="3.3" />
       </Price>
       <Fabricate suitablefabricators="medicalfabricator" requiredtime="40">
         <RequiredSkill identifier="medical" level="20" />
@@ -491,9 +491,9 @@
     <!-- Name: Hallucinogenic Bufotoxin -->
     <!-- Description: A hallucinogenic toxin. Has an antiparalyzant effect. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <Bufotoxin name="" identifier="hallucinogenicbufotoxin" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <Bufotoxin name="" identifier="hallucinogenicbufotoxin" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <PreferredContainer primary="toxcab" secondary="toxcontainer" />
-      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
+      <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
       <Price baseprice="200" sold="false" />
       <Deconstruct time="20">
         <Item identifier="antibloodloss1" />
@@ -517,17 +517,17 @@
     <!-- Name: Sulphuric Acid -->
     <!-- A strong acid that causes burns when in contact with skin. Used as an ingredient in several poisons. -->
     <!-- *************************************************************************************************************************************************************************** -->
-    <SulphuricAcid name="" identifier="sulphuricacid" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="mediccrate" description="" Tags="smallitem,chem,poison" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+    <SulphuricAcid name="" identifier="sulphuricacid" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="mediccrate" description="" Tags="smallitem,chem,poison" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
       <Upgrade gameversion="0.10.0.0" scale="0.5" />
-      <PreferredContainer secondary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.5" />
+      <PreferredContainer secondary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="1" />
       <PreferredContainer primary="toxcab" secondary="toxcontainer" />
       <Price baseprice="80">
-        <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.25" />
-        <Price storeidentifier="merchantcity" sold="false" multiplier="1.25" />
-        <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="4" />
-        <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-        <Price storeidentifier="merchantmine" multiplier="1.1" sold="false" />
-        <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="2" />
+        <Price storeidentifier="merchantoutpost" sold="false" multiplier="3.75" />
+        <Price storeidentifier="merchantcity" sold="false" multiplier="3.75" />
+        <Price storeidentifier="merchantresearch" multiplier="2.7" minavailable="12" />
+        <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="6" />
+        <Price storeidentifier="merchantmine" multiplier="3.3" sold="false" />
+        <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="6" />
       </Price>
       <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,768,64,64" origin="0.5,0.5" />
       <Sprite texture="Content/Items/Medical/Medicines.png" sourcerect="346,452,33,60" depth="0.6" origin="0.5,0.5" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Misc/misc.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Misc/misc.xml
index 0bfc308e..6d767cb0 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Misc/misc.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Misc/misc.xml	
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
-  <Item name="" identifier="pipetobacco" category="Misc" maxstacksize="32" maxstacksizecharacterinventory="32" Tags="smallitem,pipetobacco" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="pipetobacco" category="Misc" maxstacksize="64" maxstacksizecharacterinventory="64" Tags="smallitem,pipetobacco" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <PreferredContainer primary="captainspipe" spawnprobability="1" />
-    <PreferredContainer primary="crewcab" spawnprobability="0.05" notcampaign="true" />
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.1" />
+    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true" />
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.2" />
     <Price baseprice="120">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Tools/tools.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Tools/tools.xml
index 7160ea04..a6c39b46 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Tools/tools.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Tools/tools.xml	
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
-  <Item name="" identifier="weldingfueltank" category="Equipment,Fuel" health="200" maxstacksize="32" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="weldingfueltank" category="Equipment,Fuel" health="200" maxstacksize="64" maxstacksizecharacterinventory="2" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="weldingtool,flamer" spawnprobability="1" />
-    <PreferredContainer primary="engcab" minamount="4" maxamount="6" spawnprobability="1" notcampaign="true" />
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" minamount="1" maxamount="3" spawnprobability="0.2" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="engcab" minamount="8" maxamount="12" spawnprobability="1" notcampaign="true" />
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" minamount="2" maxamount="6" spawnprobability="0.4" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1" />
     <PreferredContainer secondary="supplycab" />
     <Price baseprice="120" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" minavailable="6" />
-      <Price storeidentifier="merchantcity" minavailable="7" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantengineering" minavailable="10" multiplier="0.9" />
-      <Price storeidentifier="merchanttutorial" multiplier="0.5" minavailable="3" />
+      <Price storeidentifier="merchantoutpost" minavailable="18" />
+      <Price storeidentifier="merchantcity" minavailable="21" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="2.7" minavailable="45" />
+      <Price storeidentifier="merchantengineering" minavailable="10" multiplier="2.7" />
+      <Price storeidentifier="merchanttutorial" multiplier="1.5" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -50,16 +50,16 @@
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="incendiumfueltank" category="Equipment,Fuel" health="200" maxstacksize="32" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="incendiumfueltank" category="Equipment,Fuel" health="200" maxstacksize="64" maxstacksizecharacterinventory="2" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="engcab" secondary="supplycab" />
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.04" />
     <Price baseprice="250" sold="false" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
       <Price storeidentifier="merchantcity" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
-      <Price storeidentifier="merchantmine" multiplier="1.4" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
+      <Price storeidentifier="merchantmine" multiplier="4.2" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -95,17 +95,17 @@
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="flare" category="Equipment" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
-    <PreferredContainer primary="divingcab" minamount="2" maxamount="5" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
-    <Price baseprice="30" minavailable="6">
+  <Item name="" identifier="flare" category="Equipment" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
+    <PreferredContainer primary="divingcab" minamount="4" maxamount="10" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
+    <Price baseprice="30" minavailable="18">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmine" minavailable="10" />
-      <Price storeidentifier="merchantarmory" multiplier="1.25" minavailable="8" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantmine" minavailable="30" />
+      <Price storeidentifier="merchantarmory" multiplier="3.75" minavailable="24" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="12">
@@ -116,7 +116,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="227,204,54,18" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="15" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="90" throwforce="2.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,0.0,0.0,255" Flicker="0.5" range="600" IsOn="false">
+    <LightComponent LightColor="255,0.0,0.0,255" Flicker="0.5" range="2400" IsOn="false">
       <StatusEffect type="OnUse" targettype="This" IsOn="true" DontCleanUp="True">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
         <sound file="Content/Items/Tools/FlareIgnite.ogg" range="800.0" />
@@ -133,16 +133,16 @@
     <AiTarget sightrange="4000" />
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="alienflare" category="Equipment,Alien" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
+  <Item name="" identifier="alienflare" category="Equipment,Alien" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
     <PreferredContainer primary="divingcab" />
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.01" />
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" minamount="1" maxamount="3" spawnprobability="0.2" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="1" maxamount="3" spawnprobability="0.3" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.02" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" minamount="2" maxamount="6" spawnprobability="0.4" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="6" spawnprobability="0.6" />
     <Price baseprice="200" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="10">
@@ -153,7 +153,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="283,204,54,18" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="15" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="90" throwforce="2.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="0,162,232,255" Flicker="0.5" range="1000" IsOn="false">
+    <LightComponent LightColor="0,162,232,255" Flicker="0.5" range="4000" IsOn="false">
       <StatusEffect type="OnUse" targettype="This" IsOn="true" DontCleanUp="True">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
         <sound file="Content/Items/Tools/FlareIgnite.ogg" range="800.0" />
@@ -169,26 +169,26 @@
     <AiTarget sightrange="5000" />
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="oxygentank" category="Diving,Equipment" health="200" maxstacksize="32" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,oxygensource,refillableoxygensource" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" allowdroppingonswap="true">
+  <Item name="" identifier="oxygentank" category="Diving,Equipment" health="200" maxstacksize="64" maxstacksizecharacterinventory="2" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,oxygensource,refillableoxygensource" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" allowdroppingonswap="true">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="10" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantresearch" minavailable="10" />
-      <Price storeidentifier="merchantmilitary" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" minavailable="30" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="45" />
+      <Price storeidentifier="merchantresearch" minavailable="30" />
+      <Price storeidentifier="merchantmilitary" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="60" />
     </Price>
-    <PreferredContainer secondary="respawncontainer" amount="8" spawnprobability="1" notcampaign="true" />
-    <PreferredContainer primary="oxygentankcontainer" amount="3" spawnprobability="1" />
+    <PreferredContainer secondary="respawncontainer" amount="16" spawnprobability="1" notcampaign="true" />
+    <PreferredContainer primary="oxygentankcontainer" amount="6" spawnprobability="1" />
     <PreferredContainer primary="oxygengenerator" maxcondition="75" />
-    <PreferredContainer primary="divingmask,plasmacutter,deepdiving" spawnprobability="1.0" mincondition="25" />
-    <PreferredContainer secondary="divingcab" minamount="3" maxamount="5" spawnprobability="1" mincondition="25" notcampaign="true" />
-    <PreferredContainer secondary="supplycab" amount="1" spawnprobability="0.5" mincondition="25" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsupplycab" minamount="1" maxamount="3" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="wreckoxygentankcontainer" minamount="1" maxamount="3" spawnprobability="0.3" />
-    <PreferredContainer secondary="outpostcrewcabinet" minamount="1" maxamount="3" spawnprobability="0.2" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="3" spawnprobability="0.1" />
+    <PreferredContainer primary="divingmask,plasmacutter,deepdiving" spawnprobability="1" mincondition="25" />
+    <PreferredContainer secondary="divingcab" minamount="6" maxamount="10" spawnprobability="1" mincondition="25" notcampaign="true" />
+    <PreferredContainer secondary="supplycab" amount="2" spawnprobability="1" mincondition="25" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsupplycab" minamount="2" maxamount="6" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckoxygentankcontainer" minamount="2" maxamount="6" spawnprobability="0.6" />
+    <PreferredContainer secondary="outpostcrewcabinet" minamount="2" maxamount="6" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="6" spawnprobability="0.2" />
     <Deconstruct time="10">
       <Item identifier="aluminium" />
     </Deconstruct>
@@ -216,18 +216,18 @@
       <QualityStat stattype="Condition" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="oxygenitetank" category="Diving,Equipment" maxstacksize="32" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" health="400" Tags="smallitem,oxygensource" description="" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="oxygenitetank" category="Diving,Equipment" maxstacksize="64" maxstacksizecharacterinventory="2" MaxStackSizeHoldableOrWearableInventory="1" health="400" Tags="smallitem,oxygensource" description="" scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="175" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" sold="false" multiplier="0.9" />
+      <Price storeidentifier="merchantcity" sold="false" multiplier="2.7" />
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="1" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="3" />
     </Price>
     <PreferredContainer primary="oxygentankcontainer" />
-    <PreferredContainer secondary="wrecksupplycab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.01" />
+    <PreferredContainer secondary="wrecksupplycab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.02" />
     <Deconstruct time="10">
       <Item identifier="aluminium" />
       <Item identifier="liquidoxygenite" mincondition="0.1" />
@@ -263,20 +263,20 @@
       <QualityStat stattype="Condition" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="fuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="32" cargocontaineridentifier="metalcrate" scale="0.5">
+  <Item name="" identifier="fuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="64" cargocontaineridentifier="metalcrate" scale="0.5">
     <PreferredContainer primary="reactorcab" />
-    <PreferredContainer secondary="nucleargun" minamount="1" maxamount="1" spawnprobability="1" />
-    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" minamount="1" maxamount="2" spawnprobability="0.5" />
-    <PreferredContainer secondary="beaconengcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.05" />
-    <Price baseprice="150" displaynonempty="true" minavailable="2">
+    <PreferredContainer secondary="nucleargun" minamount="2" maxamount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="beaconengcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.1" />
+    <Price baseprice="150" displaynonempty="true" minavailable="6">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" minavailable="3" />
+      <Price storeidentifier="merchantcity" minavailable="9" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchanttutorial" multiplier="0.5" minavailable="3" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="15" />
+      <Price storeidentifier="merchanttutorial" multiplier="1.5" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -303,7 +303,7 @@
       </StatusEffect>-->
     </Holdable>
     <ItemContainer hideitems="true" capacity="1" itemrotation="90" drawinventory="false" canbeselected="false" SpawnWithId="nucleargunbolt" removecontaineditemsondeconstruct="true" showcontainedstateindicator="false">
-      <Containable items="nucleargunbolt" />
+      <Containable items="nucleargunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-25.0" disabledeltatime="true">
         <SpawnItem identifiers="nucleargunbolt" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -312,18 +312,18 @@
       <QualityStat stattype="Condition" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="fulguriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="32" cargocontaineridentifier="metalcrate" health="150" scale="0.5">
+  <Item name="" identifier="fulguriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="64" cargocontaineridentifier="metalcrate" health="150" scale="0.5">
     <PreferredContainer primary="reactorcab" />
-    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="beaconengcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.01" />
+    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="beaconengcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.02" />
     <Price baseprice="250" sold="false" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
+      <Price storeidentifier="merchantmine" multiplier="3.3" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -346,7 +346,7 @@
     <Body radius="6" height="55" density="20" />
     <Holdable handle1="0,0" slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect" />
     <ItemContainer hideitems="true" capacity="1" itemrotation="90" drawinventory="false" canbeselected="false" SpawnWithId="nucleargunbolt" removecontaineditemsondeconstruct="true" showcontainedstateindicator="false">
-      <Containable items="nucleargunbolt" />
+      <Containable items="nucleargunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-12.5" disabledeltatime="true">
         <SpawnItem identifiers="nucleargunbolt" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -355,18 +355,18 @@
       <QualityStat stattype="Condition" value="0.1" />
     </Quality>
   </Item>
-  <Item name="" identifier="thoriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="32" cargocontaineridentifier="metalcrate" health="200" scale="0.5">
+  <Item name="" identifier="thoriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="64" cargocontaineridentifier="metalcrate" health="200" scale="0.5">
     <PreferredContainer primary="reactorcab" />
-    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="beaconengcab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.01" />
+    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="beaconengcab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.02" />
     <Price baseprice="200" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" minavailable="1" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" minavailable="3" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantengineering" multiplier="2.7" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -394,7 +394,7 @@
       </StatusEffect>-->
     </Holdable>
     <ItemContainer hideitems="true" capacity="1" itemrotation="90" drawinventory="false" canbeselected="false" SpawnWithId="nucleargunbolt" removecontaineditemsondeconstruct="true" showcontainedstateindicator="false">
-      <Containable items="nucleargunbolt" />
+      <Containable items="nucleargunbolt,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-25.0" disabledeltatime="true">
         <SpawnItem identifiers="nucleargunbolt" spawnposition="ThisInventory" />
       </StatusEffect>
@@ -403,15 +403,15 @@
       <QualityStat stattype="Condition" value="0.1" />
     </Quality>
   </Item>
-  <redpaint name="" identifier="redpaint" category="Misc" maxstacksize="32" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,0,0,255" InventoryIconColor="255,0,0,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <redpaint name="" identifier="redpaint" category="Misc" maxstacksize="64" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,0,0,255" InventoryIconColor="255,0,0,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="140" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="256,320,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="379,78,27,58" depth="0.6" origin="0.5,0.5" />
@@ -436,15 +436,15 @@
       </StatusEffect>
     </Throwable>
   </redpaint>
-  <greenpaint name="" identifier="greenpaint" category="Misc" maxstacksize="32" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,128,0,255" InventoryIconColor="0,255,0,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <greenpaint name="" identifier="greenpaint" category="Misc" maxstacksize="64" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,128,0,255" InventoryIconColor="0,255,0,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="256,320,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="379,78,27,58" depth="0.6" origin="0.5,0.5" />
@@ -469,15 +469,15 @@
       </StatusEffect>
     </Throwable>
   </greenpaint>
-  <bluepaint name="" identifier="bluepaint" category="Misc" maxstacksize="32" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,0,128,255" InventoryIconColor="0,0,255,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <bluepaint name="" identifier="bluepaint" category="Misc" maxstacksize="64" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,0,128,255" InventoryIconColor="0,0,255,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="256,320,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="379,78,27,58" depth="0.6" origin="0.5,0.5" />
@@ -502,15 +502,15 @@
       </StatusEffect>
     </Throwable>
   </bluepaint>
-  <blackpaint name="" identifier="blackpaint" category="Misc" maxstacksize="32" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="20,20,20,255" InventoryIconColor="20,20,20,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <blackpaint name="" identifier="blackpaint" category="Misc" maxstacksize="64" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="20,20,20,255" InventoryIconColor="20,20,20,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="256,320,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="379,78,27,58" depth="0.6" origin="0.5,0.5" />
@@ -535,15 +535,15 @@
       </StatusEffect>
     </Throwable>
   </blackpaint>
-  <whitepaint name="" identifier="whitepaint" category="Misc" maxstacksize="32" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,128,128,255" InventoryIconColor="128,128,128,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <whitepaint name="" identifier="whitepaint" category="Misc" maxstacksize="64" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,128,128,255" InventoryIconColor="128,128,128,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.2" />
-      <Price storeidentifier="merchantmine" multiplier="1.2" />
+      <Price storeidentifier="merchantoutpost" multiplier="3.3" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="3.6" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.6" />
+      <Price storeidentifier="merchantmine" multiplier="3.6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="256,320,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="379,78,27,58" depth="0.6" origin="0.5,0.5" />
@@ -568,16 +568,16 @@
       </StatusEffect>
     </Throwable>
   </whitepaint>
-  <Item name="" identifier="glowstick" category="Equipment" maxstacksize="32" maxstacksizecharacterinventory="32" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
-    <PreferredContainer primary="divingcab" minamount="3" maxamount="5" spawnprobability="1" notcampaign="true" />
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
-    <Price baseprice="45" minavailable="6" displaynonempty="true">
+  <Item name="" identifier="glowstick" category="Equipment" maxstacksize="64" maxstacksizecharacterinventory="64" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
+    <PreferredContainer primary="divingcab" minamount="6" maxamount="10" spawnprobability="1" notcampaign="true" />
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
+    <Price baseprice="45" minavailable="18" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmine" minavailable="10" />
-      <Price storeidentifier="merchantarmory" multiplier="1.25" minavailable="8" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" minavailable="30" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" minavailable="24" />
+      <Price storeidentifier="merchantmine" minavailable="30" />
+      <Price storeidentifier="merchantarmory" multiplier="3.75" minavailable="24" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="4">
@@ -588,7 +588,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="278,157,50,9" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="9" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="90" throwforce="2.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="50,255,50,255" Flicker="0.0" range="400" IsOn="false">
+    <LightComponent LightColor="50,255,50,255" Flicker="0.0" range="1600" IsOn="false">
       <sprite texture="Content/Items/Tools/tools.png" sourcerect="374,140,62,20" alpha="1.0" origin="0.5,0.5" />
       <StatusEffect type="OnUse" targettype="This" IsOn="true" DontCleanUp="True">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Weapons/weapons.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Weapons/weapons.xml
index 8e92d512..14815414 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Weapons/weapons.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2683570256/Weapons/weapons.xml	
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Override>
-  <Item name="" identifier="spear" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="harpoongun" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="armcab" minamount="3" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="spear" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="32" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="harpoongun" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer primary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="32" spawnprobability="1" notcampaign="true" />
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="64" spawnprobability="1" notcampaign="true" />
     <Price baseprice="7">
-      <Price storeidentifier="merchantoutpost" minavailable="12" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" minavailable="12" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" minavailable="6" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" minavailable="24" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" minavailable="6" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" minavailable="24" multiplier="0.9" />
+      <Price storeidentifier="merchantoutpost" minavailable="12" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" minavailable="12" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" minavailable="6" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" minavailable="24" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" minavailable="6" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" minavailable="24" multiplier="2.7" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="6">
@@ -46,18 +46,18 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="alienspear" category="Weapon,Alien" maxstacksize="32" maxstacksizecharacterinventory="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="alienspear" category="Weapon,Alien" maxstacksize="64" maxstacksizecharacterinventory="32" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="harpoongun" />
-    <PreferredContainer secondary="ruinstoragesmall,ruinstorage" minamount="1" maxamount="3" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="6" spawnprobability="0.2" />
-    <PreferredContainer primary="ruintreasure" amount="6" spawnprobability="0.25" />
+    <PreferredContainer secondary="ruinstoragesmall,ruinstorage" minamount="2" maxamount="6" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="12" spawnprobability="0.4" />
+    <PreferredContainer primary="ruintreasure" amount="12" spawnprobability="0.5" />
     <PreferredContainer primary="secarmcab,armcab" />
     <Price baseprice="50" sold="false">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="6">
@@ -91,18 +91,18 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="explosivespear" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo,demolitionsexpert" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="explosivespear" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="32" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo,demolitionsexpert" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="harpoongun" />
-    <PreferredContainer primary="armcab" amount="6" spawnprobability="0.1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="6" spawnprobability="0.1" />
+    <PreferredContainer primary="armcab" amount="12" spawnprobability="0.2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="12" spawnprobability="0.2" />
     <PreferredContainer primary="secarmcab" />
     <Price baseprice="80">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="18" />
     </Price>
     <Deconstruct time="5"></Deconstruct>
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="2">
@@ -131,20 +131,20 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="revolverround" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="32" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,revolverammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="revolver" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="armcab" amount="6" spawnprobability="1" notpvp="true" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="6" spawnprobability="0.2" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.25" />
+  <Item name="" identifier="revolverround" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="64" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,revolverammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="revolver" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="armcab" amount="12" spawnprobability="1" notpvp="true" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="12" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.5" />
     <PreferredContainer secondary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="32" spawnprobability="1" notcampaign="true" />
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="64" spawnprobability="1" notcampaign="true" />
     <Price baseprice="12">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="12" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="12" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="12" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="60" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="12" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="60" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.5" minavailable="36" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="36" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" minavailable="36" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="180" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="36" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="180" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="12">
       <RequiredSkill identifier="weapons" level="30" />
@@ -174,20 +174,20 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="smgmagazine" maxstacksize="32" maxstacksizecharacterinventory="4" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,smgammo,handheldammo" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="smg,smgunique,machinepistol" amount="1" spawnprobability="1" />
-    <PreferredContainer primary="armcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="2" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+  <Item name="" identifier="smgmagazine" maxstacksize="64" maxstacksizecharacterinventory="8" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,smgammo,handheldammo" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="smg,smgunique,machinepistol" amount="2" spawnprobability="1" />
+    <PreferredContainer primary="armcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="8" spawnprobability="1" notcampaign="true" />
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="16" spawnprobability="1" notcampaign="true" />
     <Price baseprice="100" displaynonempty="true" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="6" sold="false" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="12" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="12" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="25" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="40" />
@@ -210,7 +210,7 @@
     <Sprite texture="Content/Items/Weapons/weapons_new.png" depth="0.54" sourcerect="146,157,21,44" origin="0.5,0.5" />
     <Body width="14" height="40" density="25" />
     <ItemContainer hideitems="true" capacity="1" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true" SpawnWithId="smground" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
-      <Containable items="smground" />
+      <Containable items="smground,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <!--Spawn an SMG round on use. Condition -4.8 -> 21 shots per magazine.-->
       <StatusEffect type="OnUse" target="This" condition="-4.8" disabledeltatime="true">
         <SpawnItem identifiers="smground" spawnposition="ThisInventory" />
@@ -220,22 +220,22 @@
     <Holdable canBeCombined="true" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="shotgunshell" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="32" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="shotgun" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="autoshotgun" amount="8" spawnprobability="1" />
-    <PreferredContainer primary="shotgununique" amount="2" spawnprobability="1" />
-    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="6" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="shotgunshell" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="64" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="shotgun" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="autoshotgun" amount="16" spawnprobability="1" />
+    <PreferredContainer primary="shotgununique" amount="4" spawnprobability="1" />
+    <PreferredContainer primary="armcab" minamount="122" maxamount="24" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="32" spawnprobability="1" notcampaign="true" />
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="64" spawnprobability="1" notcampaign="true" />
     <Price baseprice="30" minleveldifficulty="30">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" sold="true" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" sold="true" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="36" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="36" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="6">
       <RequiredSkill identifier="weapons" level="30" />
@@ -267,19 +267,19 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="shotgunshellblunt" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="32" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="shotgunshellblunt" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="64" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="shotgun,autoshotgun,shotgununique" />
-    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="6" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+    <PreferredContainer primary="armcab" minamount="122" maxamount="24" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
     <Price baseprice="15" minleveldifficulty="30">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" sold="true" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" sold="true" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="36" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="36" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" amount="12">
       <RequiredSkill identifier="weapons" level="30" />
@@ -303,18 +303,18 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="stungundart" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="32" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="armcab" minamount="1" maxamount="10" spawnprobability="0.25" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
-    <PreferredContainer primary="stungun" amount="2" spawnprobability="1" />
+  <Item name="" identifier="stungundart" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="64" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="armcab" minamount="2" maxamount="20" spawnprobability="0.5" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
+    <PreferredContainer primary="stungun" amount="4" spawnprobability="1" />
     <PreferredContainer secondary="secarmcab" />
     <Price baseprice="30">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="9" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="18" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="18" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="20" amount="2">
@@ -355,9 +355,9 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="spearunique" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="16" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,handheldammo,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
+  <Item name="" identifier="spearunique" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="32" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,handheldammo,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
     <PreferredContainer primary="harpoongun,armcab" secondary="secarmcab" />
-    <PreferredContainer secondary="wrecksecarmcab,wreckarmcab,abandonedsecarmcab,piratesecarmcab,abandonedarmcab,piratearmcab" amount="6" spawnprobability="0.05" />
+    <PreferredContainer secondary="wrecksecarmcab,wreckarmcab,abandonedsecarmcab,piratesecarmcab,abandonedarmcab,piratearmcab" amount="12" spawnprobability="0.1" />
     <Price baseprice="550" sold="false" canbespecial="false" />
     <Deconstruct time="5">
       <Item identifier="steel" />
@@ -389,19 +389,19 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="riflebullet" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="32" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,rifleammo,handheldammo,riflemanbonus" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="rifle" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="6" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="riflebullet" category="Weapon" maxstacksize="64" maxstacksizecharacterinventory="64" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,rifleammo,handheldammo,riflemanbonus" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="rifle" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="armcab" minamount="122" maxamount="24" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
     <Price baseprice="30" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" sold="true" />
-      <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantoutpost" sold="false" multiplier="4.5" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" minavailable="12" sold="true" />
+      <Price storeidentifier="merchantresearch" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="2.7" minavailable="36" />
+      <Price storeidentifier="merchantmine" sold="false" multiplier="3.75" />
+      <Price storeidentifier="merchantarmory" multiplier="2.7" minavailable="36" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="6">
       <RequiredSkill identifier="weapons" level="30" />
@@ -435,16 +435,16 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="hmgmagazine" maxstacksize="32" maxstacksizecharacterinventory="4" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,hmgammo,handheldammo" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="hmg" minamount="1" maxamount="1" spawnprobability="1" />
+  <Item name="" identifier="hmgmagazine" maxstacksize="64" maxstacksizecharacterinventory="8" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,hmgammo,handheldammo" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="hmg" minamount="2" maxamount="2" spawnprobability="1" />
     <PreferredContainer primary="armcab" secondary="secarmcab" />
     <Price baseprice="330" sold="true" minleveldifficulty="65" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="0" maxavailable="4" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="0" maxavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" />
+      <Price storeidentifier="merchantoutpost" multiplier="4.2" />
+      <Price storeidentifier="merchantcity" multiplier="3.75" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="2.7" minavailable="0" maxavailable="4" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="2.7" minavailable="0" maxavailable="4" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="35" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="40" />
@@ -468,7 +468,7 @@
     <Sprite texture="Content/Items/Weapons/weapons_new.png" sourcerect="208,88,29,37" depth="0.55" origin="0.5,0.5" />
     <Body width="29" height="37" density="25" />
     <ItemContainer hideitems="true" capacity="1" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true" SpawnWithId="hmground" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
-      <Containable items="hmground" />
+      <Containable items="hmground,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <StatusEffect type="OnUse" target="This" condition="-1" disabledeltatime="true">
         <SpawnItem identifiers="hmground" spawnposition="ThisInventory" />
       </StatusEffect>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2781344452/containers.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2781344452/containers.xml
index a40f6ec4..4e9b8c1a 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2781344452/containers.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2781344452/containers.xml	
@@ -11,7 +11,7 @@
   <Sprite texture="%ModDir%/containers.png" depth="0.54" sourcerect="0,0,148,83" origin="0.5,0.5" />
   <Body width="145" height="82" density="50" />
   <Holdable slots="Any,RightHand,LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-  <ItemContainer capacity="80" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-    <Containable items="smallitem,mediumitem,crate,railgunshell,nuclearshell,railgunammo,ammobox,coilgunammo,depthchargeammo,chaingunammo,divingsuit,abyssdivingsuit,combatdivingsuit,pucs,slipsuit" />
+  <ItemContainer capacity="176" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+    <Containable items="smallitem,mediumitem,crate,railgunshell,nuclearshell,railgunammo,ammobox,coilgunammo,depthchargeammo,chaingunammo,divingsuit,abyssdivingsuit,combatdivingsuit,pucs,slipsuit,deepdiving,largeitem" />
   </ItemContainer>
 </Item>
\ No newline at end of file
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2903374119/TalentTrees.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2903374119/TalentTrees.xml
index f6e31785..6f35fa05 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2903374119/TalentTrees.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2903374119/TalentTrees.xml	
@@ -3,7 +3,7 @@
   <TalentTrees>
     <TalentTree jobidentifier="captain">
       <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
-        <TalentOptions requiredtalents="2" maxchosentalents="6">
+        <TalentOptions maxchosentalents="6">
           <TalentOption identifier="bountyhunter" />
           <TalentOption identifier="logisticsexpert" />
           <TalentOption identifier="prodigy" />
@@ -11,7 +11,7 @@
           <TalentOption identifier="veteran" />
           <TalentOption identifier="travelingtradesman" />
         </TalentOptions>
-        <TalentOptions requiredtalents="2" maxchosentalents="6">
+        <TalentOptions maxchosentalents="6">
           <TalentOption identifier="emergencymaneuvers" />
           <TalentOption identifier="sailorwithnoname" />
           <TalentOption identifier="camaraderie" />
@@ -21,55 +21,45 @@
         </TalentOptions>
       </SubTree>
       <SubTree identifier="gunslinger" type="specialization" requires="captain_primary">
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="quickdraw" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="lonewolf" />
           <TalentOption identifier="deputy" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="drunkensailor" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>ions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="bigguns" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="skipper" type="specialization" requires="captain_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="skipper" type="specialization" requires="captain_primary">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="leadingbyexample" />
-        </TalentOptions>
-        <TalentOptions maxchosentalents="1">
+        </TalentOptions>ions maxchosentalents="1">
           <TalentOption identifier="helmsman" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="inspiringpresence" />
           <TalentOption identifier="trickledown" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="family" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="politician" type="specialization" requires="captain_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="politician" type="specialization" requires="captain_primary">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="commendations" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="yourreputation" />
           <TalentOption identifier="affiliation" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="campaigning" />
           <TalentOption identifier="networking" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="figurehead" />
-        </TalentOptions>
-      </SubTree>
-    </TalentTree>
+        </TalentOptions>    </TalentTree>
     <TalentTree jobidentifier="securityofficer">
       <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
-        <TalentOptions requiredtalents="2" maxchosentalents="6">
+        <TalentOptions maxchosentalents="6">
           <TalentOption identifier="protectandserve" />
           <TalentOption identifier="warstories" />
           <TalentOption identifier="firstaidtraining" />
@@ -77,7 +67,7 @@
           <TalentOption identifier="swole" />
           <TalentOption identifier="buff" />
         </TalentOptions>
-        <TalentOptions requiredtalents="2" maxchosentalents="5">
+        <TalentOptions maxchosentalents="5">
           <TalentOption identifier="weaponsmith" />
           <TalentOption identifier="bythebook" />
           <TalentOption identifier="dontpushit" />
@@ -86,57 +76,48 @@
         </TalentOptions>
       </SubTree>
       <SubTree identifier="frogman" type="specialization" requires="security_primary">
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="boardingparty" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="scavenger" />
           <TalentOption identifier="slayer" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="easyturtle" />
           <TalentOption identifier="daringdolphin" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="specops" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="enforcer" type="specialization" requires="security_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="enforcer" type="specialization" requires="security_primary">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="pacificationkit" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="beatcop" />
           <TalentOption identifier="stonewall" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="crustyseaman" />
           <TalentOption identifier="inordinateexsanguination" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="implacable" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="gunner" type="specialization" requires="security_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="gunner" type="specialization" requires="security_primary">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="rifleman" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="tandemfire" />
           <TalentOption identifier="commando" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="gunrunner" />
           <TalentOption identifier="extrapowder" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="warlord" />
-        </TalentOptions>
-      </SubTree>
-    </TalentTree>
+        </TalentOptions>    </TalentTree>
     <TalentTree jobidentifier="assistant">
       <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
-        <TalentOptions requiredtalents="2" maxchosentalents="6">
+        <TalentOptions maxchosentalents="6">
           <TalentOption identifier="playingcatchup" />
           <TalentOption identifier="mailman" />
           <TalentOption identifier="skedaddle" />
@@ -144,7 +125,7 @@
           <TalentOption identifier="starterquest" />
           <TalentOption identifier="mule" />
         </TalentOptions>
-        <TalentOptions requiredtalents="2" maxchosentalents="6">
+        <TalentOptions maxchosentalents="6">
           <TalentOption identifier="revengesquad" />
           <TalentOption identifier="inspiringtunes" />
           <TalentOption identifier="bagitup" />
@@ -154,23 +135,20 @@
         </TalentOptions>
       </SubTree>
       <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary">
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="thewaitinglist" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="nonthreatening" />
           <TalentOption identifier="tastytarget" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="insurancepolicy" />
           <TalentOption identifier="anappleaday" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="thefriendswemade" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="apprentice" type="specialization" requires="assistant_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="apprentice" type="specialization" requires="assistant_primary">
+        <TalentOptions maxchosentalents="5" requiredtalents="1">
           <ShowCaseTalent identifier="apprenticeship">
             <TalentOption identifier="apprenticeship_captain" />
             <TalentOption identifier="apprenticeship_doctor" />
@@ -178,45 +156,38 @@
             <TalentOption identifier="apprenticeship_mechanic" />
             <TalentOption identifier="apprenticeship_engineer" />
           </ShowCaseTalent>
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="logisticssystems" />
           <TalentOption identifier="journeyman" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="loyalassistant" />
           <TalentOption identifier="disloyalscum" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="graduationceremony" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="clown" type="specialization" requires="assistant_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="clown" type="specialization" requires="assistant_primary">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="enrollintoclowncollege" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>ions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="waterprankster" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="psychoclown" />
           <TalentOption identifier="chonkyhonks" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="truepotential" />
-        </TalentOptions>
-      </SubTree>
-    </TalentTree>
+        </TalentOptions>    </TalentTree>
     <TalentTree jobidentifier="engineer">
       <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
-        <TalentOptions requiredtalents="2" maxchosentalents="5">
+        <TalentOptions maxchosentalents="5">
           <TalentOption identifier="stationengineer" />
           <TalentOption identifier="junctionjunkie" />
           <TalentOption identifier="egghead" />
           <TalentOption identifier="grounded" />
           <TalentOption identifier="remotemonitor" />
         </TalentOptions>
-        <TalentOptions requiredtalents="2" maxchosentalents="5">
+        <TalentOptions maxchosentalents="5">
           <TalentOption identifier="funwithfission" />
           <TalentOption identifier="melodicrespite" />
           <TalentOption identifier="submarineofthings" />
@@ -225,54 +196,42 @@
         </TalentOptions>
       </SubTree>
       <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary">
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="militaryapplications" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="heavyhitter" />
           <TalentOption identifier="armsrace" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="weaponartisan" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>ions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="nuclearoption" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="electrician" type="specialization" requires="engineer_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="electrician" type="specialization" requires="engineer_primary">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="gridmaintainer" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="pyromaniac" />
           <TalentOption identifier="unlimitedpower" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="betterthannew" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>ions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="lightningwizard" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="physicist" type="specialization" requires="engineer_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="physicist" type="specialization" requires="engineer_primary">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="unstoppablecuriosity" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="cruising" />
           <TalentOption identifier="buzzing" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="dangerzone" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>ions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="phdinnuclearphysics" />
-        </TalentOptions>
-      </SubTree>
-    </TalentTree>
+        </TalentOptions>    </TalentTree>
     <TalentTree jobidentifier="mechanic">
       <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
-        <TalentOptions requiredtalents="2" maxchosentalents="6">
+        <TalentOptions maxchosentalents="6">
           <TalentOption identifier="salvagecrew" />
           <TalentOption identifier="machinemaniac" />
           <TalentOption identifier="safetyfirst" />
@@ -280,7 +239,7 @@
           <TalentOption identifier="engineengineer" />
           <TalentOption identifier="ballastdenizen" />
         </TalentOptions>
-        <TalentOptions requiredtalents="2" maxchosentalents="5">
+        <TalentOptions maxchosentalents="5">
           <TalentOption identifier="modularrepairs" />
           <TalentOption identifier="oiledmachinery" />
           <TalentOption identifier="pumpndump" />
@@ -289,56 +248,46 @@
         </TalentOptions>
       </SubTree>
       <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary">
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="miner" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="residualwaste" />
           <TalentOption identifier="massproduction" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="scrapsavant" />
           <TalentOption identifier="toolmaintenance" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="ironstorm" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="machinist" type="specialization" requires="mechanic_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="machinist" type="specialization" requires="mechanic_primary">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="hullfixer" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="tinkerer" />
           <TalentOption identifier="quickfixer" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="letitdrain" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>ions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="robotics" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="brawler" type="specialization" requires="mechanic_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="brawler" type="specialization" requires="mechanic_primary">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="iamthatguy" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="heavylifting" />
           <TalentOption identifier="mudraptorwrestler" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="foolhardy" />
           <TalentOption identifier="berserker" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="powerarmor" />
-        </TalentOptions>
-      </SubTree>
-    </TalentTree>
+        </TalentOptions>    </TalentTree>
     <TalentTree jobidentifier="medicaldoctor">
       <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
-        <TalentOptions requiredtalents="2" maxchosentalents="6">
+        <TalentOptions maxchosentalents="6">
           <TalentOption identifier="healthinsurance" />
           <TalentOption identifier="nobodyimportantdies" />
           <TalentOption identifier="exampleofhealth" />
@@ -346,7 +295,7 @@
           <TalentOption identifier="selfcare" />
           <TalentOption identifier="stayinalive" />
         </TalentOptions>
-        <TalentOptions requiredtalents="2" maxchosentalents="5">
+        <TalentOptions maxchosentalents="5">
           <TalentOption identifier="firemanscarry" />
           <TalentOption identifier="medicalcompanion" />
           <TalentOption identifier="dontdieonme" />
@@ -355,53 +304,44 @@
         </TalentOptions>
       </SubTree>
       <SubTree identifier="xenologist" type="specialization" requires="medical_primary">
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="geneharvester" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="bloodybusiness" />
           <TalentOption identifier="genesplicer" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="blackmarketgenes" />
           <TalentOption identifier="genetampering" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="geneticgenious" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="medic" type="specialization" requires="medical_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="medic" type="specialization" requires="medical_primary">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="medicalexpertise" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="medicalassistance" />
           <TalentOption identifier="emergencyresponse" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="drsubmarine" />
           <TalentOption identifier="vitaminsupplements" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="miracleworker" />
-        </TalentOptions>
-      </SubTree>
-      <SubTree identifier="scientist" type="specialization" requires="medical_primary">
-        <TalentOptions requiredtalents="1">
+        </TalentOptions>      <SubTree identifier="scientist" type="specialization" requires="medical_primary">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="plaguedoctor" />
-        </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        </TalentOptions>ions maxchosentalents="2">
           <TalentOption identifier="deliverysystem" />
           <TalentOption identifier="labcontacts" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOptions maxchosentalents="2">
           <TalentOption identifier="supersoldiers" />
           <TalentOption identifier="whatastench" />
         </TalentOptions>
-        <TalentOptions requiredtalents="1">
+        <TalentOptions maxchosentalents="1" requiredtalents="1">
           <TalentOption identifier="macrodosing" />
-        </TalentOptions>
-      </SubTree>
-    </TalentTree>
+        </TalentOptions>    </TalentTree>
   </TalentTrees>
 </override>
\ No newline at end of file
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/command.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/command.xml
index 0e5a427c..04e6f292 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/command.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/command.xml	
@@ -18,11 +18,11 @@
         <MaintainPosIndicator texture="%ModDir:2936760984%/UI/NavUI.png" sourcerect="82,0,93,93" />
         <MaintainPosOriginIndicator texture="%ModDir:2936760984%/UI/NavUI.png" sourcerect="0,0,66,66" />
         <SteeringIndicator texture="%ModDir:2936760984%/UI/NavUI.png" sourcerect="0,135,362,16" origin="0,0.5" />
-        <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+        <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
           <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
           <sprite texture="%ModDir:2936760984%/UI/navigatorLights.png" depth="0.025" sourcerect="0,0,384,304" origin="0.5,0.5" alpha="1.0" />
         </LightComponent>
-        <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
+        <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
           <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
           <sprite texture="%ModDir:2936760984%/UI/navigatorLights.png" depth="0.025" sourcerect="400,0,384,304" origin="0.5,0.5" alpha="1.0" />
         </LightComponent>
@@ -207,7 +207,7 @@
       <Sprite texture="Content/Items/Command/CommandDevices.png" depth="0.8" sourcerect="400,0,288,240" origin="0.5,0.5" />
       <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,256,288,240" depth="0.8" maxcondition="80" fadein="true" origin="0.5,0.5" />
       <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,512,288,240" depth="0.8" maxcondition="0" origin="0.5,0.5" />
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="256,320,288,240" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/items.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/items.xml
index 4381f2ac..45d9a1eb 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/items.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/items.xml	
@@ -4,9 +4,9 @@
     <PreferredContainer primary="engcab" />
     <Price baseprice="150" sold="false">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" />
+      <Price storeidentifier="merchantcity" multiplier="2.7" />
+      <Price storeidentifier="merchantresearch" multiplier="3.75" />
+      <Price storeidentifier="merchantmilitary" multiplier="3.75" />
       <Price storeidentifier="merchantmine" />
     </Price>
     <Deconstruct time="15">
@@ -26,16 +26,16 @@
   </Item>
   <Item name="Anechoic Diving Suit" identifier="anechoicdivingsuit" category="Diving,Equipment" tags="diving,deepdiving,provocative,anechoic" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy">
     <Price baseprice="500">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="2" />
-      <Price storeidentifier="merchantresearch" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="2.7" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="2.55" minavailable="6" />
+      <Price storeidentifier="merchantresearch" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="3.75" minavailable="6" />
     </Price>
-    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.06" />
-    <PreferredContainer primary="piratedivingsuitcontainer" spawnprobability="0.05" maxleveldifficulty="35" />
-    <PreferredContainer primary="beacondivingsuitcontainer" spawnprobability="0.33" />
+    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.12" />
+    <PreferredContainer primary="piratedivingsuitcontainer" spawnprobability="0.1" maxleveldifficulty="35" />
+    <PreferredContainer primary="beacondivingsuitcontainer" spawnprobability="0.66" />
     <Deconstruct time="30">
       <Item identifier="titaniumaluminiumalloy" />
       <Item identifier="rubber" amount="3" />
@@ -54,7 +54,7 @@
     <Body radius="45" width="34" density="15" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Diving Suit Helmet Wearable" texture="%ModDir%/Icons/headgear.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" hideotherwearables="true" sourcerect="0,0,94,95" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <Upgrade gameversion="0.1300.0.3" allowingameediting="false" />
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
@@ -101,10 +101,10 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use">
       <Upgrade gameversion="0.1401.0.0" msg="ItemMsgPickUpUse" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="2" hideitems="true" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingtoolfuel" excludeditems="oxygenitetank" />
-      <Containable items="oxygensource">
+      <Containable items="oxygensource,weldingtoolfuel,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
+      <Containable items="oxygensource,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" />
         <StatusEffect type="OnWearing" target="Contained" Condition="-0.3" comparison="And">
           <Conditional TargetContainer="true" TargetGrandparent="true" IsDead="false" />
@@ -116,14 +116,14 @@
           <Sound file="Content/Items/WarningBeepSlow.ogg" range="250" loop="true" />
         </StatusEffect>
       </Containable>
-      <Containable items="oxygenitetank">
+      <Containable items="oxygenitetank,ammobox,deepdiving,smallitem,mediumitem,largeitem">
         <StatusEffect type="OnWearing" target="Character" SpeedMultiplier="1.2" setvalue="true" targetslot="0" comparison="And">
           <Conditional IsDead="false" />
           <Conditional DecreasedOxygenConsumption="lt 99" />
           <Conditional NeedsAir="true" />
         </StatusEffect>
       </Containable>
-      <Containable items="weldingfueltank" blameequipperfordeath="true">
+      <Containable items="weldingfueltank,ammobox,deepdiving,smallitem,mediumitem,largeitem" blameequipperfordeath="true">
         <StatusEffect type="OnWearing" target="Contained" Condition="-0.5" comparison="And">
           <Conditional TargetContainer="true" TargetGrandparent="true" IsDead="false" />
           <Conditional TargetContainer="true" TargetGrandparent="true" DecreasedOxygenConsumption="lt 99" />
@@ -135,7 +135,7 @@
           <Conditional NeedsAir="true" />
         </StatusEffect>
       </Containable>
-      <Containable items="incendiumfueltank" blameequipperfordeath="true">
+      <Containable items="incendiumfueltank,ammobox,deepdiving,smallitem,mediumitem,largeitem" blameequipperfordeath="true">
         <StatusEffect type="OnWearing" target="Contained" Condition="-0.5" comparison="And">
           <Conditional TargetContainer="true" TargetGrandparent="true" IsDead="false" />
           <Conditional TargetContainer="true" TargetGrandparent="true" DecreasedOxygenConsumption="lt 99" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/treatments.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/treatments.xml
index 4a6fe7d3..4ec8ef25 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/treatments.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/2936760984/treatments.xml	
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <SmartGraft name="Smart Graft" identifier="smartgraft" aliases="" category="Medical" Tags="smallitem,medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.4" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <SmartGraft name="Smart Graft" identifier="smartgraft" aliases="" category="Medical" Tags="smallitem,medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.4" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" secondary="medcontainer" minamount="1" maxamount="2" spawnprobability="1" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,beaconmedcab" minamount="1" maxamount="2" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.05" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.05" />
-    <Price baseprice="270" minavailable="5">
-      <Price storeidentifier="merchantmedical" multiplier="0.9" />
+    <PreferredContainer primary="medcab" secondary="medcontainer" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,beaconmedcab" minamount="2" maxamount="4" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="0.1" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.1" />
+    <Price baseprice="270" minavailable="15">
+      <Price storeidentifier="merchantmedical" multiplier="2.7" />
       <Price storeidentifier="merchantcity" />
       <Price storeidentifier="merchantresearch" />
     </Price>
@@ -53,18 +53,18 @@
       </StatusEffect>
     </MeleeWeapon>
   </SmartGraft>
-  <Cortizide name="Cortizide" identifier="cortizide" aliases="" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Cortizide name="Cortizide" identifier="cortizide" aliases="" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="toxcab" secondary="toxcontainer" amount="1" spawnprobability="1" />
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,beaconmedcab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.005" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.005" />
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.001" />
-    <Price baseprice="600" minavailable="3">
+    <PreferredContainer primary="toxcab" secondary="toxcontainer" amount="2" spawnprobability="1" />
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,beaconmedcab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.01" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.01" />
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0" />
+    <Price baseprice="600" minavailable="9">
       <Price storeidentifier="merchantcity" />
       <Price storeidentifier="merchantresearch" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" />
+      <Price storeidentifier="merchantmedical" multiplier="2.7" />
     </Price>
     <SuitableTreatment type="brainhemorrhage" suitability="100" />
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
@@ -227,14 +227,14 @@
     </MeleeWeapon>
     <Projectile characterusable="false" launchimpulse="20.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon" inheritrequiredskillsfrom="MeleeWeapon" />
   </Cortizide>
-  <MannaExtract name="Manna Extract" identifier="manna" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_soft">
+  <MannaExtract name="Manna Extract" identifier="manna" category="Medical" maxstacksize="64" maxstacksizecharacterinventory="16" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" secondary="medcontainer" minamount="1" maxamount="4" spawnprobability="1" />
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="2" spawnprobability="0.12" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,beaconmedcab" minamount="1" maxamount="3" spawnprobability="0.16" />
+    <PreferredContainer primary="medcab" secondary="medcontainer" minamount="2" maxamount="8" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="4" spawnprobability="0.24" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,beaconmedcab" minamount="2" maxamount="6" spawnprobability="0.32" />
     <Price baseprice="350">
-      <Price storeidentifier="merchantmedical" multiplier="0.9" />
+      <Price storeidentifier="merchantmedical" multiplier="2.7" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="25" amount="2">
       <RequiredSkill identifier="medical" level="30" />
diff --git a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/3172965454/Content/Items/Command/command.xml b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/3172965454/Content/Items/Command/command.xml
index 9bdb680d..65b56cfb 100644
--- a/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/3172965454/Content/Items/Command/command.xml	
+++ b/Daedalic Entertainment GmbH/Barotrauma/WorkshopMods/Installed/3172965454/Content/Items/Command/command.xml	
@@ -18,11 +18,11 @@
         <MaintainPosIndicator texture="%ModDir:2936760984%/UI/NavUI.png" sourcerect="82,0,93,93" />
         <MaintainPosOriginIndicator texture="%ModDir:2936760984%/UI/NavUI.png" sourcerect="0,0,66,66" />
         <SteeringIndicator texture="%ModDir:2936760984%/UI/NavUI.png" sourcerect="0,135,362,16" origin="0,0.5" />
-        <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+        <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
           <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
           <sprite texture="%ModDir:2936760984%/UI/navigatorLights.png" depth="0.025" sourcerect="0,0,384,304" origin="0.5,0.5" alpha="1.0" />
         </LightComponent>
-        <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
+        <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
           <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
           <sprite texture="%ModDir:2936760984%/UI/navigatorLights.png" depth="0.025" sourcerect="400,0,384,304" origin="0.5,0.5" alpha="1.0" />
         </LightComponent>
@@ -216,7 +216,7 @@
       <Sprite texture="Content/Items/Command/CommandDevices.png" depth="0.8" sourcerect="400,0,288,240" origin="0.5,0.5" />
       <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,256,288,240" depth="0.8" maxcondition="80" fadein="true" origin="0.5,0.5" />
       <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,512,288,240" depth="0.8" maxcondition="0" origin="0.5,0.5" />
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="256,320,288,240" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>