diff --git a/LoadFolders.xml b/LoadFolders.xml
index 6b6fcc83e2..6f19c771e5 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -492,6 +492,7 @@
ModPatches/Simply More Melee
ModPatches/Slime Rancher
ModPatches/Solark Race
+ ModPatches/Spacer Arsenal
ModPatches/Spacer Pack
ModPatches/Spacer Shields
ModPatches/Spaceworm
diff --git a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml
new file mode 100644
index 0000000000..c2f546b174
--- /dev/null
+++ b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+ AmmoSet_8mmRailgun_CoilgunLance
+
+
+ Bullet_CoilGunLance
+
+
+
+
+ Bullet_CoilGunLance
+
+
+ true
+ False
+ Bullet
+ 25
+ 47
+ 310
+
+
+
+
+
+
+
+
+ AmmoHotPlasmaCell
+
+ AmmoAdvanced
+ Spacer Arsenal/PlasmaCell/HotPlasmaCell_c
+
+
+
+
+
+ PlasmaBolt
+
+ A concentrated bolt of radiation, imparting disruptive energy into the target.
+
+
+
+
+
+ AmmoSet_PlasmaBlaster
+
+
+ Bullet_Bolt_PlasmaBlaster
+
+
+
+
+
+
+ A hot plasma cell utilised by spacer tech assault weapons.
+
+ 0.008
+ 0.01
+
+
+ CE_AutoEnableTrade
+ CE_AutoEnableCrafting_FabricationBench
+ CE_AutoEnableCrafting_TableMachining
+
+
+ AmmoHotPlasmaCell
+
+ 5000
+
+
+
+ Ammo_HotPlasmaCell
+
+
+ Spacer Arsenal/PlasmaCell
+ Graphic_StackCount
+
+
+ 0.69
+
+ PlasmaBolt
+ Bullet_Bolt_PlasmaBlaster
+
+
+
+
+
+
+
+ Things/Projectiles/Bullet_Plasma
+ Graphic_Single
+ TransparentPostLight
+
+
+ CE_Laser
+ 170
+ false
+
+
+
+
+ Bullet_Bolt_PlasmaBlaster
+
+ Bullet
+ 5
+ 15
+ 5
+
+
+ Flame_Secondary
+ 17
+
+
+
+
+
+
+
+
+ MakeAmmo_HotPlasmaCell
+
+ Craft 500 hot plasma cells.
+ Making hot plasma cells.
+
+
+
+
+ Plasteel
+
+
+ 8
+
+
+
+
+ Steel
+
+
+ 4
+
+
+
+
+ ComponentIndustrial
+
+
+ 8
+
+
+
+
+ Prometheum
+
+
+ 8
+
+
+
+
+ Chemfuel
+
+
+ 12
+
+
+
+
+ Plasteel
+ Steel
+ ComponentIndustrial
+ Prometheum
+ Chemfuel
+
+
+
+ 500
+
+ 8400
+
+
+
+
+
+
+
+ AmmoPhotonCell
+
+ AmmoAdvanced
+ Spacer Arsenal/PhotonCell/PhotonCell_c
+
+
+
+
+
+ PhotonCell
+
+ A concentrated bolt of radiation, imparting disruptive energy into the target.
+
+
+
+
+
+ AmmoSet_PhotonBlaster
+
+
+ Bullet_Bolt_PhotonBlaster
+
+
+
+
+
+
+ A charged photon cell utilised by spacer tech assault weapons.
+
+ 0.008
+ 0.01
+
+
+ CE_AutoEnableTrade
+ CE_AutoEnableCrafting_FabricationBench
+ CE_AutoEnableCrafting_TableMachining
+
+
+ AmmoPhotonCell
+
+ 5000
+
+
+
+ Ammo_PhotonCell
+
+
+ Spacer Arsenal/PhotonCell
+ Graphic_StackCount
+
+
+ 0.69
+
+ PhotonCell
+ Bullet_Bolt_PhotonBlaster
+
+
+
+
+
+
+
+ Things/Projectiles/Bullet_Photon
+ Graphic_Single
+ TransparentPostLight
+
+
+ Photon
+ 156
+ false
+
+
+
+
+ Bullet_Bolt_PhotonBlaster
+
+ Photon
+ 12
+ 10.5
+ 7
+
+
+
+
+
+
+ MakeAmmo_PhotonCell
+
+ Craft 500 photon cells.
+ Making photon cells.
+
+
+
+
+ Plasteel
+
+
+ 8
+
+
+
+
+ Steel
+
+
+ 4
+
+
+
+
+ ComponentSpacer
+
+
+ 4
+
+
+
+
+ Plasteel
+ Steel
+ ComponentSpacer
+
+
+
+ 500
+
+ 8400
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml
new file mode 100644
index 0000000000..6087fd0024
--- /dev/null
+++ b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ Photon
+
+ {0} has been scorched to death.
+ BurnSecondary
+ false
+ 99999
+ 1
+ 0
+ 0.1
+ 2
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml
new file mode 100644
index 0000000000..9361e19181
--- /dev/null
+++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml
@@ -0,0 +1,101 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases
+
+ 4
+ 1
+ 0.7
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/Mass
+
+ 3.0
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/ArmorRating_Sharp
+
+ 10
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/ArmorRating_Blunt
+
+ 26
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/MaxHitPoints
+
+ 190
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/equippedStatOffsets
+
+ 0.15
+ -1
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/equippedStatOffsets/MentalBreakThreshold
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/costList/Plasteel
+
+ 50
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/costList
+
+ 35
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/apparel/layers
+
+ OnHead
+ StrappedHead
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]
+
+
+
+
+ 0.80
+
+ Eye
+ Nose
+
+
+
+ 0.80
+
+ Eye
+ Nose
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Various.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Various.xml
new file mode 100644
index 0000000000..cbb246ea21
--- /dev/null
+++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Various.xml
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_EnsignArmor"]
+
+
+ 80
+ 12
+ 0.1
+ 30
+ 16
+ 38.25
+ 400
+
+
+
+
+
+
+ Defs/ThingDef[defName="DV_Apparel_EnsignArmor"]
+
+
+ 60
+ 140
+ 20
+ 5
+
+
+
+
+
+ Defs/ThingDef[@Name="DV_ApparelArmorEnsignBase"]/equippedStatOffsets/MoveSpeed
+
+ 50
+ 8
+ 0.50
+
+
+
+
+ Defs/ThingDef[@Name="DV_ApparelArmorEnsignBase"]/apparel/bodyPartGroups
+
+ Hands
+ Feet
+
+
+
+
+ Defs/ThingDef[@Name="DV_ApparelArmorEnsignBase"]
+
+
+
+
+ 0.80
+
+ Neck
+
+
+
+ 0.80
+
+ Neck
+
+
+
+ 0.90
+
+ Arm
+
+
+
+ 0.90
+
+ Arm
+
+
+
+ 0.70
+
+ Hand
+
+
+
+ 0.70
+
+ Hand
+
+
+
+
+
+
+
+
diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml
new file mode 100644
index 0000000000..9f88482ba5
--- /dev/null
+++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/thingClass
+
+ CombatExtended.ProjectileCE_Explosive
+
+
+
+
+ Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/projectile
+
+
+
+ Defs/ThingDef[defName="DV_Proj_GrenadeThump"]
+
+
+ 1.5
+ Thump
+ 56
+ 60
+ true
+ Fleck_GrenadePin
+ Filth_GrenadeAmmoCasings
+ true
+ 12
+ 3.0
+ 2.0
+ 0.25
+
+
+
+
+
+ Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/comps
+
+ Defs/ThingDef[defName="DV_Proj_GrenadeThump"]
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]/smeltable
+
+ false
+
+
+
+
+ Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]
+
+ CombatExtended.AmmoThing
+ 75
+ First
+
+
+
+
+ Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]
+ Class
+ CombatExtended.AmmoDef
+
+
+
+ Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]/comps
+
+
+
+ 56
+ Thump
+ 3.9
+
+
+
+
+
+
+ DV_Weapon_GrenadeThump
+
+ 0.4
+ 0.87
+ 11.22
+ 1
+ 1.0
+
+
+
+ CombatExtended.Verb_ShootCEOneUse
+ true
+ 12.0
+ 4
+ 1
+ 6
+ true
+ ThrowGrenade
+
+ true
+
+ DV_Proj_GrenadeThump
+ true
+ true
+ 7
+
+
+ CE_AI_Grenade
+ CE_AI_AOE
+ CE_OneHandedWeapon
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml
new file mode 100644
index 0000000000..6648c4fd57
--- /dev/null
+++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/tools
+
+
+
+
+
+ Poke
+
+ 2
+ 0.1
+ 1.5
+ 0.5
+ Handle
+
+
+
+
+ Cut
+
+ 35
+ 0.83
+ 2.88
+ 4.5
+ Edge
+
+
+ Stun
+ 10
+ 0.4
+
+
+
+
+
+
+ Stab
+
+ 16
+ 0.94
+ 1.28
+ 6.25
+
+
+ Stun
+ 10
+ 0.4
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/statBases
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/statBases
+
+ 4
+ 0.40
+
+
+
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]
+
+
+ 1.00
+ 0.40
+ 0.27
+
+
+
+
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/weaponTags
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/weaponTags
+
+ CE_OneHandedWeapon
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml
new file mode 100644
index 0000000000..9bd47fd899
--- /dev/null
+++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+ Defs/ThingDef[
+ defName="DV_Gun_ClashHMG" or
+ defName="DV_Gun_SonicStunner" or
+ defName="DV_Gun_BruteRifle" or
+ defName="DV_Gun_PhotonSMG" or
+ defName="DV_Gun_PlasmaBlaster" or
+ defName="DV_Gun_CoilgunLance"
+ ]/tools
+
+
+
+
+
+
+ Blunt
+
+ 8
+ 1.55
+ 1.5
+ 2.755
+ Stock
+
+
+
+
+ Blunt
+
+ 5
+ 2.02
+ 1.630
+ Barrel
+
+
+
+
+ Poke
+
+ 8
+ 1.55
+ 2.755
+ Muzzle
+
+
+
+
+
+
+
+
+ DV_Gun_ClashHMG
+
+ 25
+ 2.07
+ 0.07
+ 1
+ 0.47
+
+
+ 2.33
+ CombatExtended.Verb_ShootCE
+ True
+ Bullet_145x114mm_FMJ
+ 10
+ 10
+ 2.1
+ 60
+ Shot_Autocannon
+ GunTail_Medium
+ 12
+
+
+ 60
+ 4.9
+ AmmoSet_145x114mm
+
+
+ FALSE
+ SuppressFire
+ 5
+
+
+ CE_MachineGun
+ CE_AI_LMG
+
+
+
+
+ Defs/ThingDef[defName="DV_Gun_ClashHMG"]/equippedStatOffsets/MoveSpeed
+
+
+
+
+
+ DV_Gun_CoilgunLance
+
+ 4.0
+ 9.0
+ 1.30
+ 0.07
+ 1.10
+ 0.38
+
+
+ 2.09
+ CombatExtended.Verb_ShootCE
+ True
+ Bullet_CoilGunLance
+ 1.1
+ 60
+ Shot_TurretSniper
+ GunTail_Heavy
+ 9
+
+
+ 1
+ 4
+ AmmoSet_8mmRailgun_CoilgunLance
+
+
+ AimedShot
+ False
+
+
+ SpacerGun
+ Coilgun
+
+
+
+
+
+
+ DV_Gun_PhotonSMG
+
+ 2.50
+ 0.37
+ 1.00
+ 0.14
+ 0.94
+ 4.50
+
+
+ 1.79
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_Bolt_PhotonBlaster
+ 0.6
+ 25
+ 6
+ 6
+ DV_Shot_PhotonSMG
+ GunTail_Medium
+ 9
+
+
+ 25
+ 4
+ AmmoSet_PhotonBlaster
+
+
+ 3
+ FALSE
+ Snapshot
+
+
+ CE_SMG
+ CE_AI_BROOM
+
+
+
+
+
+ DV_Gun_PlasmaBlaster
+
+ 8.7
+ 0.56
+ 1
+ 0.05
+ 1.37
+ 12.9
+
+
+ 1.38
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_Bolt_PlasmaBlaster
+ 1.3
+ 62
+ 7
+ 10
+ DV_Shot_PlasmaBlaster
+ GunTail_Medium
+ 9
+
+
+ 40
+ 4.9
+ AmmoSet_PlasmaBlaster
+
+
+ 5
+ FALSE
+ SuppressFire
+
+
+ CE_MachineGun
+ CE_AI_LMG
+
+
+
+
+
+
+ DV_Gun_BruteRifle
+
+ 25
+ 2.07
+ 0.07
+ 1
+ 0.47
+
+
+ 2.33
+ CombatExtended.Verb_ShootCE
+ True
+ Bullet_50BMG_FMJ
+ 4
+ 10
+ 2.1
+ 40
+ Shot_Autocannon
+ GunTail_Medium
+ 12
+
+
+ 15
+ 4.9
+ AmmoSet_50BMG
+
+
+ true
+ Snapshot
+ 2
+
+
+
+
+ Defs/ThingDef[defName="DV_Gun_BruteRifle"]/equippedStatOffsets/MoveSpeed
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png
new file mode 100644
index 0000000000..c1fd2c146c
Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png differ
diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_b.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_b.png
new file mode 100644
index 0000000000..881744cd4a
Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_b.png differ
diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_c.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_c.png
new file mode 100644
index 0000000000..124c04bb8c
Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_c.png differ
diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_a.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_a.png
new file mode 100644
index 0000000000..a89eb7c3f7
Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_a.png differ
diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_b.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_b.png
new file mode 100644
index 0000000000..3faaf15b06
Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_b.png differ
diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_c.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_c.png
new file mode 100644
index 0000000000..dcd3fde306
Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_c.png differ
diff --git a/ModPatches/Vanilla Arsenal/Defs/Vanilla Arsenal/Ammo.xml b/ModPatches/Vanilla Arsenal/Defs/Vanilla Arsenal/Ammo.xml
new file mode 100644
index 0000000000..90f9a44775
--- /dev/null
+++ b/ModPatches/Vanilla Arsenal/Defs/Vanilla Arsenal/Ammo.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+ AmmoSet_30x64mmFuel_Thermobaric
+
+
+ Bullet_30x64mmFuel_Thermobaric
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml b/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml
index ce8ef56f9a..971068c4a6 100644
--- a/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml
+++ b/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml
@@ -38,7 +38,8 @@
defName="DV_Gun_LeverShotgun" or
defName="DV_Gun_LightCarbine" or
defName="DV_Gun_CombatShotgun" or
- defName="DV_Gun_DMR"
+ defName="DV_Gun_DMR" or
+ defName="DV_Gun_ThermoRifle"
]/tools
@@ -306,4 +307,50 @@
+
+
+ DV_Gun_ThermoRifle
+
+ 1.60
+ 0.15
+ 1.8
+ 13
+ 10
+ 1.50
+
+
+ 2
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_30x64mmFuel_Thermobaric
+ 2
+ 48
+ Shot_Autocannon
+ 9
+ GunTail_Heavy
+
+ true
+
+
+
+ 4
+ 4
+ AmmoSet_30x64mmFuel_Thermobaric
+
+
+ AimedShot
+
+
+
+
+ Defs/ThingDef[defName="DV_Gun_ThermoRifle"]/weaponTags
+
+
+ GunHeavy
+ SpacerGun
+ Bipod_AMR
+
+
+
+
\ No newline at end of file