diff --git a/LoadFolders.xml b/LoadFolders.xml
index 4f45277741..90f44df9e4 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -598,5 +598,6 @@
ModPatches/Outer Rim - Droid Depot
ModPatches/Maru Race
ModPatches/Det's Xenotypes - Boglegs
+ ModPatches/Moyo 2
diff --git a/ModPatches/Moyo 2/Defs/Moyo 2/Ammo/Ammo_Moyo_Industrial.xml b/ModPatches/Moyo 2/Defs/Moyo 2/Ammo/Ammo_Moyo_Industrial.xml
new file mode 100644
index 0000000000..b816caf220
--- /dev/null
+++ b/ModPatches/Moyo 2/Defs/Moyo 2/Ammo/Ammo_Moyo_Industrial.xml
@@ -0,0 +1,215 @@
+
+
+
+
+
+ MoyoHarpoon
+ Harpoon
+ Harpoon
+ Metal rods converted for combat use.
+
+
+
+ AmmoSmallMoyoHarpoon
+ Spearjack
+ AmmoAdvanced
+ UI/Icons/ThingCategories/CaliberCharge
+
+
+
+ AmmoLargeMoyoHarpoon
+ Heavy Spearjack
+ AmmoAdvanced
+ UI/Icons/ThingCategories/CaliberChargeLarge
+
+
+
+
+
+ AmmoSet_SmallMoyoHarpoon
+ Spearjack
+
+ Bullet_SmallMoyoHarpoon
+
+ AmmoSet_ChargedRifle
+
+
+
+
+ AmmoSet_LargeMoyoHarpoon
+ Heavy Spearjack
+
+ Bullet_LargeMoyoHarpoon
+
+ AmmoSet_ChargedHeavy
+
+
+
+
+
+ Metal harpoons modified for launching in a spearjack.
+
+ 0.25
+ 0.09
+
+
+ CE_AutoEnableTrade
+ CE_AutoEnableCrafting_FabricationBench
+
+
+ AmmoSmallMoyoHarpoon
+
+ 5000
+
+
+
+ Ammo_SmallMoyoHarpoon
+ Spearjack
+
+ Things/Ammo/Railgun/HighCaliber
+ Graphic_StackCount
+
+
+ 0.97
+
+ MoyoHarpoon
+
+
+
+ Metal harpoons modified for launching in a spearjack.
+
+ 2
+ 1.21
+
+
+ CE_AutoEnableTrade
+ CE_AutoEnableCrafting_FabricationBench
+
+
+ AmmoLargeMoyoHarpoon
+
+ 250
+
+
+
+ Ammo_LargeMoyoHarpoon
+ Heavy Spearjack
+
+ Things/Ammo/Railgun/HighCaliber
+ Graphic_StackCount
+
+
+ 7.94
+
+ MoyoHarpoon
+
+
+
+
+
+
+ Weapon/MoyoSpear
+ Graphic_Single
+ (1.0,1.0)
+
+
+ Bullet
+ 40
+
+
+
+
+ Bullet_SmallMoyoHarpoon
+ Spearjack harpoon
+
+ 26
+ 9
+ 100
+
+
+
+
+
+ Weapon/MoyoHarpoon
+ Graphic_Single
+ (1.5,1.5)
+
+
+ Bullet
+ 40
+
+
+
+
+ Bullet_LargeMoyoHarpoon
+ Heavy Spearjack harpoon
+
+ 75
+ 18
+ 800
+
+
+
+
+
+
+ MakeAmmo_SmallMoyoHarpoon
+ make Spearjack x100
+ Craft 100 Spearjack.
+ Making Spearjack.
+
+
+
+
+ Steel
+
+
+ 50
+
+
+
+
+ Steel
+
+
+
+ 100
+
+ 5000
+
+ Moyo2_FabricationBench
+ TableMachining
+
+
+
+
+ MakeAmmo_LargeMoyoHarpoon
+ make Heavy Spearjack x25
+ Craft 25 Heavy Spearjack.
+ Making Heavy Spearjack.
+
+
+
+
+ Steel
+
+
+ 100
+
+
+
+
+ Steel
+
+
+
+ 25
+
+ 10000
+
+ Moyo2_FabricationBench
+ TableMachining
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Moyo 2/Defs/Moyo 2/Ammo/Ammo_Moyo_Laminar.xml b/ModPatches/Moyo 2/Defs/Moyo 2/Ammo/Ammo_Moyo_Laminar.xml
new file mode 100644
index 0000000000..1a367d7e26
--- /dev/null
+++ b/ModPatches/Moyo 2/Defs/Moyo 2/Ammo/Ammo_Moyo_Laminar.xml
@@ -0,0 +1,248 @@
+
+
+
+
+
+
+ MoyoLaminarSlug
+ Laminar
+ LMR.
+ Heavy bolts stabilised by an extended energy field.
+
+
+
+ AmmoMoyoLaminarSlug
+ Laminar Slug
+ AmmoAdvanced
+ UI/Icons/ThingCategories/CaliberCharge
+
+
+
+ AmmoMoyoLaminarBolt
+ Laminar Bolt
+ AmmoAdvanced
+ UI/Icons/ThingCategories/CaliberChargeLarge
+
+
+
+
+
+ AmmoSet_MoyoLaminarSlug
+ Laminar Slug
+
+ Bullet_MoyoLaminarSlug
+
+ AmmoSet_ChargedRifle
+
+
+
+ AmmoSet_MoyoLaminarSlug_HV
+ Laminar Slug
+
+ Bullet_MoyoLaminarSlug_HV
+
+ AmmoSet_ChargedRifle
+
+
+
+ AmmoSet_MoyoLaminarBolt
+ Laminar Bolt
+
+ Bullet_MoyoLaminarBolt
+
+ AmmoSet_ChargedHeavy
+
+
+
+
+
+ Heavy rounds for use in laminar weapons.
+
+ 0.025
+ 0.02
+
+
+ CE_AutoEnableTrade
+ CE_AutoEnableCrafting_FabricationBench
+
+
+ AmmoMoyoLaminarSlug
+
+ 5000
+
+
+
+ Ammo_MoyoLaminarSlug
+ Laminar Slug
+
+ Things/Ammo/Charged/MediumMech
+ Graphic_StackCount
+
+
+ 0.94
+
+ MoyoLaminarSlug
+
+
+
+ Large bore round for use in heavy laminar weapons.
+
+ 0.5
+ 0.39
+
+
+ CE_AutoEnableTrade
+ CE_AutoEnableCrafting_FabricationBench
+
+
+ AmmoMoyoLaminarBolt
+
+ 750
+
+
+
+ Ammo_MoyoLaminarBolt
+ Laminar Bolt
+
+ Things/Ammo/Charged/LargeMech
+ Graphic_StackCount
+
+
+ 18.67
+
+ MoyoLaminarSlug
+
+
+
+
+
+
+ Weapon/MoyoBullet1
+ Graphic_Single
+ (1,1)
+
+
+ Bullet
+ 120
+
+
+
+
+ Bullet_MoyoLaminarSlug
+ Laminar Slug bullet
+
+ 25
+ 18
+ 90
+
+
+
+
+ Bullet_MoyoLaminarSlug_HV
+ Laminar Slug bullet
+
+ Weapon/MoyoBullet1
+ Graphic_Single
+ (1.3,1.3)
+
+
+ 160
+ 31
+ 21
+ 160
+
+
+
+
+
+ Weapon/MoyoBullet1
+ Graphic_Single
+ (1.5,1.5)
+
+
+ Bullet
+ 120
+
+
+
+
+ Bullet_MoyoLaminarBolt
+ Laminar Bolt bullet
+
+ 99
+ 60
+ 1800
+
+
+
+ 36
+ Moyo2_Damage_LMRBoltDemolish
+ 0.9
+ true
+
+
+
+
+
+
+
+ MakeAmmo_MoyoLaminarSlug
+ make Laminar Slug cartridge x500
+ Craft 500 Laminar Slug cartridges.
+ Making Laminar Slug cartridges.
+
+
+
+
+ Moyo2_Abyssteel
+
+
+ 50
+
+
+
+
+ Moyo2_Abyssteel
+
+
+
+ 500
+
+ 20000
+ Moyo2_Abysstech_LaminarTheory
+
+ Moyo2_FabricationBench
+
+
+
+
+ MakeAmmo_MoyoLaminarBolt
+ make Laminar Bolt cartridge x25
+ Craft 25 Laminar Bolt cartridges.
+ Making Laminar Bolt cartridges.
+
+
+
+
+ Moyo2_Abyssteel
+
+
+ 50
+
+
+
+
+ Moyo2_Abyssteel
+
+
+
+ 25
+
+ 20000
+ Moyo2_Abysstech_LaminarTheory
+
+ Moyo2_FabricationBench
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Moyo 2/Defs/Moyo 2/Ammo/Ammo_Moyo_Laminar_Charged.xml b/ModPatches/Moyo 2/Defs/Moyo 2/Ammo/Ammo_Moyo_Laminar_Charged.xml
new file mode 100644
index 0000000000..2ef4f2a062
--- /dev/null
+++ b/ModPatches/Moyo 2/Defs/Moyo 2/Ammo/Ammo_Moyo_Laminar_Charged.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+ AmmoSet_MoyoLaminarSlug_OC
+ Laminar Slug
+
+ Bullet_MoyoLaminarSlug_OC
+
+ AmmoSet_ChargedRifle
+
+
+
+ AmmoSet_MoyoLaminarSlug_OC_HV
+ Laminar Slug
+
+ Bullet_MoyoLaminarSlug_OC_HV
+
+ AmmoSet_ChargedRifle
+
+
+
+ AmmoSet_MoyoLaminarBolt_OC
+ Laminar Bolt
+
+ Bullet_MoyoLaminarBolt_OC
+
+ AmmoSet_ChargedHeavy
+
+
+
+
+
+
+ Weapon/MoyoBullet2
+ Graphic_Single
+ (1,1)
+
+
+ Bullet
+ 180
+
+
+
+
+ Bullet_MoyoLaminarSlug_OC
+ Laminar Slug bullet
+
+ 33
+ 24
+ 202.5
+
+
+
+ 20
+ Moyo2_Damage_LMRBolt
+ 0.9
+ true
+
+
+
+
+
+ Bullet_MoyoLaminarSlug_OC_HV
+ Laminar Slug bullet
+
+ Weapon/MoyoBullet2
+ Graphic_Single
+ (1.3,1.3)
+
+
+ 240
+ 41
+ 30
+ 360
+
+
+
+ 24
+ Moyo2_Damage_LMRBolt
+ 0.9
+ true
+
+
+
+
+
+
+ Weapon/MoyoBullet2
+ Graphic_Single
+ (1.5,1.5)
+
+
+ Bullet
+ 120
+
+
+
+
+ Bullet_MoyoLaminarBolt_OC
+ Laminar Bolt bullet
+
+ 132
+ 80
+ 4050
+
+
+
+ 79
+ Moyo2_Damage_LMRBoltDemolish
+ 2.9
+ true
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Moyo 2/Patches/Moyo 2/PawnKindDefs/Moyo_PawnKind.xml b/ModPatches/Moyo 2/Patches/Moyo 2/PawnKindDefs/Moyo_PawnKind.xml
new file mode 100644
index 0000000000..f4726e0905
--- /dev/null
+++ b/ModPatches/Moyo 2/Patches/Moyo 2/PawnKindDefs/Moyo_PawnKind.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+ Defs/PawnKindDef[@ParentName="Moyo2_NPCBase"]
+
+
+
+ 0
+ 2
+
+
+
+
+
+
+ Defs/PawnKindDef[@ParentName="Moyo2_NPCFighterMid"]
+
+
+
+ 3
+ 5
+
+
+
+
+
+
+ Defs/PawnKindDef[@Name="Moyo2_NPCDiverLight"]
+
+
+
+ 3
+ 5
+
+
+
+
+
+
+ Defs/PawnKindDef[@Name="Moyo2_NPCDiverheavy"]
+
+
+
+ 3
+ 5
+
+
+
+
+
+
+
+
+ Defs/PawnKindDef[
+ @ParentName="Moyo2_NPCFighterMid" or
+ @Name="Moyo2_NPCDiverLight" or
+ @Name="Moyo2_NPCDiverheavy"
+ ]/apparelRequired
+
+ CE_Apparel_Backpack
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Items_Resources.xml b/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Items_Resources.xml
new file mode 100644
index 0000000000..fc9c25eeef
--- /dev/null
+++ b/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Items_Resources.xml
@@ -0,0 +1,91 @@
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Abyssteel"]/statBases/StuffPower_Armor_Sharp
+
+ 2.25
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Abyssteel"]/statBases/StuffPower_Armor_Blunt
+
+ 3
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Abyssteel"]/statBases/StuffPower_Armor_Heat
+
+ 0.05
+ 0.05
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Abyssteel"]/stuffProps/categories
+
+ Metallic_Weapon
+ Steeled
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_HadalShard"]/statBases/StuffPower_Armor_Sharp
+
+ 1.2
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_HadalShard"]/statBases/StuffPower_Armor_Blunt
+
+ 0.5
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_HadalShard"]/statBases/StuffPower_Armor_Heat
+
+ 0.15
+ 0.25
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_HadalShard"]/stuffProps/categories
+
+ Metallic_Weapon
+ Steeled
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Cloth_Depthweave"]/statBases/StuffPower_Armor_Sharp
+
+ 0.25
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Cloth_Depthweave"]/statBases/StuffPower_Armor_Blunt
+
+ 0.08
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Cloth_Depthweave"]/statBases/StuffPower_Armor_Heat
+
+ 0.025
+ 0.025
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Moyo_Apparel.xml b/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Moyo_Apparel.xml
new file mode 100644
index 0000000000..ad5f888445
--- /dev/null
+++ b/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Moyo_Apparel.xml
@@ -0,0 +1,589 @@
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_BasicSuit"]/statBases
+
+ 2
+ 0
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_BasicSuit"]/statBases/ArmorRating_Sharp
+
+ 0.75
+ 0.15
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_BasicSuit"]/statBases/ArmorRating_Blunt
+
+ 0.1
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_BasicSuit"]/apparel/bodyPartGroups
+
+ Hands
+ Feet
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_CartelHood"]/statBases
+
+ 10
+ 2
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_CartelHood"]/statBases/ArmorRating_Sharp
+
+ 3
+ 0.30
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_CartelHood"]/statBases/ArmorRating_Blunt
+
+ 0.5
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_EGHarness" or defName="Moyo2_EGJacket"]/statBases
+
+ 10
+ 4
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_EGHarness" or defName="Moyo2_EGJacket"]/statBases/ArmorRating_Sharp
+
+ 6
+ 0.3
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_EGHarness" or defName="Moyo2_EGJacket"]/statBases/ArmorRating_Blunt
+
+ 2
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_EGHelmet"]/statBases
+
+ 4
+ 4
+ 0.1
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_EGHelmet"]/statBases/ArmorRating_Sharp
+
+ 8
+ 0.25
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_EGHelmet"]/statBases/ArmorRating_Blunt
+
+ 12
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_EGHelmet"]/apparel/layers
+
+
+ OnHead
+ StrappedHead
+ Overhead
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_AdvancedSuit"]/statBases
+
+ 5
+ 4
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_AdvancedSuit" or defName="Moyo2_HoloSuit"]/statBases/ArmorRating_Sharp
+
+ 3.5
+ 0.30
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_AdvancedSuit" or defName="Moyo2_HoloSuit"]/statBases/ArmorRating_Blunt
+
+ 4
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_AdvancedSuit" or defName="Moyo2_HoloSuit"]/apparel/bodyPartGroups
+
+ Hands
+ Feet
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_RoyalSuit"]/statBases
+
+ 5
+ 3
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_HoloSuit"]/statBases
+
+ 4
+ 0
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_RoyalSuit"]/statBases/ArmorRating_Sharp
+
+ 5
+ 0.40
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_RoyalSuit"]/statBases/ArmorRating_Blunt
+
+ 6.25
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_RoyalSuit"]/apparel/bodyPartGroups
+
+ Hands
+ Feet
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingShell"]/statBases
+
+ 125
+ 20
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingShell"]/statBases/Mass
+
+ 75
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingShell"]/statBases/ArmorRating_Sharp
+
+ 16
+ 0.60
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingShell"]/statBases/ArmorRating_Blunt
+
+ 64
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingShell"]/statBases/Flammability
+
+ 0
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingShell"]/equippedStatOffsets
+
+ 85
+ 10
+ 0.50
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingShell"]/costList/Moyo2_Abyssteel
+
+ 190
+ 40
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingShell"]/apparel/bodyPartGroups
+
+ Hands
+ Feet
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingShell"]
+
+
+
+
+ 0.90
+
+ Neck
+ Leg
+ Arm
+
+
+
+ 0.90
+
+ Neck
+ Leg
+ Arm
+
+
+
+ 0.80
+
+ Hand
+
+
+
+ 0.80
+
+ Hand
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingHelmet"]/statBases
+
+ 6
+ 3
+ 0.4
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingHelmet"]/statBases/Mass
+
+ 5
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingHelmet"]/statBases/ArmorRating_Sharp
+
+ 16
+ 0.55
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingHelmet"]/statBases/ArmorRating_Blunt
+
+ 64
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingHelmet"]/statBases/Flammability
+
+ 0
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingHelmet"]/apparel/immuneToToxGasExposure
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingHelmet"]/apparel
+
+ true
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingHelmet"]/equippedStatOffsets/MoveSpeed
+
+ -1
+ 0.50
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingHelmet"]/costList/Moyo2_Abyssteel
+
+ 60
+ 20
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_DeepDivingHelmet"]/apparel/layers
+
+
+ OnHead
+ StrappedHead
+ Overhead
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingShell"]/statBases
+
+ 125
+ 15
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingShell"]/statBases/Mass
+
+ 60
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingShell"]/statBases/ArmorRating_Sharp
+
+ 16
+ 0.50
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingShell"]/statBases/ArmorRating_Blunt
+
+ 45
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingShell"]/statBases/Flammability
+
+ 0
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingShell"]
+
+
+ 75
+ 10
+ 0.50
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingShell"]/costList/Moyo2_Abyssteel
+
+ 150
+ 30
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingShell"]/apparel/bodyPartGroups
+
+ Hands
+ Feet
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingShell"]
+
+
+
+
+ 0.80
+
+ Neck
+
+
+
+ 0.80
+
+ Neck
+
+
+
+ 0.90
+
+ Leg
+ Arm
+
+
+
+ 0.90
+
+ Leg
+ Arm
+
+
+
+ 0.80
+
+ Hand
+
+
+
+ 0.80
+
+ Hand
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingHelmet"]/statBases
+
+ 6
+ 2
+ 0.6
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingHelmet"]/statBases/Mass
+
+ 1.5
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingHelmet"]/statBases/ArmorRating_Sharp
+
+ 14
+ 0.35
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingHelmet"]/statBases/ArmorRating_Blunt
+
+ 42
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingHelmet"]/statBases/Flammability
+
+ 0
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingHelmet"]/apparel/immuneToToxGasExposure
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingHelmet"]/apparel
+
+ true
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingHelmet"]
+
+
+ -1
+ 0.50
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingHelmet"]/costList/Moyo2_Abyssteel
+
+ 50
+ 15
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingHelmet"]
+
+
+
+
+ 0.70
+
+ Eye
+ Nose
+ Jaw
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_StreamlineDivingHelmet"]/apparel/layers
+
+
+ OnHead
+ StrappedHead
+ Overhead
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Moyo_Guns.xml b/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Moyo_Guns.xml
new file mode 100644
index 0000000000..de7a6ff5c3
--- /dev/null
+++ b/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Moyo_Guns.xml
@@ -0,0 +1,569 @@
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_NailGun" or @Name="Moyo2_LMRPistol"]/tools
+
+
+
+ grip
+
+ Blunt
+
+ 2
+ 1.54
+ 1.5
+ 0.555
+ Grip
+
+
+ muzzle
+
+ Poke
+
+ 2
+ 1.54
+ 0.555
+ Muzzle
+
+
+
+
+
+
+ Defs/ThingDef[@Name="Moyo2_LMRRifle"]/tools
+
+
+
+ stock
+
+ Blunt
+
+ 8
+ 1.55
+ 1.5
+ 2.755
+ Stock
+
+
+ barrel
+
+ Blunt
+
+ 5
+ 2.02
+ 1.630
+ Barrel
+
+
+ muzzle
+
+ Poke
+
+ 8
+ 1.55
+ 2.755
+ Muzzle
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_SpearGun"]/tools
+
+
+
+ stock
+
+ Blunt
+
+ 8
+ 1.55
+ 1.5
+ 2.755
+ Stock
+
+
+ barrel
+
+ Blunt
+
+ 5
+ 2.02
+ 1.630
+ Barrel
+
+
+ pile
+
+ Stab
+
+ 26
+ 3.3
+ 9
+ 100
+ Muzzle
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_HarpoonGun"]/tools
+
+
+
+ stock
+
+ Blunt
+
+ 8
+ 1.55
+ 1.5
+ 2.755
+ Stock
+
+
+ barrel
+
+ Blunt
+
+ 5
+ 2.02
+ 1.630
+ Barrel
+
+
+ pile
+
+ Stab
+
+ 75
+ 7
+ 18
+ 800
+ Muzzle
+
+
+
+
+
+
+ Defs/ThingDef[
+ @Name="Moyo2_LMRBalista" or
+ @Name="Moyo_LMRAutoCannon"
+ ]/tools
+
+
+
+ barrel
+
+ Blunt
+
+ 10
+ 2.44
+ 3.5
+ Barrel
+
+
+
+
+
+
+
+
+ Moyo2_NailGun
+
+ 1.20
+ 0.37
+ 0.7
+ 0.16
+ 1.07
+ 2.00
+
+
+ 2.24
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_Nail_HV
+ 0.6
+ 18
+ 10
+ 6
+ Industrial_Nailgun
+
+
+ 60
+ 4.3
+ AmmoSet_Nail_HV
+
+
+ 5
+ FALSE
+ Snapshot
+
+
+ CE_SMG
+ CE_AI_BROOM
+ CE_OneHandedWeapon
+
+
+
+
+
+
+ Moyo2_SpearGun
+
+ 3.60
+ 0.99
+ 1
+ 0.2
+ 1.71
+ 11.25
+
+
+ 5.28
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_SmallMoyoHarpoon
+ 1.1
+ 31
+ Industrial_SpearGun
+ GunTail_Light
+
+
+ 1
+ 2.2
+ AmmoSet_SmallMoyoHarpoon
+
+
+ AimedShot
+
+
+ CE_AI_SR
+
+
+
+
+
+
+ Moyo2_HarpoonGun
+
+ 9.00
+ 1.17
+ 1
+ 0.02
+ 2.59
+ 13.50
+
+
+ 9.44
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_LargeMoyoHarpoon
+ 2.6
+ 31
+ Industrial_HarpoonGun
+ GunTail_Light
+
+
+ 1
+ 4.4
+ AmmoSet_LargeMoyoHarpoon
+
+
+ AimedShot
+
+
+ CE_AI_SR
+
+
+
+
+
+
+ Moyo2_LMRPistol
+
+ 2.50
+ 0.38
+ 0.7
+ 0.01
+ 1.69
+ 2.50
+
+
+ 2.47
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_MoyoLaminarSlug
+ 0.6
+ 31
+ Laminar_Pistol
+ GunTail_Medium
+ 9
+
+
+ 7
+ 4
+ AmmoSet_MoyoLaminarSlug
+
+
+ FALSE
+ Snapshot
+
+
+ CE_Sidearm
+ CE_AI_BROOM
+ CE_OneHandedWeapon
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_LMRPistol"]/comps/li[@Class="Moyo2_ItemFormChange.CompPropertiesFormChange"]
+
+
+ switch to normal mode
+ switch to overclock mode
+ True
+
+ 7
+ 4
+ AmmoSet_MoyoLaminarSlug_OC
+
+
+ 4.94
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_MoyoLaminarSlug_OC
+ 3.6
+ 37
+ Laminar_Pistol
+ Laminar_Chargeup2
+ GunTail_Medium
+ 9
+
+
+ AimedShot
+
+
+
+
+
+
+
+
+ Moyo2_LMRRifle
+
+ 6.50
+ 0.37
+ 1.1
+ 0.02
+ 1.60
+ 9.50
+
+
+ 1.75
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_MoyoLaminarSlug
+ 1
+ 55
+ Laminar_Rifle
+ GunTail_Medium
+ 9
+
+
+ 15
+ 4
+ AmmoSet_MoyoLaminarSlug
+
+
+ AimedShot
+
+
+ CE_AI_SR
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_LMRRifle"]/comps/li[@Class="Moyo2_ItemFormChange.CompPropertiesFormChange"]
+
+
+ switch to normal mode
+ switch to overclock mode
+ True
+
+ 15
+ 4
+ AmmoSet_MoyoLaminarSlug_OC_HV
+
+
+ 3.5
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_MoyoLaminarSlug_OC_HV
+ 4
+ 65
+ Laminar_Rifle
+ Laminar_Chargeup2
+ GunTail_Medium
+ 9
+
+
+ AimedShot
+
+
+
+
+
+
+
+
+ Moyo2_LMRAutoCannon
+
+ 9.50
+ 0.56
+ 1.1
+ 0.05
+ 1.37
+ 13.50
+
+
+ 1.31
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_MoyoLaminarSlug
+ 1
+ 51
+ 15
+ 5
+ Laminar_Rifle
+ GunTail_Medium
+ 9
+
+ true
+
+
+
+ 60
+ 4.9
+ AmmoSet_MoyoLaminarSlug
+
+
+ 3
+ FALSE
+ SuppressFire
+
+
+ CE_MachineGun
+ CE_AI_LMG
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_LMRAutoCannon"]/comps/li[@Class="Moyo2_ItemFormChange.CompPropertiesFormChange"]
+
+
+ switch to normal mode
+ switch to overclock mode
+ True
+
+ 60
+ 4
+ AmmoSet_MoyoLaminarSlug
+
+
+ 2.61
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_MoyoLaminarSlug
+ 4
+ 51
+ 9
+ 20
+ Laminar_Rifle
+ Laminar_Chargeup2
+ GunTail_Medium
+ 9
+
+
+ SuppressFire
+ true
+ 20
+
+
+
+
+
+
+
+
+ Moyo2_LMRBalista
+
+ 9.50
+ 0.37
+ 1.1
+ 0.02
+ 2.53
+ 12.50
+
+
+ 7.96
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_MoyoLaminarBolt
+ 2.5
+ 48
+ Laminar_Chargeup2
+ Laminar_Balista
+ GunTail_Heavy
+ 9
+
+
+ 4
+ 4.9
+ AmmoSet_MoyoLaminarBolt
+
+
+ AimedShot
+
+
+ CE_AI_SR
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_LMRBalista"]/comps/li[@Class="Moyo2_ItemFormChange.CompPropertiesFormChange"]
+
+
+ switch to normal mode
+ switch to overclock mode
+ True
+
+ 4
+ 4.9
+ AmmoSet_MoyoLaminarBolt_OC
+
+
+ 15.92
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_MoyoLaminarBolt_OC
+ 5.5
+ 52
+ Laminar_Chargeup2
+ Laminar_Balista
+ GunTail_Medium
+ 9
+
+
+ AimedShot
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Moyo_Melee.xml b/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Moyo_Melee.xml
new file mode 100644
index 0000000000..9f4d5e820c
--- /dev/null
+++ b/ModPatches/Moyo 2/Patches/Moyo 2/ThingDefs/Patch_Moyo_Melee.xml
@@ -0,0 +1,313 @@
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Wrench"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 4
+ 1.84
+ 1.125
+
+
+ head
+
+ Blunt
+
+ 19
+ 2.61
+ 1.5
+ 7.605
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Wrench"]/statBases
+
+ 0.25
+ 3.5
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Wrench"]/equippedStatOffsets
+
+ 0.67
+ 0.25
+ 0.33
+
+
+
+
+
+
+ Defs/AbilityDef[defName="Moyo2_WrenchThrow"]/verbProperties
+
+
+ ThrowGrenade
+ CombatExtended.Verb_LaunchProjectileStaticCE
+ 5.5
+ Moyo2_Bullet_WrenchThrow
+ 1.3
+ 1
+ false
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Bullet_WrenchThrow"]/projectile
+
+ CombatExtended.BulletCE
+
+ Moyo2_Damage_WrenchThrow
+ 19
+ 30
+ 0
+ 7.2
+ 3
+
+
+ Stun
+ 5
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Knife"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 5
+ 2.01
+ 0.4
+ 1.6
+ Handle
+
+
+ point
+
+ Stab
+
+ 11
+ 1.26
+ 1
+ 0.25
+ 1.67
+ Point
+
+
+ edge
+
+ Cut
+
+ 10
+ 1.18
+ 1
+ 0.36
+ 1.2
+ Edge
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Knife"]/statBases
+
+ 0.39
+ 1.5
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Knife"]/equippedStatOffsets
+
+ 0.08
+ 0.24
+ 1.07
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Knife"]/weaponTags
+
+ CE_OneHandedWeapon
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Saw"]/tools
+
+
+
+ sawblade
+
+ Cut
+
+ 5
+ 0.1
+ 3
+ 0.36
+ 1.2
+ Edge
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Saw"]/statBases
+
+ 0.39
+ 6.5
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_Saw"]/equippedStatOffsets
+
+ 0
+ 0
+ 1.07
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_LMRGlaive"]/statBases
+
+ 1.08
+ 12.50
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_LMRGlaive"]
+
+
+ 0.22
+ 1.53
+ 0.67
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_LMRGlaive"]/tools
+
+
+
+ blade
+
+ Cut
+
+ 41
+ 1.72
+ 1
+ 2.59
+ 18
+ Edge
+
+
+ point
+
+ Stab
+
+ 24
+ 1.72
+ 1
+ 1.25
+ 28
+ Edge
+
+
+ handle
+
+ Poke
+ Blunt
+
+ 11
+ 1.38
+ 0.2
+ 4.05
+ Handle
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_LMRFist"]/tools
+
+
+
+ Fist
+
+ Blunt
+
+ 26
+ 2.74
+ 72
+
+
+ Body
+
+ Blunt
+
+ 26
+ 2.74
+ 72
+
+
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_LMRFist"]/statBases
+
+ 0.2
+ 5
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_LMRFist"]/equippedStatOffsets
+
+ 0.85
+ 0.05
+ 0.17
+
+
+
+
+ Defs/ThingDef[defName="Moyo2_LMRFist"]/weaponTags
+
+ CE_OneHandedWeapon
+
+
+
+
\ No newline at end of file
diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index 1ec35238c7..f28e598832 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -340,6 +340,7 @@ MorrowRim - Just the Animals |
Moyo - From the Depth |
Moyo - Light in the Abyss |
Moyo - The Cartel Arrives |
+Moyo 2.0-Blood Stained Business |
Multiplayer |
Nakin Race |
Nanosuit |