Merge pull request #47 from RimNauts/main

Assure pawns can wear spacesuits before applying them
RimNauts · Mar 16, 2023 · 635644a · 635644a
2 parents c13dfdf + 2bb0f39
commit 635644a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Assemblies/RimNauts2.dll b/Assemblies/RimNauts2.dll
diff --git a/Changelog.md b/Changelog.md
@@ -1 +1,2 @@
 # Changelog
+- Assure pawns can wear spacesuits before applying them
diff --git a/Source/RimNauts2/RimNauts2/Biome/Patch/PawnGroupMaker.cs b/Source/RimNauts2/RimNauts2/Biome/Patch/PawnGroupMaker.cs
@@ -20,11 +20,13 @@ public static IEnumerable<Pawn> apply_spacesuits(IEnumerable<Pawn> pawns) {
             ThingDef spacesuit_helmet = ThingDef.Named("RimNauts2_Apparel_SpaceSuit_Head");
             ThingDef spacesuit_armor = ThingDef.Named("RimNauts2_Apparel_SpaceSuit_Body");
             foreach (Pawn pawn in pawns) {
-                if (pawn != null) {
+                if (pawn != null && pawn.apparel != null && !pawn.RaceProps.Animal) {
                     Universum.Utilities.Vacuum_Protection protection = Universum.Utilities.Cache.spacesuit_protection(pawn);
                     if (protection != Universum.Utilities.Vacuum_Protection.All) {
-                        pawn.apparel.Wear((RimWorld.Apparel) ThingMaker.MakeThing(spacesuit_helmet), false);
-                        pawn.apparel.Wear((RimWorld.Apparel) ThingMaker.MakeThing(spacesuit_armor), false);
+                        try {
+                            pawn.apparel.Wear((RimWorld.Apparel) ThingMaker.MakeThing(spacesuit_helmet), false);
+                            pawn.apparel.Wear((RimWorld.Apparel) ThingMaker.MakeThing(spacesuit_armor), false);
+                        } catch { }
                     }
                 }
                 yield return pawn;

diff --git a/Source/RimNauts2/RimNauts2/Constants.cs b/Source/RimNauts2/RimNauts2/Constants.cs
@@ -1,7 +1,7 @@
 namespace RimNauts2 {
     public static class Info {
         public static readonly string name = "RimNauts 2";
-        public static readonly string version = "4.10.1";
+        public static readonly string version = "4.10.2";
     }
 
     public static class Style {