diff --git a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml b/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml
index 604ae94975..e6127f76d6 100644
--- a/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml
+++ b/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Buildings/TurretGatlingGun.xml
@@ -77,8 +77,8 @@
-
- Defs/ThingDef[defName="Turret_GatlingGun"]/costList
+
+ Defs/ThingDef[defName="Turret_GatlingGun"]
325
diff --git a/Source/CombatExtended/CombatExtended/Comps/CompSuppressable.cs b/Source/CombatExtended/CombatExtended/Comps/CompSuppressable.cs
index 322125000f..16bf2ac8aa 100644
--- a/Source/CombatExtended/CombatExtended/Comps/CompSuppressable.cs
+++ b/Source/CombatExtended/CombatExtended/Comps/CompSuppressable.cs
@@ -246,7 +246,7 @@ public void AddSuppression(float amount, IntVec3 origin)
}
public bool IgnoreSuppresion(IntVec3 origin)
{
- return BlockerRegistry.PawnUnsuppresableFromCallback(parent as Pawn, origin) || SuppressionUtility.InterceptorZonesFor((Pawn)parent).Where(x => x.Contains(parent.Position)).Any(x => !x.Contains(origin));
+ return BlockerRegistry.PawnUnsuppressableFromCallback(parent as Pawn, origin) || SuppressionUtility.InterceptorZonesFor((Pawn)parent).Where(x => x.Contains(parent.Position)).Any(x => !x.Contains(origin));
}
public override void CompTick()
diff --git a/Source/CombatExtended/Compatibility/BlockerRegistry.cs b/Source/CombatExtended/Compatibility/BlockerRegistry.cs
index f0f3fdf7cd..5489f34c28 100644
--- a/Source/CombatExtended/Compatibility/BlockerRegistry.cs
+++ b/Source/CombatExtended/Compatibility/BlockerRegistry.cs
@@ -21,7 +21,7 @@ public static class BlockerRegistry
private static List> checkCellForCollisionCallbacks;
private static List> impactSomethingCallbacks;
private static List> beforeCollideWithCallbacks;
- private static List> pawnUnsuppresableFromCallback;
+ private static List> pawnUnsuppressableFromCallback;
private static List>>> shieldZonesCallback;
private static void EnableCB()
@@ -47,7 +47,7 @@ private static void EnableSZ()
private static void EnablePUF()
{
enabledPUF = true;
- pawnUnsuppresableFromCallback = new List>();
+ pawnUnsuppressableFromCallback = new List>();
}
private static void EnableBCW()
{
@@ -118,7 +118,7 @@ public static void RegisterUnsuppresableFromCallback(Func f
{
EnablePUF();
}
- pawnUnsuppresableFromCallback.Add(f);
+ pawnUnsuppressableFromCallback.Add(f);
}
public static bool CheckCellForCollisionCallback(ProjectileCE projectile, IntVec3 cell, Thing launcher)
@@ -159,13 +159,13 @@ public static IEnumerable> ShieldZonesCallback(Thing thing)
}
return shieldZonesCallback.SelectMany(cb => cb(thing));
}
- public static bool PawnUnsuppresableFromCallback(Pawn pawn, IntVec3 origin)
+ public static bool PawnUnsuppressableFromCallback(Pawn pawn, IntVec3 origin)
{
if (!enabledPUF)
{
return false;
}
- foreach (var cb in pawnUnsuppresableFromCallback)
+ foreach (var cb in pawnUnsuppressableFromCallback)
{
if (cb(pawn, origin))
{