Merge pull request #3189 from CombatExtended-Continued/armor_repair_h…

…ostility_check Only allow repair armor repair of non-hostile pawns.
CombatExtended-Continued · Jun 15, 2024 · 433a981 · 433a981
2 parents 5eaf0d3 + f26290f
commit 433a981
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Defs/JobDefs/Jobs_CE.xml b/Defs/JobDefs/Jobs_CE.xml
@@ -115,7 +115,7 @@
 	<JobDef>
 		<defName>RepairNaturalArmor</defName>
 		<driverClass>CombatExtended.JobDriver_RepairNaturalArmor</driverClass>
-		<reportString>Fixing TargetA 's natural armor.</reportString>
+		<reportString>Fixing TargetA's natural armor.</reportString>
 	</JobDef>
 
 	<JobDef>

diff --git a/Source/CombatExtended/CombatExtended/Comps/CompArmorDurability.cs b/Source/CombatExtended/CombatExtended/Comps/CompArmorDurability.cs
@@ -176,7 +176,7 @@ public override void PostPreApplyDamage(ref DamageInfo dinfo, out bool absorbed)
 
         public override IEnumerable<FloatMenuOption> CompFloatMenuOptions(Pawn selPawn)
         {
-            if (durabilityProps.Repairable)
+            if (durabilityProps.Repairable && !this.parent.HostileTo(selPawn))
             {
                 var firstIngredientProvidedOrNotNeeded = true;
                 var secondIngredientProvidedOrNotNeeded = true;