From a0d12ea33e48cba9af613b79d922c5803e7210d4 Mon Sep 17 00:00:00 2001
From: Mateusz Kotas <mateusz@xautomate.se>
Date: Tue, 10 Jun 2025 18:34:38 +0200
Subject: [PATCH] fixes

---
 1.5/Assemblies/vceplusultra.dll               | Bin 9728 -> 10240 bytes
 Mods/Rimsenal/Patches/Defs/tier1_satchel.xml  | 642 ++++++++---------
 Mods/Rimsenal/Patches/Defs/tier2_satchel.xml  | 664 +++++++++---------
 Mods/Rimsenal/Patches/Defs/tier3_satchel.xml  | 660 ++++++++---------
 .../Patches/Defs/zQuasarEVAPatches.xml        | 114 +++
 .../Patches/Defs/zSolarEVAPatches.xml         | 113 +++
 .../Patches/Defs/zTenebralEVAPatches.xml      | 113 +++
 Mods/Royalty/Patches/Apparel/Tier1.xml        |  27 +-
 Mods/Royalty/Patches/Apparel/Tier2.xml        |  18 +-
 .../Patches/Apparel/zQuasarEVAPatches.xml}    |   0
 .../Patches/Apparel/zSolarEVAPatches.xml}     |   0
 .../Patches/Apparel/zTenebralEVAPatches.xml}  |   0
 .../Patches/Permits/Thoughts_CorpoTitles.xml  |   2 +-
 13 files changed, 1339 insertions(+), 1014 deletions(-)
 create mode 100644 Mods/Rimsenal/Patches/Defs/zQuasarEVAPatches.xml
 create mode 100644 Mods/Rimsenal/Patches/Defs/zSolarEVAPatches.xml
 create mode 100644 Mods/Rimsenal/Patches/Defs/zTenebralEVAPatches.xml
 rename Mods/{SaveOurShip/Patches/Royalty/QuasarEVAPatches.xml => Royalty/Patches/Apparel/zQuasarEVAPatches.xml} (100%)
 rename Mods/{SaveOurShip/Patches/Royalty/SolarEVAPatches.xml => Royalty/Patches/Apparel/zSolarEVAPatches.xml} (100%)
 rename Mods/{SaveOurShip/Patches/Royalty/TenebralEVAPatches.xml => Royalty/Patches/Apparel/zTenebralEVAPatches.xml} (100%)

diff --git a/1.5/Assemblies/vceplusultra.dll b/1.5/Assemblies/vceplusultra.dll
index 1d75a68fdba5c3edc3d73dad34d6ebb747fec872..9da13122ce3b644f4a62a9506e33bcc392764433 100644
GIT binary patch
delta 4499
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

delta 3988
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

diff --git a/Mods/Rimsenal/Patches/Defs/tier1_satchel.xml b/Mods/Rimsenal/Patches/Defs/tier1_satchel.xml
index 95241bf8..e4cd180b 100644
--- a/Mods/Rimsenal/Patches/Defs/tier1_satchel.xml
+++ b/Mods/Rimsenal/Patches/Defs/tier1_satchel.xml
@@ -1,337 +1,337 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
 
-  <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
-    <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
-    <enabled Class="PatchOperationSequence">
-	  <operations>
-	  
-	  <!-- patch sequence to patch in defs while proceeding to check for CE -->
-	  <li Class="PatchOperationAdd">
-      <xpath>Defs</xpath>
-      
-            <value>
-
-                <ThingDef ParentName="BaseGrenadeProjectile">
-                    <defName>BOR_Proj_Dunder_I</defName>
-                    <label>Satchel charge</label>
-                    <thingClass>Projectile_Explosive</thingClass>
-                    <graphicData>
-                        <color>(0, 0.75, 0.9)</color>
-                        <texPath>Things/Projectile/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <projectile>
-                        <explosionRadius>9</explosionRadius>
-                        <damageDef>Bomb</damageDef>
-                        <damageAmountBase>450</damageAmountBase>
-                        <explosionDelay>350</explosionDelay>
-                    </projectile>
-                </ThingDef>
-
-                <ThingDef ParentName="BaseRSGrenade">
-                    <defName>BOR_JI_Dunder_I</defName>
-                    <equipmentType>Primary</equipmentType>
-                    <label>solar satchel charge</label>
-                    <description>A "Dunder II" solar Satchel charge. Combat engineer's best friend.</description>
-                    <graphicData>
-                        <color>(0, 0.75, 0.9)</color>
-                        <texPath>Things/A16/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <soundInteract>Interact_Grenade</soundInteract>
-                    <techLevel>Ultra</techLevel>
-                    <statBases>
-                        <Mass>3</Mass>
-                        <RangedWeapon_Cooldown>1.85</RangedWeapon_Cooldown>
-                    </statBases>
-                    <thingCategories>
-                        <li>Grenades</li>
-                    </thingCategories>
-                    <recipeMaker>
-                        <researchPrerequisite>BOR_Research_Weapons_I</researchPrerequisite>
-                        <skillRequirements>
-                            <Crafting>13</Crafting>
-                        </skillRequirements>
-                        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                        <workSkill>Crafting</workSkill>
-                        <effectWorking>Smith</effectWorking>
-                        <soundWorking>Recipe_Smith</soundWorking>
-                        <recipeUsers>
-                            <li>BOR_Bench_I</li>
-                            <li>BOR_Bench_IV</li>
-                        </recipeUsers>
-                        <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                    </recipeMaker>
-                    <costList>
-                        <ComponentSpacer>5</ComponentSpacer>
-                        <BOR_Sunsteel>55</BOR_Sunsteel>
-                        <BOR_Neutronium>150</BOR_Neutronium>
-                    </costList>
-                    <verbs>
-                        <li>
-                            <label>throw solar satchel charge</label>
-                            <verbClass>Verb_LaunchProjectile</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>13.275</range>
-                            <forcedMissRadius>0.5</forcedMissRadius>
-                            <warmupTime>2.22</warmupTime>
-                            <noiseRadius>5.55</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_I</defaultProjectile>
-                        </li>
-                    </verbs>
-                    <tradeTags>
-                        <li>BOR_Tech_I</li>
-                    </tradeTags>
-                </ThingDef>
-
-            </value>
-
-	  </li>
-	  
-	  <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
-	  <li Class="PatchOperationFindMod">
-		<mods>
-		  <li>Combat Extended</li>
-		</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-                    <!-- ========== Remove Recipe Maker & Verbs ========== -->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/recipeMaker </xpath>
-                    </li>
-
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/costList </xpath>
-                    </li>
-
-                    <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/verbs </xpath>
-                    </li>
-
-                    <!-- Change TickerType.-->
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
-                        <value>
-                            <tickerType>Normal</tickerType>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile thingClass ========== -->
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/thingClass </xpath>
-                        <value>
-                            <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile ========== -->
-
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/projectile</xpath>
-                        <value>
-                            <projectile Class="CombatExtended.ProjectilePropertiesCE">
-                                <explosionRadius>6.75</explosionRadius>
+    <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
+        <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
+        <enabled Class="PatchOperationSequence">
+            <operations>
+
+                <!-- patch sequence to patch in defs while proceeding to check for CE -->
+                <li Class="PatchOperationAdd">
+                    <xpath>Defs</xpath>
+
+                    <value>
+
+                        <ThingDef ParentName="BaseGrenadeProjectile">
+                            <defName>BOR_Proj_Dunder_I</defName>
+                            <label>Satchel charge</label>
+                            <thingClass>Projectile_Explosive</thingClass>
+                            <graphicData>
+                                <color>(0, 0.75, 0.9)</color>
+                                <texPath>Things/Projectile/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <projectile>
+                                <explosionRadius>9</explosionRadius>
                                 <damageDef>Bomb</damageDef>
-                                <damageAmountBase>300</damageAmountBase>
-                                <explosionDelay>400</explosionDelay>
-                                <dropsCasings>false</dropsCasings>
-                                <speed>15</speed>
-                                <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-                                <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-                                <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                <damageAmountBase>450</damageAmountBase>
+                                <explosionDelay>350</explosionDelay>
                             </projectile>
-                        </value>
-                    </li>
-                    <!-- ========== Check Comp ========== -->
-
-
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-
-                    <!-- ========== Add Fragmentation ========== -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Solar>0</Fragment_Solar>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <!-- Weapon Stack and Appearance -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/graphicData </xpath>
-                        <value>
-                            <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
-                        <value>
-                            <thingClass>CombatExtended.AmmoThing</thingClass>
-                            <stackLimit>75</stackLimit>
-                            <resourceReadoutPriority>First</resourceReadoutPriority>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAttributeSet">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
-                        <attribute>Class</attribute>
-                        <value>CombatExtended.AmmoDef</value>
-                    </li>
-
-                    <!-- Weapon Check Comps -->
-
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-                    <!-- Weapon Values -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_ExplosiveCE">
-                                <damageAmountBase>60</damageAmountBase>
-                                <explosiveDamageType>Bomb</explosiveDamageType>
-                                <explosiveRadius>2.75</explosiveRadius>
+                        </ThingDef>
 
-                            </li>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Solar>50</Fragment_Solar>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-                        <defName>BOR_JI_Dunder_I</defName>
-                        <statBases>
-                            <Mass>2.08</Mass>
-                            <MarketValue>10.875</MarketValue>
-                            <RangedWeapon_Cooldown>0.83</RangedWeapon_Cooldown>
-                            <SightsEfficiency>1.5</SightsEfficiency>
-                        </statBases>
-                        <Properties>
-                            <label>throw solar satchel charge</label>
-                            <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>15.0</range>
-                            <minRange>3</minRange>
-                            <warmupTime>0.65</warmupTime>
-                            <noiseRadius>3</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_I</defaultProjectile>
-                            <onlyManualCast>true</onlyManualCast>
-                            <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-                        </Properties>
-                        <weaponTags>
-                            <li>CE_AI_Grenade</li>
-                            <li>CE_OneHandedWeapon</li>
-                        </weaponTags>
-                    </li>
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs</xpath>
-                        <value>
-                            <RecipeDef ParentName="RSExplosive_RecipeBase">
+                        <ThingDef ParentName="BaseRSGrenade">
+                            <defName>BOR_JI_Dunder_I</defName>
+                            <equipmentType>Primary</equipmentType>
+                            <label>solar satchel charge</label>
+                            <description>A "Dunder II" solar Satchel charge. Combat engineer's best friend.</description>
+                            <graphicData>
+                                <color>(0, 0.75, 0.9)</color>
+                                <texPath>Things/A16/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <soundInteract>Interact_Grenade</soundInteract>
+                            <techLevel>Ultra</techLevel>
+                            <statBases>
+                                <Mass>3</Mass>
+                                <RangedWeapon_Cooldown>1.85</RangedWeapon_Cooldown>
+                            </statBases>
+                            <thingCategories>
+                                <li>Grenades</li>
+                            </thingCategories>
+                            <recipeMaker>
+                                <researchPrerequisite>BOR_Research_Weapons_I</researchPrerequisite>
+                                <skillRequirements>
+                                    <Crafting>13</Crafting>
+                                </skillRequirements>
                                 <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                                <effectWorking>Cook</effectWorking>
-                                <soundWorking>Recipe_Smith</soundWorking>
                                 <workSkill>Crafting</workSkill>
+                                <effectWorking>Smith</effectWorking>
+                                <soundWorking>Recipe_Smith</soundWorking>
+                                <recipeUsers>
+                                    <li>BOR_Bench_I</li>
+                                    <li>BOR_Bench_IV</li>
+                                </recipeUsers>
                                 <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                                <defName>BOR_Craft_10_Dunder_I</defName>
-                                <label>Craft 10 solar satchel charges</label>
-                                <description>Craft 10 Dunder II solar satchel charges.</description>
-                                <jobString>Crafting solar satchel charges</jobString>
-                                <ingredients>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>ComponentSpacer</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>2</count>
+                            </recipeMaker>
+                            <costList>
+                                <ComponentSpacer>5</ComponentSpacer>
+                                <BOR_Sunsteel>55</BOR_Sunsteel>
+                                <BOR_Neutronium>150</BOR_Neutronium>
+                            </costList>
+                            <verbs>
+                                <li>
+                                    <label>throw solar satchel charge</label>
+                                    <verbClass>Verb_LaunchProjectile</verbClass>
+                                    <hasStandardCommand>true</hasStandardCommand>
+                                    <range>13.275</range>
+                                    <forcedMissRadius>0.5</forcedMissRadius>
+                                    <warmupTime>2.22</warmupTime>
+                                    <noiseRadius>5.55</noiseRadius>
+                                    <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                    <soundCast>ThrowGrenade</soundCast>
+                                    <targetParams>
+                                        <canTargetLocations>true</canTargetLocations>
+                                    </targetParams>
+                                    <defaultProjectile>BOR_Proj_Dunder_I</defaultProjectile>
+                                </li>
+                            </verbs>
+                            <tradeTags>
+                                <li>BOR_Tech_I</li>
+                            </tradeTags>
+                        </ThingDef>
+
+                    </value>
+
+                </li>
+
+                <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
+                <li Class="PatchOperationFindMod">
+                    <mods>
+                        <li>Combat Extended</li>
+                    </mods>
+                    <match Class="PatchOperationSequence">
+                        <operations>
+
+                            <!-- ========== Remove Recipe Maker & Verbs ========== -->
+                            <li Class="PatchOperationRemove">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/recipeMaker</xpath>
+                            </li>
+
+                            <li Class="PatchOperationRemove">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/costList</xpath>
+                            </li>
+
+                            <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
+                            <li Class="PatchOperationRemove">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/verbs</xpath>
+                            </li>
+
+                            <!-- Change TickerType.-->
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
+                                <value>
+                                    <tickerType>Normal</tickerType>
+                                </value>
+                            </li>
+
+                            <!-- ========== Projectile thingClass ========== -->
+
+                            <li Class="PatchOperationReplace">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/thingClass</xpath>
+                                <value>
+                                    <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+                                </value>
+                            </li>
+
+                            <!-- ========== Projectile ========== -->
+
+
+                            <li Class="PatchOperationReplace">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/projectile</xpath>
+                                <value>
+                                    <projectile Class="CombatExtended.ProjectilePropertiesCE">
+                                        <explosionRadius>6.75</explosionRadius>
+                                        <damageDef>Bomb</damageDef>
+                                        <damageAmountBase>300</damageAmountBase>
+                                        <explosionDelay>400</explosionDelay>
+                                        <dropsCasings>false</dropsCasings>
+                                        <speed>15</speed>
+                                        <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+                                        <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+                                        <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                    </projectile>
+                                </value>
+                            </li>
+                            <!-- ========== Check Comp ========== -->
+
+
+                            <li Class="PatchOperationConditional">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/comps</xpath>
+                                <nomatch Class="PatchOperationAdd">
+                                    <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]</xpath>
+                                    <value>
+                                        <comps />
+                                    </value>
+                                </nomatch>
+                            </li>
+
+                            <!-- ========== Add Fragmentation ========== -->
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/comps</xpath>
+                                <value>
+                                    <li Class="CombatExtended.CompProperties_Fragments">
+                                        <fragments>
+                                            <Fragment_Solar>0</Fragment_Solar>
+                                        </fragments>
                                     </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>Plasteel</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>30</count>
+                                </value>
+                            </li>
+
+                            <!-- Weapon Stack and Appearance -->
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/graphicData</xpath>
+                                <value>
+                                    <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+                                </value>
+                            </li>
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
+                                <value>
+                                    <thingClass>CombatExtended.AmmoThing</thingClass>
+                                    <stackLimit>75</stackLimit>
+                                    <resourceReadoutPriority>First</resourceReadoutPriority>
+                                </value>
+                            </li>
+
+                            <li Class="PatchOperationAttributeSet">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
+                                <attribute>Class</attribute>
+                                <value>CombatExtended.AmmoDef</value>
+                            </li>
+
+                            <!-- Weapon Check Comps -->
+
+                            <li Class="PatchOperationConditional">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/comps</xpath>
+                                <nomatch Class="PatchOperationAdd">
+                                    <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]</xpath>
+                                    <value>
+                                        <comps />
+                                    </value>
+                                </nomatch>
+                            </li>
+                            <!-- Weapon Values -->
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/comps</xpath>
+                                <value>
+                                    <li Class="CombatExtended.CompProperties_ExplosiveCE">
+                                        <damageAmountBase>60</damageAmountBase>
+                                        <explosiveDamageType>Bomb</explosiveDamageType>
+                                        <explosiveRadius>2.75</explosiveRadius>
+
+                                    </li>
+                                    <li Class="CombatExtended.CompProperties_Fragments">
+                                        <fragments>
+                                            <Fragment_Solar>50</Fragment_Solar>
+                                        </fragments>
                                     </li>
-                                    <li>
-                                        <filter>
+                                </value>
+                            </li>
+
+                            <li MayRequire="ceteam.combatextended" Class="CombatExtended.PatchOperationMakeGunCECompatible">
+                                <defName>BOR_JI_Dunder_I</defName>
+                                <statBases>
+                                    <Mass>2.08</Mass>
+                                    <MarketValue>10.875</MarketValue>
+                                    <RangedWeapon_Cooldown>0.83</RangedWeapon_Cooldown>
+                                    <SightsEfficiency>1.5</SightsEfficiency>
+                                </statBases>
+                                <Properties>
+                                    <label>throw solar satchel charge</label>
+                                    <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+                                    <hasStandardCommand>true</hasStandardCommand>
+                                    <range>15.0</range>
+                                    <minRange>3</minRange>
+                                    <warmupTime>0.65</warmupTime>
+                                    <noiseRadius>3</noiseRadius>
+                                    <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                    <soundCast>ThrowGrenade</soundCast>
+                                    <targetParams>
+                                        <canTargetLocations>true</canTargetLocations>
+                                    </targetParams>
+                                    <defaultProjectile>BOR_Proj_Dunder_I</defaultProjectile>
+                                    <onlyManualCast>true</onlyManualCast>
+                                    <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+                                </Properties>
+                                <weaponTags>
+                                    <li>CE_AI_Grenade</li>
+                                    <li>CE_OneHandedWeapon</li>
+                                </weaponTags>
+                            </li>
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs</xpath>
+                                <value>
+                                    <RecipeDef ParentName="RSExplosive_RecipeBase">
+                                        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+                                        <effectWorking>Cook</effectWorking>
+                                        <soundWorking>Recipe_Smith</soundWorking>
+                                        <workSkill>Crafting</workSkill>
+                                        <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+                                        <defName>BOR_Craft_10_Dunder_I</defName>
+                                        <label>Craft 10 solar satchel charges</label>
+                                        <description>Craft 10 Dunder II solar satchel charges.</description>
+                                        <jobString>Crafting solar satchel charges</jobString>
+                                        <ingredients>
+                                            <li>
+                                                <filter>
+                                                    <thingDefs>
+                                                        <li>ComponentSpacer</li>
+                                                    </thingDefs>
+                                                </filter>
+                                                <count>2</count>
+                                            </li>
+                                            <li>
+                                                <filter>
+                                                    <thingDefs>
+                                                        <li>Plasteel</li>
+                                                    </thingDefs>
+                                                </filter>
+                                                <count>30</count>
+                                            </li>
+                                            <li>
+                                                <filter>
+                                                    <thingDefs>
+                                                        <li>FSX</li>
+                                                    </thingDefs>
+                                                </filter>
+                                                <count>20</count>
+                                            </li>
+                                        </ingredients>
+                                        <fixedIngredientFilter>
                                             <thingDefs>
+                                                <li>Plasteel</li>
+                                                <li>ComponentSpacer</li>
                                                 <li>FSX</li>
                                             </thingDefs>
-                                        </filter>
-                                        <count>20</count>
-                                    </li>
-                                </ingredients>
-                                <fixedIngredientFilter>
-                                    <thingDefs>
-                                        <li>Plasteel</li>
-                                        <li>ComponentSpacer</li>
-                                        <li>FSX</li>
-                                    </thingDefs>
-                                </fixedIngredientFilter>
-                                <researchPrerequisites>
-                                    <li>BOR_Research_Weapons_I</li>
-                                    <li>MoltenTech</li>
-                                </researchPrerequisites>
-                                <skillRequirements>
-                                    <Crafting>12</Crafting>
-                                </skillRequirements>
-                                <products>
-                                    <BOR_JI_Dunder_I>10</BOR_JI_Dunder_I>
-                                </products>
-                                <workAmount>35000</workAmount>
-                                <recipeUsers>
-                                    <li>BOR_Bench_I</li>
-                                    <li>BOR_Bench_IV</li>
-                                </recipeUsers>
-                            </RecipeDef>
-                        </value>
-                    </li>
-
-				</operations>
-			</match>
-	  </li>
-	 </operations>
-    </enabled>
-  </Operation>
+                                        </fixedIngredientFilter>
+                                        <researchPrerequisites>
+                                            <li>BOR_Research_Weapons_I</li>
+                                            <li>MoltenTech</li>
+                                        </researchPrerequisites>
+                                        <skillRequirements>
+                                            <Crafting>12</Crafting>
+                                        </skillRequirements>
+                                        <products>
+                                            <BOR_JI_Dunder_I>10</BOR_JI_Dunder_I>
+                                        </products>
+                                        <workAmount>35000</workAmount>
+                                        <recipeUsers>
+                                            <li>BOR_Bench_I</li>
+                                            <li>BOR_Bench_IV</li>
+                                        </recipeUsers>
+                                    </RecipeDef>
+                                </value>
+                            </li>
+
+                        </operations>
+                    </match>
+                </li>
+            </operations>
+        </enabled>
+    </Operation>
 
 </Patch>
\ No newline at end of file
diff --git a/Mods/Rimsenal/Patches/Defs/tier2_satchel.xml b/Mods/Rimsenal/Patches/Defs/tier2_satchel.xml
index 3c61362c..bda283b0 100644
--- a/Mods/Rimsenal/Patches/Defs/tier2_satchel.xml
+++ b/Mods/Rimsenal/Patches/Defs/tier2_satchel.xml
@@ -1,349 +1,349 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
 
-  <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
-    <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
-    <enabled Class="PatchOperationSequence">
-	  <operations>
-	  
-	  <!-- patch sequence to patch in defs while proceeding to check for CE -->
-	  <li Class="PatchOperationAdd">
-      <xpath>Defs</xpath>
-      
-            <value>
-
-                <ThingDef ParentName="BaseGrenadeProjectile">
-                    <defName>BOR_Proj_Dunder_II</defName>
-                    <label>Satchel charge</label>
-                    <thingClass>Projectile_Explosive</thingClass>
-                    <graphicData>
-                        <color>(0.36, 0.5, 0.7)</color>
-                        <texPath>Things/Projectile/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <projectile>
-                        <explosionRadius>13</explosionRadius>
-                        <damageDef>Bomb</damageDef>
-                        <damageAmountBase>675</damageAmountBase>
-                        <explosionDelay>291</explosionDelay>
-                    </projectile>
-                </ThingDef>
-
-                <ThingDef ParentName="BaseRSGrenade">
-                    <defName>BOR_JI_Dunder_II</defName>
-                    <equipmentType>Primary</equipmentType>
-                    <label>kwazaari satchel charge</label>
-                    <description>A "Dunder III" kwazaari Satchel charge. Combat engineer's best friend.</description>
-                    <graphicData>
-                        <color>(0.36, 0.5, 0.7)</color>
-                        <texPath>Things/A16/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <tradeTags>
-                        <li>BOR_Tech_II</li>
-                    </tradeTags>
-                    <soundInteract>Interact_Grenade</soundInteract>
-                    <techLevel>Ultra</techLevel>
-                    <statBases>
-                        <Mass>2.5</Mass>
-                        <RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
-
-                        <RoyalFavorValue>3</RoyalFavorValue>
-                    </statBases>
-                    <thingCategories>
-                        <li>Grenades</li>
-                    </thingCategories>
-                    <recipeMaker>
-                        <researchPrerequisite>BOR_Research_Weapons_II</researchPrerequisite>
-                        <skillRequirements>
-                            <Crafting>17</Crafting>
-                        </skillRequirements>
-                        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                        <workSkill>Crafting</workSkill>
-                        <effectWorking>Smith</effectWorking>
-                        <soundWorking>Recipe_Smith</soundWorking>
-                        <recipeUsers>
-                            <li>BOR_Bench_II</li>
-                            <li>BOR_Bench_IV</li>
-                        </recipeUsers>
-                        <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                    </recipeMaker>
-                    <costList>
-                        <BOR_ComponentII>5</BOR_ComponentII>
-                        <BOR_QuasarAlloy>55</BOR_QuasarAlloy>
-                        <BOR_Neutronium>225</BOR_Neutronium>
-                    </costList>
-                    <verbs>
-                        <li>
-                            <label>throw kwazaari satchel charge</label>
-                            <verbClass>Verb_LaunchProjectile</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>19</range>
-                            <forcedMissRadius>0.5</forcedMissRadius>
-                            <warmupTime>1.85</warmupTime>
-                            <noiseRadius>4.625</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_II</defaultProjectile>
-                        </li>
-                    </verbs>
-                </ThingDef>
-
-            </value>
-
-	  </li>
-	  
-	  <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
-	  <li Class="PatchOperationFindMod">
-		<mods>
-		  <li>Combat Extended</li>
-		</mods>
-			<match Class="PatchOperationSequence">
-                <operations>
-
-
-                    <!-- ========== Remove Recipe Maker & Verbs ========== -->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/recipeMaker </xpath>
-                    </li>
-
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/costList </xpath>
-                    </li>
-
-                    <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/verbs </xpath>
-                    </li>
-
-                    <!-- Change TickerType.-->
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
-                        <value>
-                            <tickerType>Normal</tickerType>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile thingClass ========== -->
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/thingClass </xpath>
-                        <value>
-                            <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile ========== -->
-
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/projectile</xpath>
-                        <value>
-                            <projectile Class="CombatExtended.ProjectilePropertiesCE">
-                                <explosionRadius>10.125</explosionRadius>
+    <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
+        <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
+        <enabled Class="PatchOperationSequence">
+            <operations>
+
+                <!-- patch sequence to patch in defs while proceeding to check for CE -->
+                <li Class="PatchOperationAdd">
+                    <xpath>Defs</xpath>
+
+                    <value>
+
+                        <ThingDef ParentName="BaseGrenadeProjectile">
+                            <defName>BOR_Proj_Dunder_II</defName>
+                            <label>Satchel charge</label>
+                            <thingClass>Projectile_Explosive</thingClass>
+                            <graphicData>
+                                <color>(0.36, 0.5, 0.7)</color>
+                                <texPath>Things/Projectile/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <projectile>
+                                <explosionRadius>13</explosionRadius>
                                 <damageDef>Bomb</damageDef>
-                                <damageAmountBase>450</damageAmountBase>
-                                <explosionDelay>300</explosionDelay>
-                                <dropsCasings>false</dropsCasings>
-                                <speed>22</speed>
-                                <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-                                <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-                                <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                <damageAmountBase>675</damageAmountBase>
+                                <explosionDelay>291</explosionDelay>
                             </projectile>
-                        </value>
-                    </li>
-                    <!-- ========== Check Comp ========== -->
-
-
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-
-                    <!-- ========== Add Fragmentation ========== -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Quasar>0</Fragment_Quasar>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <!-- Weapon Stack and Appearance -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/graphicData </xpath>
-                        <value>
-                            <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
-                        <value>
-                            <thingClass>CombatExtended.AmmoThing</thingClass>
-                            <stackLimit>75</stackLimit>
-                            <resourceReadoutPriority>First</resourceReadoutPriority>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAttributeSet">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
-                        <attribute>Class</attribute>
-                        <value>CombatExtended.AmmoDef</value>
-                    </li>
-
-                    <!-- Weapon Check Comps -->
-
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-                    <!-- Weapon Values -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_ExplosiveCE">
-                                <damageAmountBase>90</damageAmountBase>
-                                <explosiveDamageType>Bomb</explosiveDamageType>
-                                <explosiveRadius>4.125</explosiveRadius>
+                        </ThingDef>
 
-                            </li>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Quasar>50</Fragment_Quasar>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-                        <defName>BOR_JI_Dunder_II</defName>
-                        <statBases>
-                            <Mass>1.73</Mass>
-                            <MarketValue>16.3125</MarketValue>
-                            <RangedWeapon_Cooldown>0.69</RangedWeapon_Cooldown>
-                            <SightsEfficiency>2.25</SightsEfficiency>
-                        </statBases>
-                        <Properties>
-                            <label>throw quasar satchel charge</label>
-                            <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>22.5</range>
-                            <minRange>3</minRange>
-                            <warmupTime>0.45</warmupTime>
-                            <noiseRadius>3</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_II</defaultProjectile>
-                            <onlyManualCast>true</onlyManualCast>
-                            <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-                        </Properties>
-                        <weaponTags>
-                            <li>CE_AI_Grenade</li>
-                            <li>CE_OneHandedWeapon</li>
-                        </weaponTags>
-                    </li>
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs</xpath>
-                        <value>
-                            <RecipeDef ParentName="RSExplosive_RecipeBase">
+                        <ThingDef ParentName="BaseRSGrenade">
+                            <defName>BOR_JI_Dunder_II</defName>
+                            <equipmentType>Primary</equipmentType>
+                            <label>kwazaari satchel charge</label>
+                            <description>A "Dunder III" kwazaari Satchel charge. Combat engineer's best friend.</description>
+                            <graphicData>
+                                <color>(0.36, 0.5, 0.7)</color>
+                                <texPath>Things/A16/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <tradeTags>
+                                <li>BOR_Tech_II</li>
+                            </tradeTags>
+                            <soundInteract>Interact_Grenade</soundInteract>
+                            <techLevel>Ultra</techLevel>
+                            <statBases>
+                                <Mass>2.5</Mass>
+                                <RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
+
+                                <RoyalFavorValue>3</RoyalFavorValue>
+                            </statBases>
+                            <thingCategories>
+                                <li>Grenades</li>
+                            </thingCategories>
+                            <recipeMaker>
+                                <researchPrerequisite>BOR_Research_Weapons_II</researchPrerequisite>
+                                <skillRequirements>
+                                    <Crafting>17</Crafting>
+                                </skillRequirements>
                                 <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                                <effectWorking>Cook</effectWorking>
-                                <soundWorking>Recipe_Smith</soundWorking>
                                 <workSkill>Crafting</workSkill>
+                                <effectWorking>Smith</effectWorking>
+                                <soundWorking>Recipe_Smith</soundWorking>
+                                <recipeUsers>
+                                    <li>BOR_Bench_II</li>
+                                    <li>BOR_Bench_IV</li>
+                                </recipeUsers>
                                 <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                                <defName>BOR_Craft_10_Dunder_II</defName>
-                                <label>Craft 10 quasar satchel charges</label>
-                                <description>Craft 10 Dunder III quasar satchel charges.</description>
-                                <jobString>Crafting quasar satchel charges</jobString>
-                                <ingredients>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_ComponentII</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>2</count>
+                            </recipeMaker>
+                            <costList>
+                                <BOR_ComponentII>5</BOR_ComponentII>
+                                <BOR_QuasarAlloy>55</BOR_QuasarAlloy>
+                                <BOR_Neutronium>225</BOR_Neutronium>
+                            </costList>
+                            <verbs>
+                                <li>
+                                    <label>throw kwazaari satchel charge</label>
+                                    <verbClass>Verb_LaunchProjectile</verbClass>
+                                    <hasStandardCommand>true</hasStandardCommand>
+                                    <range>19</range>
+                                    <forcedMissRadius>0.5</forcedMissRadius>
+                                    <warmupTime>1.85</warmupTime>
+                                    <noiseRadius>4.625</noiseRadius>
+                                    <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                    <soundCast>ThrowGrenade</soundCast>
+                                    <targetParams>
+                                        <canTargetLocations>true</canTargetLocations>
+                                    </targetParams>
+                                    <defaultProjectile>BOR_Proj_Dunder_II</defaultProjectile>
+                                </li>
+                            </verbs>
+                        </ThingDef>
+
+                    </value>
+
+                </li>
+
+                <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
+                <li Class="PatchOperationFindMod">
+                    <mods>
+                        <li>Combat Extended</li>
+                    </mods>
+                    <match Class="PatchOperationSequence">
+                        <operations>
+
+
+                            <!-- ========== Remove Recipe Maker & Verbs ========== -->
+                            <li Class="PatchOperationRemove">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/recipeMaker</xpath>
+                            </li>
+
+                            <li Class="PatchOperationRemove">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/costList</xpath>
+                            </li>
+
+                            <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
+                            <li Class="PatchOperationRemove">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/verbs</xpath>
+                            </li>
+
+                            <!-- Change TickerType.-->
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
+                                <value>
+                                    <tickerType>Normal</tickerType>
+                                </value>
+                            </li>
+
+                            <!-- ========== Projectile thingClass ========== -->
+
+                            <li Class="PatchOperationReplace">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/thingClass</xpath>
+                                <value>
+                                    <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+                                </value>
+                            </li>
+
+                            <!-- ========== Projectile ========== -->
+
+
+                            <li Class="PatchOperationReplace">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/projectile</xpath>
+                                <value>
+                                    <projectile Class="CombatExtended.ProjectilePropertiesCE">
+                                        <explosionRadius>10.125</explosionRadius>
+                                        <damageDef>Bomb</damageDef>
+                                        <damageAmountBase>450</damageAmountBase>
+                                        <explosionDelay>300</explosionDelay>
+                                        <dropsCasings>false</dropsCasings>
+                                        <speed>22</speed>
+                                        <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+                                        <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+                                        <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                    </projectile>
+                                </value>
+                            </li>
+                            <!-- ========== Check Comp ========== -->
+
+
+                            <li Class="PatchOperationConditional">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/comps</xpath>
+                                <nomatch Class="PatchOperationAdd">
+                                    <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]</xpath>
+                                    <value>
+                                        <comps />
+                                    </value>
+                                </nomatch>
+                            </li>
+
+                            <!-- ========== Add Fragmentation ========== -->
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/comps</xpath>
+                                <value>
+                                    <li Class="CombatExtended.CompProperties_Fragments">
+                                        <fragments>
+                                            <Fragment_Quasar>0</Fragment_Quasar>
+                                        </fragments>
                                     </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_Sunsteel</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>10</count>
+                                </value>
+                            </li>
+
+                            <!-- Weapon Stack and Appearance -->
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/graphicData</xpath>
+                                <value>
+                                    <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+                                </value>
+                            </li>
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
+                                <value>
+                                    <thingClass>CombatExtended.AmmoThing</thingClass>
+                                    <stackLimit>75</stackLimit>
+                                    <resourceReadoutPriority>First</resourceReadoutPriority>
+                                </value>
+                            </li>
+
+                            <li Class="PatchOperationAttributeSet">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
+                                <attribute>Class</attribute>
+                                <value>CombatExtended.AmmoDef</value>
+                            </li>
+
+                            <!-- Weapon Check Comps -->
+
+                            <li Class="PatchOperationConditional">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/comps</xpath>
+                                <nomatch Class="PatchOperationAdd">
+                                    <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]</xpath>
+                                    <value>
+                                        <comps />
+                                    </value>
+                                </nomatch>
+                            </li>
+                            <!-- Weapon Values -->
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/comps</xpath>
+                                <value>
+                                    <li Class="CombatExtended.CompProperties_ExplosiveCE">
+                                        <damageAmountBase>90</damageAmountBase>
+                                        <explosiveDamageType>Bomb</explosiveDamageType>
+                                        <explosiveRadius>4.125</explosiveRadius>
+
                                     </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_QuasarAlloy</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>20</count>
+                                    <li Class="CombatExtended.CompProperties_Fragments">
+                                        <fragments>
+                                            <Fragment_Quasar>50</Fragment_Quasar>
+                                        </fragments>
                                     </li>
-                                    <li>
-                                        <filter>
+                                </value>
+                            </li>
+
+                            <li MayRequire="ceteam.combatextended" Class="CombatExtended.PatchOperationMakeGunCECompatible">
+                                <defName>BOR_JI_Dunder_II</defName>
+                                <statBases>
+                                    <Mass>1.73</Mass>
+                                    <MarketValue>16.3125</MarketValue>
+                                    <RangedWeapon_Cooldown>0.69</RangedWeapon_Cooldown>
+                                    <SightsEfficiency>2.25</SightsEfficiency>
+                                </statBases>
+                                <Properties>
+                                    <label>throw quasar satchel charge</label>
+                                    <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+                                    <hasStandardCommand>true</hasStandardCommand>
+                                    <range>22.5</range>
+                                    <minRange>3</minRange>
+                                    <warmupTime>0.45</warmupTime>
+                                    <noiseRadius>3</noiseRadius>
+                                    <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                    <soundCast>ThrowGrenade</soundCast>
+                                    <targetParams>
+                                        <canTargetLocations>true</canTargetLocations>
+                                    </targetParams>
+                                    <defaultProjectile>BOR_Proj_Dunder_II</defaultProjectile>
+                                    <onlyManualCast>true</onlyManualCast>
+                                    <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+                                </Properties>
+                                <weaponTags>
+                                    <li>CE_AI_Grenade</li>
+                                    <li>CE_OneHandedWeapon</li>
+                                </weaponTags>
+                            </li>
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs</xpath>
+                                <value>
+                                    <RecipeDef ParentName="RSExplosive_RecipeBase">
+                                        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+                                        <effectWorking>Cook</effectWorking>
+                                        <soundWorking>Recipe_Smith</soundWorking>
+                                        <workSkill>Crafting</workSkill>
+                                        <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+                                        <defName>BOR_Craft_10_Dunder_II</defName>
+                                        <label>Craft 10 quasar satchel charges</label>
+                                        <description>Craft 10 Dunder III quasar satchel charges.</description>
+                                        <jobString>Crafting quasar satchel charges</jobString>
+                                        <ingredients>
+                                            <li>
+                                                <filter>
+                                                    <thingDefs>
+                                                        <li>BOR_ComponentII</li>
+                                                    </thingDefs>
+                                                </filter>
+                                                <count>2</count>
+                                            </li>
+                                            <li>
+                                                <filter>
+                                                    <thingDefs>
+                                                        <li>BOR_Sunsteel</li>
+                                                    </thingDefs>
+                                                </filter>
+                                                <count>10</count>
+                                            </li>
+                                            <li>
+                                                <filter>
+                                                    <thingDefs>
+                                                        <li>BOR_QuasarAlloy</li>
+                                                    </thingDefs>
+                                                </filter>
+                                                <count>20</count>
+                                            </li>
+                                            <li>
+                                                <filter>
+                                                    <thingDefs>
+                                                        <li>BOR_Neutronium</li>
+                                                    </thingDefs>
+                                                </filter>
+                                                <count>35</count>
+                                            </li>
+                                        </ingredients>
+                                        <fixedIngredientFilter>
                                             <thingDefs>
+                                                <li>BOR_Sunsteel</li>
+                                                <li>BOR_QuasarAlloy</li>
+                                                <li>BOR_ComponentII</li>
                                                 <li>BOR_Neutronium</li>
                                             </thingDefs>
-                                        </filter>
-                                        <count>35</count>
-                                    </li>
-                                </ingredients>
-                                <fixedIngredientFilter>
-                                    <thingDefs>
-                                        <li>BOR_Sunsteel</li>
-                                        <li>BOR_QuasarAlloy</li>
-                                        <li>BOR_ComponentII</li>
-                                        <li>BOR_Neutronium</li>
-                                    </thingDefs>
-                                </fixedIngredientFilter>
-                                <researchPrerequisites>
-                                    <li>BOR_Research_Weapons_II</li>
-                                    <li>MoltenTech</li>
-                                </researchPrerequisites>
-                                <skillRequirements>
-                                    <Crafting>15</Crafting>
-                                </skillRequirements>
-                                <products>
-                                    <BOR_JI_Dunder_II>10</BOR_JI_Dunder_II>
-                                </products>
-                                <workAmount>47500</workAmount>
-                                <recipeUsers>
-                                    <li>BOR_Bench_II</li>
-                                    <li>BOR_Bench_IV</li>
-                                </recipeUsers>
-                            </RecipeDef>
-                        </value>
-                    </li>
-                </operations>
-
-			</match>
-	  </li>
-	 </operations>
-    </enabled>
-  </Operation>
+                                        </fixedIngredientFilter>
+                                        <researchPrerequisites>
+                                            <li>BOR_Research_Weapons_II</li>
+                                            <li>MoltenTech</li>
+                                        </researchPrerequisites>
+                                        <skillRequirements>
+                                            <Crafting>15</Crafting>
+                                        </skillRequirements>
+                                        <products>
+                                            <BOR_JI_Dunder_II>10</BOR_JI_Dunder_II>
+                                        </products>
+                                        <workAmount>47500</workAmount>
+                                        <recipeUsers>
+                                            <li>BOR_Bench_II</li>
+                                            <li>BOR_Bench_IV</li>
+                                        </recipeUsers>
+                                    </RecipeDef>
+                                </value>
+                            </li>
+                        </operations>
+
+                    </match>
+                </li>
+            </operations>
+        </enabled>
+    </Operation>
 
 </Patch>
\ No newline at end of file
diff --git a/Mods/Rimsenal/Patches/Defs/tier3_satchel.xml b/Mods/Rimsenal/Patches/Defs/tier3_satchel.xml
index 2e39d4bc..40104010 100644
--- a/Mods/Rimsenal/Patches/Defs/tier3_satchel.xml
+++ b/Mods/Rimsenal/Patches/Defs/tier3_satchel.xml
@@ -1,347 +1,347 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
 
-  <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
-    <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
-    <enabled Class="PatchOperationSequence">
-	  <operations>
-	  
-	  <!-- patch sequence to patch in defs while proceeding to check for CE -->
-	  <li Class="PatchOperationAdd">
-      <xpath>Defs</xpath>
-      
-	  <value>
-	  
-                <ThingDef ParentName="BaseGrenadeProjectile">
-                    <defName>BOR_Proj_Dunder_III</defName>
-                    <label>tenebral Satchel charge</label>
-                    <thingClass>Projectile_Explosive</thingClass>
-                    <graphicData>
-                        <color>(0.2, 0.2, 0.2)</color>
-                        <texPath>Things/Projectile/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <projectile>
-                        <explosionRadius>19</explosionRadius>
-                        <damageDef>Bomb</damageDef>
-                        <damageAmountBase>1000</damageAmountBase>
-                        <explosionDelay>242</explosionDelay>
-                    </projectile>
-                </ThingDef>
-
-                <ThingDef ParentName="BaseRSGrenade">
-                    <defName>BOR_JI_Dunder_III</defName>
-                    <equipmentType>Primary</equipmentType>
-                    <label>tenebral satchel charge</label>
-                    <description>A "Dunder IV" tenebral Satchel charge. Combat engineer's best friend.</description>
-                    <graphicData>
-                        <color>(0.2, 0.2, 0.2)</color>
-                        <texPath>Things/A16/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <tradeTags>
-                        <li>BOR_Tech_III</li>
-                    </tradeTags>
-                    <soundInteract>Interact_Grenade</soundInteract>
-                    <techLevel>Archotech</techLevel>
-                    <statBases>
-                        <Mass>2.08</Mass>
-                        <RangedWeapon_Cooldown>1.29</RangedWeapon_Cooldown>
-
-                        <RoyalFavorValue>6</RoyalFavorValue>
-                    </statBases>
-                    <thingCategories>
-                        <li>Grenades</li>
-                    </thingCategories>
-                    <recipeMaker>
-                        <researchPrerequisite>BOR_Research_Weapons_III</researchPrerequisite>
-                        <skillRequirements>
-                            <Crafting>20</Crafting>
-                        </skillRequirements>
-                        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                        <workSkill>Crafting</workSkill>
-                        <effectWorking>Smith</effectWorking>
-                        <soundWorking>Recipe_Smith</soundWorking>
-                        <recipeUsers>
-                            <li>BOR_Bench_III</li>
-                            <li>BOR_Bench_IV</li>
-                        </recipeUsers>
-                        <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                    </recipeMaker>
-                    <costList>
-                        <BOR_ComponentIII>5</BOR_ComponentIII>
-                        <BOR_Tenebrite>55</BOR_Tenebrite>
-                        <BOR_Neutronium>337</BOR_Neutronium>
-                    </costList>
-                    <verbs>
-                        <li>
-                            <label>throw kwazaari satchel charge</label>
-                            <verbClass>Verb_LaunchProjectile</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>28</range>
-                            <forcedMissRadius>0.5</forcedMissRadius>
-                            <warmupTime>1.55</warmupTime>
-                            <noiseRadius>3.85</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_III</defaultProjectile>
-                        </li>
-                    </verbs>
-                </ThingDef>
-
-      </value>
-	  </li>
-	  
-	  <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
-	  <li Class="PatchOperationFindMod">
-		<mods>
-		  <li>Combat Extended</li>
-		</mods>
-			<match Class="PatchOperationSequence">
-                <operations>
-
-
-                    <!-- ========== Remove Recipe Maker & Verbs ========== -->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/recipeMaker </xpath>
-                    </li>
-
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/costList </xpath>
-                    </li>
-
-                    <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/verbs </xpath>
-                    </li>
-
-                    <!-- Change TickerType.-->
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
-                        <value>
-                            <tickerType>Normal</tickerType>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile thingClass ========== -->
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/thingClass </xpath>
-                        <value>
-                            <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile ========== -->
-
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/projectile</xpath>
-                        <value>
-                            <projectile Class="CombatExtended.ProjectilePropertiesCE">
-                                <explosionRadius>15.875</explosionRadius>
+    <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
+        <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
+        <enabled Class="PatchOperationSequence">
+            <operations>
+
+                <!-- patch sequence to patch in defs while proceeding to check for CE -->
+                <li Class="PatchOperationAdd">
+                    <xpath>Defs</xpath>
+
+                    <value>
+
+                        <ThingDef ParentName="BaseGrenadeProjectile">
+                            <defName>BOR_Proj_Dunder_III</defName>
+                            <label>tenebral Satchel charge</label>
+                            <thingClass>Projectile_Explosive</thingClass>
+                            <graphicData>
+                                <color>(0.2, 0.2, 0.2)</color>
+                                <texPath>Things/Projectile/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <projectile>
+                                <explosionRadius>19</explosionRadius>
                                 <damageDef>Bomb</damageDef>
-                                <damageAmountBase>675</damageAmountBase>
-                                <explosionDelay>250</explosionDelay>
-                                <dropsCasings>false</dropsCasings>
-                                <speed>33</speed>
-                                <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-                                <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-                                <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                <damageAmountBase>1000</damageAmountBase>
+                                <explosionDelay>242</explosionDelay>
                             </projectile>
-                        </value>
-                    </li>
-                    <!-- ========== Check Comp ========== -->
-
-
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-
-                    <!-- ========== Add Fragmentation ========== -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Tenebral>0</Fragment_Tenebral>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <!-- Weapon Stack and Appearance -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/graphicData </xpath>
-                        <value>
-                            <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
-                        <value>
-                            <thingClass>CombatExtended.AmmoThing</thingClass>
-                            <stackLimit>75</stackLimit>
-                            <resourceReadoutPriority>First</resourceReadoutPriority>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAttributeSet">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
-                        <attribute>Class</attribute>
-                        <value>CombatExtended.AmmoDef</value>
-                    </li>
-
-                    <!-- Weapon Check Comps -->
-
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-                    <!-- Weapon Values -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_ExplosiveCE">
-                                <damageAmountBase>135</damageAmountBase>
-                                <explosiveDamageType>Bomb</explosiveDamageType>
-                                <explosiveRadius>6.4</explosiveRadius>
+                        </ThingDef>
 
-                            </li>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Tenebral>50</Fragment_Tenebral>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-                        <defName>BOR_JI_Dunder_III</defName>
-                        <statBases>
-                            <Mass>1.4</Mass>
-                            <MarketValue>24.5</MarketValue>
-                            <RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-                            <SightsEfficiency>3.125</SightsEfficiency>
-                        </statBases>
-                        <Properties>
-                            <label>throw tenebral satchel charge</label>
-                            <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>33.75</range>
-                            <minRange>3</minRange>
-                            <warmupTime>0.35</warmupTime>
-                            <noiseRadius>2</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_III</defaultProjectile>
-                            <onlyManualCast>true</onlyManualCast>
-                            <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-                        </Properties>
-                        <weaponTags>
-                            <li>CE_AI_Grenade</li>
-                            <li>CE_OneHandedWeapon</li>
-                        </weaponTags>
-                    </li>
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs</xpath>
-                        <value>
-                            <RecipeDef ParentName="RSExplosive_RecipeBase">
+                        <ThingDef ParentName="BaseRSGrenade">
+                            <defName>BOR_JI_Dunder_III</defName>
+                            <equipmentType>Primary</equipmentType>
+                            <label>tenebral satchel charge</label>
+                            <description>A "Dunder IV" tenebral Satchel charge. Combat engineer's best friend.</description>
+                            <graphicData>
+                                <color>(0.2, 0.2, 0.2)</color>
+                                <texPath>Things/A16/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <tradeTags>
+                                <li>BOR_Tech_III</li>
+                            </tradeTags>
+                            <soundInteract>Interact_Grenade</soundInteract>
+                            <techLevel>Archotech</techLevel>
+                            <statBases>
+                                <Mass>2.08</Mass>
+                                <RangedWeapon_Cooldown>1.29</RangedWeapon_Cooldown>
+
+                                <RoyalFavorValue>6</RoyalFavorValue>
+                            </statBases>
+                            <thingCategories>
+                                <li>Grenades</li>
+                            </thingCategories>
+                            <recipeMaker>
+                                <researchPrerequisite>BOR_Research_Weapons_III</researchPrerequisite>
+                                <skillRequirements>
+                                    <Crafting>20</Crafting>
+                                </skillRequirements>
                                 <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                                <effectWorking>Cook</effectWorking>
-                                <soundWorking>Recipe_Smith</soundWorking>
                                 <workSkill>Crafting</workSkill>
+                                <effectWorking>Smith</effectWorking>
+                                <soundWorking>Recipe_Smith</soundWorking>
+                                <recipeUsers>
+                                    <li>BOR_Bench_III</li>
+                                    <li>BOR_Bench_IV</li>
+                                </recipeUsers>
                                 <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                                <defName>BOR_Craft_10_Dunder_III</defName>
-                                <label>Craft 10 tenebral satchel charges</label>
-                                <description>Craft 10 Dunder IV tenebral satchel charges.</description>
-                                <jobString>Crafting tenebral satchel charges</jobString>
-                                <ingredients>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_ComponentIII</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>2</count>
+                            </recipeMaker>
+                            <costList>
+                                <BOR_ComponentIII>5</BOR_ComponentIII>
+                                <BOR_Tenebrite>55</BOR_Tenebrite>
+                                <BOR_Neutronium>337</BOR_Neutronium>
+                            </costList>
+                            <verbs>
+                                <li>
+                                    <label>throw kwazaari satchel charge</label>
+                                    <verbClass>Verb_LaunchProjectile</verbClass>
+                                    <hasStandardCommand>true</hasStandardCommand>
+                                    <range>28</range>
+                                    <forcedMissRadius>0.5</forcedMissRadius>
+                                    <warmupTime>1.55</warmupTime>
+                                    <noiseRadius>3.85</noiseRadius>
+                                    <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                    <soundCast>ThrowGrenade</soundCast>
+                                    <targetParams>
+                                        <canTargetLocations>true</canTargetLocations>
+                                    </targetParams>
+                                    <defaultProjectile>BOR_Proj_Dunder_III</defaultProjectile>
+                                </li>
+                            </verbs>
+                        </ThingDef>
+
+                    </value>
+                </li>
+
+                <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
+                <li Class="PatchOperationFindMod">
+                    <mods>
+                        <li>Combat Extended</li>
+                    </mods>
+                    <match Class="PatchOperationSequence">
+                        <operations>
+
+
+                            <!-- ========== Remove Recipe Maker & Verbs ========== -->
+                            <li Class="PatchOperationRemove">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/recipeMaker</xpath>
+                            </li>
+
+                            <li Class="PatchOperationRemove">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/costList</xpath>
+                            </li>
+
+                            <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
+                            <li Class="PatchOperationRemove">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/verbs</xpath>
+                            </li>
+
+                            <!-- Change TickerType.-->
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
+                                <value>
+                                    <tickerType>Normal</tickerType>
+                                </value>
+                            </li>
+
+                            <!-- ========== Projectile thingClass ========== -->
+
+                            <li Class="PatchOperationReplace">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/thingClass</xpath>
+                                <value>
+                                    <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+                                </value>
+                            </li>
+
+                            <!-- ========== Projectile ========== -->
+
+
+                            <li Class="PatchOperationReplace">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/projectile</xpath>
+                                <value>
+                                    <projectile Class="CombatExtended.ProjectilePropertiesCE">
+                                        <explosionRadius>15.875</explosionRadius>
+                                        <damageDef>Bomb</damageDef>
+                                        <damageAmountBase>675</damageAmountBase>
+                                        <explosionDelay>250</explosionDelay>
+                                        <dropsCasings>false</dropsCasings>
+                                        <speed>33</speed>
+                                        <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+                                        <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+                                        <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                    </projectile>
+                                </value>
+                            </li>
+                            <!-- ========== Check Comp ========== -->
+
+
+                            <li Class="PatchOperationConditional">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/comps</xpath>
+                                <nomatch Class="PatchOperationAdd">
+                                    <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]</xpath>
+                                    <value>
+                                        <comps />
+                                    </value>
+                                </nomatch>
+                            </li>
+
+                            <!-- ========== Add Fragmentation ========== -->
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/comps</xpath>
+                                <value>
+                                    <li Class="CombatExtended.CompProperties_Fragments">
+                                        <fragments>
+                                            <Fragment_Tenebral>0</Fragment_Tenebral>
+                                        </fragments>
                                     </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_Sunsteel</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>10</count>
+                                </value>
+                            </li>
+
+                            <!-- Weapon Stack and Appearance -->
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/graphicData</xpath>
+                                <value>
+                                    <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+                                </value>
+                            </li>
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
+                                <value>
+                                    <thingClass>CombatExtended.AmmoThing</thingClass>
+                                    <stackLimit>75</stackLimit>
+                                    <resourceReadoutPriority>First</resourceReadoutPriority>
+                                </value>
+                            </li>
+
+                            <li Class="PatchOperationAttributeSet">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
+                                <attribute>Class</attribute>
+                                <value>CombatExtended.AmmoDef</value>
+                            </li>
+
+                            <!-- Weapon Check Comps -->
+
+                            <li Class="PatchOperationConditional">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/comps</xpath>
+                                <nomatch Class="PatchOperationAdd">
+                                    <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]</xpath>
+                                    <value>
+                                        <comps />
+                                    </value>
+                                </nomatch>
+                            </li>
+                            <!-- Weapon Values -->
+
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/comps</xpath>
+                                <value>
+                                    <li Class="CombatExtended.CompProperties_ExplosiveCE">
+                                        <damageAmountBase>135</damageAmountBase>
+                                        <explosiveDamageType>Bomb</explosiveDamageType>
+                                        <explosiveRadius>6.4</explosiveRadius>
+
                                     </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_Tenebrite</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>20</count>
+                                    <li Class="CombatExtended.CompProperties_Fragments">
+                                        <fragments>
+                                            <Fragment_Tenebral>50</Fragment_Tenebral>
+                                        </fragments>
                                     </li>
-                                    <li>
-                                        <filter>
+                                </value>
+                            </li>
+
+                            <li MayRequire="ceteam.combatextended" Class="CombatExtended.PatchOperationMakeGunCECompatible">
+                                <defName>BOR_JI_Dunder_III</defName>
+                                <statBases>
+                                    <Mass>1.4</Mass>
+                                    <MarketValue>24.5</MarketValue>
+                                    <RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+                                    <SightsEfficiency>3.125</SightsEfficiency>
+                                </statBases>
+                                <Properties>
+                                    <label>throw tenebral satchel charge</label>
+                                    <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+                                    <hasStandardCommand>true</hasStandardCommand>
+                                    <range>33.75</range>
+                                    <minRange>3</minRange>
+                                    <warmupTime>0.35</warmupTime>
+                                    <noiseRadius>2</noiseRadius>
+                                    <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                    <soundCast>ThrowGrenade</soundCast>
+                                    <targetParams>
+                                        <canTargetLocations>true</canTargetLocations>
+                                    </targetParams>
+                                    <defaultProjectile>BOR_Proj_Dunder_III</defaultProjectile>
+                                    <onlyManualCast>true</onlyManualCast>
+                                    <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+                                </Properties>
+                                <weaponTags>
+                                    <li>CE_AI_Grenade</li>
+                                    <li>CE_OneHandedWeapon</li>
+                                </weaponTags>
+                            </li>
+                            <li Class="PatchOperationAdd">
+                                <xpath>Defs</xpath>
+                                <value>
+                                    <RecipeDef ParentName="RSExplosive_RecipeBase">
+                                        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+                                        <effectWorking>Cook</effectWorking>
+                                        <soundWorking>Recipe_Smith</soundWorking>
+                                        <workSkill>Crafting</workSkill>
+                                        <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+                                        <defName>BOR_Craft_10_Dunder_III</defName>
+                                        <label>Craft 10 tenebral satchel charges</label>
+                                        <description>Craft 10 Dunder IV tenebral satchel charges.</description>
+                                        <jobString>Crafting tenebral satchel charges</jobString>
+                                        <ingredients>
+                                            <li>
+                                                <filter>
+                                                    <thingDefs>
+                                                        <li>BOR_ComponentIII</li>
+                                                    </thingDefs>
+                                                </filter>
+                                                <count>2</count>
+                                            </li>
+                                            <li>
+                                                <filter>
+                                                    <thingDefs>
+                                                        <li>BOR_Sunsteel</li>
+                                                    </thingDefs>
+                                                </filter>
+                                                <count>10</count>
+                                            </li>
+                                            <li>
+                                                <filter>
+                                                    <thingDefs>
+                                                        <li>BOR_Tenebrite</li>
+                                                    </thingDefs>
+                                                </filter>
+                                                <count>20</count>
+                                            </li>
+                                            <li>
+                                                <filter>
+                                                    <thingDefs>
+                                                        <li>BOR_Neutronium</li>
+                                                    </thingDefs>
+                                                </filter>
+                                                <count>47</count>
+                                            </li>
+                                        </ingredients>
+                                        <fixedIngredientFilter>
                                             <thingDefs>
+                                                <li>BOR_Sunsteel</li>
+                                                <li>BOR_ComponentIII</li>
                                                 <li>BOR_Neutronium</li>
                                             </thingDefs>
-                                        </filter>
-                                        <count>47</count>
-                                    </li>
-                                </ingredients>
-                                <fixedIngredientFilter>
-                                    <thingDefs>
-                                        <li>BOR_Sunsteel</li>
-                                        <li>BOR_ComponentIII</li>
-                                        <li>BOR_Neutronium</li>
-                                    </thingDefs>
-                                </fixedIngredientFilter>
-                                <researchPrerequisites>
-                                    <li>BOR_Research_Weapons_III</li>
-                                    <li>MoltenTech</li>
-                                </researchPrerequisites>
-                                <skillRequirements>
-                                    <Crafting>18</Crafting>
-                                </skillRequirements>
-                                <products>
-                                    <BOR_JI_Dunder_III>10</BOR_JI_Dunder_III>
-                                </products>
-                                <workAmount>65000</workAmount>
-                                <recipeUsers>
-                                    <li>BOR_Bench_III</li>
-                                    <li>BOR_Bench_IV</li>
-                                </recipeUsers>
-                            </RecipeDef>
-                        </value>
-                    </li>
-                </operations>
-
-			</match>
-	  </li>
-	 </operations>
-    </enabled>
-  </Operation>
+                                        </fixedIngredientFilter>
+                                        <researchPrerequisites>
+                                            <li>BOR_Research_Weapons_III</li>
+                                            <li>MoltenTech</li>
+                                        </researchPrerequisites>
+                                        <skillRequirements>
+                                            <Crafting>18</Crafting>
+                                        </skillRequirements>
+                                        <products>
+                                            <BOR_JI_Dunder_III>10</BOR_JI_Dunder_III>
+                                        </products>
+                                        <workAmount>65000</workAmount>
+                                        <recipeUsers>
+                                            <li>BOR_Bench_III</li>
+                                            <li>BOR_Bench_IV</li>
+                                        </recipeUsers>
+                                    </RecipeDef>
+                                </value>
+                            </li>
+                        </operations>
+
+                    </match>
+                </li>
+            </operations>
+        </enabled>
+    </Operation>
 
 </Patch>
\ No newline at end of file
diff --git a/Mods/Rimsenal/Patches/Defs/zQuasarEVAPatches.xml b/Mods/Rimsenal/Patches/Defs/zQuasarEVAPatches.xml
new file mode 100644
index 00000000..6f1d5618
--- /dev/null
+++ b/Mods/Rimsenal/Patches/Defs/zQuasarEVAPatches.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+
+    <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
+        <modSettingDef>BOR_Setting_AddSOS2EVAToBORArmors</modSettingDef>
+        <enabled Class="PatchOperationFindMod">
+            <mods>
+                <li>Rimsenal</li>
+            </mods>
+            <match Class="PatchOperationSequence">
+                <operations>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_Dropsuit"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>85</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_DropsuitH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>60</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_Strikesuit"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>85</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_StrikesuitH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>60</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_AssaultArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>85</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_AssaultArmorH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>60</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_FSArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>85</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_Korp"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>85</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_FSArmorH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>60</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_ReflactorArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>85</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_ReflactorArmorH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>60</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_CloseCombatArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>85</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_CloseCombatHelmet"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>60</Insulation_Cold>
+                        </value>
+                    </li>
+
+                </operations>
+            </match>
+        </enabled>
+    </Operation>
+    
+</Patch>
\ No newline at end of file
diff --git a/Mods/Rimsenal/Patches/Defs/zSolarEVAPatches.xml b/Mods/Rimsenal/Patches/Defs/zSolarEVAPatches.xml
new file mode 100644
index 00000000..a87612da
--- /dev/null
+++ b/Mods/Rimsenal/Patches/Defs/zSolarEVAPatches.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+
+
+    <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
+        <modSettingDef>BOR_Setting_AddSOS2EVAToBORArmors</modSettingDef>
+        <enabled Class="PatchOperationFindMod">
+            <mods>
+                <li>Rimsenal</li>
+            </mods>
+            <match Class="PatchOperationSequence">
+                <operations>
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_Dropsuit"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>75</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_DropsuitH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>50</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_Strikesuit"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>75</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_StrikesuitH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>50</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_AssaultArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>75</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_AssaultArmorH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>50</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_FSArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>75</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_Korp"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>75</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_FSArmorH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>50</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_ReflactorArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>75</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_ReflactorArmorH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>50</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_CloseCombatArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>75</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_CloseCombatHelmet"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>50</Insulation_Cold>
+                        </value>
+                    </li>
+
+                </operations>
+            </match>
+        </enabled>
+    </Operation>
+</Patch>
\ No newline at end of file
diff --git a/Mods/Rimsenal/Patches/Defs/zTenebralEVAPatches.xml b/Mods/Rimsenal/Patches/Defs/zTenebralEVAPatches.xml
new file mode 100644
index 00000000..b2fc9ca2
--- /dev/null
+++ b/Mods/Rimsenal/Patches/Defs/zTenebralEVAPatches.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+    
+    <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
+        <modSettingDef>BOR_Setting_AddSOS2EVAToBORArmors</modSettingDef>
+        <enabled Class="PatchOperationFindMod">
+            <mods>
+                <li>Rimsenal</li>
+            </mods>
+            <match Class="PatchOperationSequence">
+                <operations>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_Dropsuit"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>95</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_DropsuitH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>65</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_Strikesuit"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>95</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_StrikesuitH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>65</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_AssaultArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>95</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_AssaultArmorH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>65</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_FSArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>95</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_Korp"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>95</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_FSArmorH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>65</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_ReflactorArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>95</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_ReflactorArmorH"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>65</Insulation_Cold>
+                        </value>
+                    </li>
+
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_CloseCombatArmor"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>95</Insulation_Cold>
+                        </value>
+                    </li>
+
+                    <li Class="PatchOperationReplace">
+                        <xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_CloseCombatHelmet"]/statBases/Insulation_Cold</xpath>
+                        <value>
+                            <Insulation_Cold>65</Insulation_Cold>
+                        </value>
+                    </li>
+
+                </operations>
+            </match>
+        </enabled>
+    </Operation>
+</Patch>
\ No newline at end of file
diff --git a/Mods/Royalty/Patches/Apparel/Tier1.xml b/Mods/Royalty/Patches/Apparel/Tier1.xml
index 8ec1b083..20794237 100644
--- a/Mods/Royalty/Patches/Apparel/Tier1.xml
+++ b/Mods/Royalty/Patches/Apparel/Tier1.xml
@@ -40,8 +40,7 @@
             <tags>
               <li>BOR_Royal_I</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeReconArmor/PrestigeReconArmor</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeReconArmor/PrestigeReconArmor</wornGraphicPath>
             <useWornGraphicMask>true</useWornGraphicMask>
           </apparel>
           <recipeMaker>
@@ -76,8 +75,7 @@
             <tags>
               <li>BOR_Royal_I</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeReconHelmet/PrestigeReconHelmet</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeReconHelmet/PrestigeReconHelmet</wornGraphicPath>
             <forceEyesVisibleForRotations>
               <li>1</li>
               <li>2</li>
@@ -123,8 +121,7 @@
             <tags>
               <li>BOR_Royal_I</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeReconHelmet/PrestigeReconHelmet</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeReconHelmet/PrestigeReconHelmet</wornGraphicPath>
             <forceEyesVisibleForRotations>
               <li>1</li>
               <li>2</li>
@@ -167,8 +164,7 @@
             <tags>
               <li>BOR_Royal_I</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeMarineArmor/PrestigeMarineArmor</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeMarineArmor/PrestigeMarineArmor</wornGraphicPath>
             <forceEyesVisibleForRotations>
               <li>1</li>
               <li>2</li>
@@ -213,8 +209,7 @@
             <tags>
               <li>BOR_Royal_I</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeMarineHelmet/PrestigeMarineHelmet</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeMarineHelmet/PrestigeMarineHelmet</wornGraphicPath>
             <useWornGraphicMask>true</useWornGraphicMask>
           </apparel>
           <recipeMaker>
@@ -286,8 +281,7 @@
               <li>Hands</li>
               <li>Feet</li>
             </bodyPartGroups>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/CataphractArmor/CataphractArmor</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/CataphractArmor/CataphractArmor</wornGraphicPath>
             <layers>
               <li>Middle</li>
               <li>Shell</li>
@@ -358,8 +352,7 @@
             <bodyPartGroups>
               <li>FullHead</li>
             </bodyPartGroups>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/CataphractArmorHelmet/CataphractHelmet</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/CataphractArmorHelmet/CataphractHelmet</wornGraphicPath>
             <layers>
               <li>Overhead</li>
             </layers>
@@ -428,8 +421,7 @@
             <tags>
               <li>BOR_Royal_I</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeCataphractArmor/PrestigeCataphractArmor</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeCataphractArmor/PrestigeCataphractArmor</wornGraphicPath>
             <useWornGraphicMask>true</useWornGraphicMask>
           </apparel>
           <tradeTags>
@@ -468,8 +460,7 @@
             <tags>
               <li>BOR_Royal_I</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeCataphractHelmet/PrestigeCataphractHelmet</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeCataphractHelmet/PrestigeCataphractHelmet</wornGraphicPath>
             <useWornGraphicMask>true</useWornGraphicMask>
           </apparel>
           <recipeMaker>
diff --git a/Mods/Royalty/Patches/Apparel/Tier2.xml b/Mods/Royalty/Patches/Apparel/Tier2.xml
index def4f725..58e92966 100644
--- a/Mods/Royalty/Patches/Apparel/Tier2.xml
+++ b/Mods/Royalty/Patches/Apparel/Tier2.xml
@@ -125,8 +125,7 @@
             <tags>
               <li>BOR_Royal_II</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeMarineArmor/PrestigeMarineArmor</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeMarineArmor/PrestigeMarineArmor</wornGraphicPath>
             <forceEyesVisibleForRotations>
               <li>1</li>
               <li>2</li>
@@ -173,8 +172,7 @@
             <tags>
               <li>BOR_Royal_II</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeMarineHelmet/PrestigeMarineHelmet</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeMarineHelmet/PrestigeMarineHelmet</wornGraphicPath>
             <useWornGraphicMask>true</useWornGraphicMask>
           </apparel>
           <recipeMaker>
@@ -318,8 +316,7 @@
             <bodyPartGroups>
               <li>FullHead</li>
             </bodyPartGroups>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/CataphractArmorHelmet/CataphractHelmet</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/CataphractArmorHelmet/CataphractHelmet</wornGraphicPath>
             <layers>
               <li>Overhead</li>
             </layers>
@@ -389,8 +386,7 @@
             <tags>
               <li>BOR_Royal_II</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeCataphractArmor/PrestigeCataphractArmor</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeCataphractArmor/PrestigeCataphractArmor</wornGraphicPath>
             <useWornGraphicMask>true</useWornGraphicMask>
           </apparel>
           <tradeTags>
@@ -430,8 +426,7 @@
             <tags>
               <li>BOR_Royal_II</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeCataphractHelmet/PrestigeCataphractHelmet</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeCataphractHelmet/PrestigeCataphractHelmet</wornGraphicPath>
             <useWornGraphicMask>true</useWornGraphicMask>
           </apparel>
           <recipeMaker>
@@ -469,8 +464,7 @@
             <tags>
               <li>BOR_Royal_II</li>
             </tags>
-            <wornGraphicPath>
-              Things/Pawn/Humanlike/Apparel/PrestigeCataphractHelmet/PrestigeCataphractHelmet</wornGraphicPath>
+            <wornGraphicPath>Things/Pawn/Humanlike/Apparel/PrestigeCataphractHelmet/PrestigeCataphractHelmet</wornGraphicPath>
             <useWornGraphicMask>true</useWornGraphicMask>
           </apparel>
           <recipeMaker>
diff --git a/Mods/SaveOurShip/Patches/Royalty/QuasarEVAPatches.xml b/Mods/Royalty/Patches/Apparel/zQuasarEVAPatches.xml
similarity index 100%
rename from Mods/SaveOurShip/Patches/Royalty/QuasarEVAPatches.xml
rename to Mods/Royalty/Patches/Apparel/zQuasarEVAPatches.xml
diff --git a/Mods/SaveOurShip/Patches/Royalty/SolarEVAPatches.xml b/Mods/Royalty/Patches/Apparel/zSolarEVAPatches.xml
similarity index 100%
rename from Mods/SaveOurShip/Patches/Royalty/SolarEVAPatches.xml
rename to Mods/Royalty/Patches/Apparel/zSolarEVAPatches.xml
diff --git a/Mods/SaveOurShip/Patches/Royalty/TenebralEVAPatches.xml b/Mods/Royalty/Patches/Apparel/zTenebralEVAPatches.xml
similarity index 100%
rename from Mods/SaveOurShip/Patches/Royalty/TenebralEVAPatches.xml
rename to Mods/Royalty/Patches/Apparel/zTenebralEVAPatches.xml
diff --git a/Mods/Royalty/Patches/Permits/Thoughts_CorpoTitles.xml b/Mods/Royalty/Patches/Permits/Thoughts_CorpoTitles.xml
index 3cf3bab7..a044889b 100644
--- a/Mods/Royalty/Patches/Permits/Thoughts_CorpoTitles.xml
+++ b/Mods/Royalty/Patches/Permits/Thoughts_CorpoTitles.xml
@@ -82,7 +82,7 @@
           </nullifyingTraits>
           <stages>
             <li>
-              <label>unergonomic office </label>
+              <label>unergonomic office</label>
               <description>I am a {TITLE_indefinite} and I cannot work without:\n\n{0}</description>
               <baseMoodEffect>-4</baseMoodEffect>
             </li>