Merge branch 'Develop'

Epicguru · Oct 7, 2020 · d67d681 · d67d681
2 parents a6500ed + b801e6a
commit d67d681
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/Defs/Armor/VoidArmor.xml b/Defs/Armor/VoidArmor.xml
@@ -89,11 +89,12 @@
     <ThingDef ParentName="ApparelVoidArmorBase_AA">
         <defName>Apparel_VoidArmor_AA</defName>
         <label>void armor</label>
-        <description>A suit made out of antimatter composite.\n\nEven gliterworld planets struggle to understand and use the technology that allows antimatter composite to so effectively deflect kinetic and energy projectiles.</description>
+        <description>A suit made out of antimatter composite.\n\nEven gliterworld planets struggle to understand and use the technology that allows antimatter composite to so effectively deflect kinetic and energy projectiles.\nCan be used as an EVA suit in outer space.</description>
         <apparel>
         <tags>
             <li>SpacerMilitary</li>
             <li>RoyalCombatGear</li>
+            <li>EVA</li>
         </tags>
         </apparel>
     </ThingDef>

diff --git a/Defs/Armor/VoidHelmet.xml b/Defs/Armor/VoidHelmet.xml
@@ -82,11 +82,12 @@
     <ThingDef ParentName="ApparelVoidHelmetBase_AA">
         <defName>Apparel_VoidHelmet_AA</defName>
         <label>void helmet</label>
-        <description>A helmet made out of antimatter composite.\n\nEven gliterworld planets struggle to understand and use the technology that allows antimatter composite to so effectively deflect kinetic and energy projectiles.</description>
+        <description>A helmet made out of antimatter composite.\n\nEven gliterworld planets struggle to understand and use the technology that allows antimatter composite to so effectively deflect kinetic and energy projectiles.\nCan be used as an EVA helmet in outer space.</description>
         <apparel>
         <tags>
             <li>SpacerMilitary</li>
             <li>RoyalCombatGear</li>
+            <li>EVA</li>
         </tags>
         </apparel>
     </ThingDef>

diff --git a/Source/AntimatterAnnihilation/Buildings/Building_AntimatterReactor.cs b/Source/AntimatterAnnihilation/Buildings/Building_AntimatterReactor.cs
@@ -318,9 +318,6 @@ public float UpdateOutputBeam(float maxDst)
                     break;
             }
 
-            if (!Settings.DoBeamDamage)
-                return i;
-
             foreach (var thing in tempThings)
             {
                 if (thing.def.defName == "AntimatterReactorPowerConverter_AA")
@@ -350,6 +347,9 @@ public float UpdateOutputBeam(float maxDst)
                     }
                 }
 
+                if (!Settings.DoBeamDamage)
+                    continue;
+
                 float damage = thing.def.category == ThingCategory.Building ? BuildingDamage : PawnDamage;
                 thing.TakeDamage(new DamageInfo(AADefOf.EnergyBurn_AA, damage, 15, instigator: this));
             }

diff --git a/Source/Content/Models/Items.blend b/Source/Content/Models/Items.blend
diff --git a/Source/Content/Models/M3G_UMIN.blend b/Source/Content/Models/M3G_UMIN.blend