Skip to content

Commit

Permalink
Merge pull request #2892 from CombatExtended-Continued/40k-Ogam-Patch…
Browse files Browse the repository at this point in the history
…es-2

Patch Warhammer 40k - Imperium Weaponry + Centralize Warhammer Ammo
  • Loading branch information
N7Huntsman authored Jan 12, 2024
2 parents d406d9a + 6937e44 commit 6da97b3
Show file tree
Hide file tree
Showing 56 changed files with 6,123 additions and 1,900 deletions.
40 changes: 38 additions & 2 deletions Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@

<CombatExtended.AmmoCategoryDef>
<defName>RadiationIonising</defName>
<label>radioactive (ionising)</label>
<labelShort>stone</labelShort>
<label>radiation</label>
<description>Contains ionising gamma radiation that significantly impairs consciousness, and is a carcinogen.</description>
</CombatExtended.AmmoCategoryDef>

Expand Down Expand Up @@ -111,4 +110,41 @@
<description>The nanobots inside this projectile will create a micro-turret near the place of impact.</description>
</CombatExtended.AmmoCategoryDef>

<!-- ========== For Warhammer 40k ========== -->

<CombatExtended.AmmoCategoryDef>
<defName>Standard</defName>
<label>Standard</label>
<labelShort>Standard</labelShort>
<description>A gyro-stabilized projectile equipped with a hardened tip for penetrating armor and laden with a small explosive charge.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>Inferno</defName>
<label>Inferno</label>
<labelShort>Inferno</labelShort>
<description>A gyro-stabilized projectile equipped with the explosive filler replaced with sticky, highly flammable prometheum.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>MetalStorm</defName>
<label>Metal Storm</label>
<labelShort>Metal Storm</labelShort>
<description>A gyro-stabilized equipped with a proximity fuse, designed to shower lighly armored targets with a devestating shower of fragmention when it detonates.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>Kraken</defName>
<label>Kraken</label>
<labelShort>Kraken</labelShort>
<description>A gyro-stabilized projectile with hardened penetrator and explosive 'kicker' charge, designed to punch through heavy armor.</description>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>Melta</defName>
<label>Melta</label>
<labelShort>Melta</labelShort>
<description>A concentrated beam of scorching plasma, capable of reducing even the heaviest of armor to molten slag.</description>
</CombatExtended.AmmoCategoryDef>

</Defs>
Loading

0 comments on commit 6da97b3

Please sign in to comment.