Skip to content

Outer Rim Blaster Changes #3909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Arcalane wants to merge 11 commits into
base: Development
Choose a base branch
from
Open

Outer Rim Blaster Changes #3909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7e348ab
outer rim blaster charge mode POC
Arcalane May 23, 2025
1bb1baa
outer rim: ammo and charric weapon changes
Arcalane May 24, 2025
c7d1808
outer rim: stun mode refactor
Arcalane May 25, 2025
9cc862a
outer rim: stun mode addon
Arcalane May 25, 2025
3279305
outer rim: ion guns and misc adjustments
Arcalane May 25, 2025
63aa992
outer rim: minor ammo fixes
Arcalane Jun 19, 2025
f4eefef
Merge remote-tracking branch 'upstream/Development' into outerrimpatches
Arcalane Dec 14, 2025
4e57227
outer rim patch folder cleanup
Arcalane Dec 14, 2025
c5995d8
Update Outer_Rim_Core_Ammo.xml
Arcalane Dec 15, 2025
8546801
outer rim ammo tweaks
Arcalane Dec 16, 2025
68e0deb
outer rim: scattergun ammo
Arcalane Dec 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@

<CombatExtended.AmmoCategoryDef>
<defName>BlasterAP</defName>
<label>concentrated tibanna</label>
<labelShort>conc.</labelShort>
<label>pressurized tibanna</label>
<labelShort>AP</labelShort>
<description>Energy bolts created with tibanna gas. Causes neat punctures and burns that tend to carbonize and char. Low chance of wound infection. Spun to a higher pressure to create bolts with improved penetration, at the loss of wounding potential.</description>
</CombatExtended.AmmoCategoryDef>

Expand Down
4 changes: 2 additions & 2 deletions Defs/DamageDefs/Damages_LocalInjury.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@
<harmsHealth>false</harmsHealth>
<additionalHediffs>
<li>
<hediff>Neuralizer</hediff>
<severityPerDamageDealt>0.9</severityPerDamageDealt>
<hediff>Anesthetic</hediff>
<severityPerDamageDealt>0.15</severityPerDamageDealt>
<victimSeverityScalingByInvBodySize>true</victimSeverityScalingByInvBodySize>
</li>
</additionalHediffs>
Expand Down
93 changes: 93 additions & 0 deletions ModPatches/Outer Rim - Chiss Ascendancy/Defs/Outer_Rim_Chiss_Ammo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>

<!-- ================== Base Beam ================== -->
<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" Name="LaserBulletChiss" ParentName="BaseLaserBulletTextured" Abstract="True">
<graphicData>
<color>(3,252,169)</color>
</graphicData>
</ThingDef>

<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletChiss">
<defName>Bullet_ChissMaser_Pistol</defName>
<label>maser pistol beam</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>CE_Laser</damageDef>
<damageAmountBase>12</damageAmountBase>
<armorPenetrationSharp>8</armorPenetrationSharp>
<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
<secondaryDamage>
<li>
<def>EMP</def>
<amount>3</amount>
</li>
</secondaryDamage>
<empShieldBreakChance>0.2</empShieldBreakChance>
</projectile>
</ThingDef>

<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletChiss">
<defName>Bullet_ChissMaser_Carbine</defName>
<label>maser carbine beam</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>CE_Laser</damageDef>
<damageAmountBase>18</damageAmountBase>
<armorPenetrationSharp>14</armorPenetrationSharp>
<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
<secondaryDamage>
<li>
<def>EMP</def>
<amount>6</amount>
</li>
</secondaryDamage>
<empShieldBreakChance>0.5</empShieldBreakChance>
</projectile>
<lifetime>40</lifetime>
<beamWidth>1.2</beamWidth>
</ThingDef>

<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletChiss">
<defName>Bullet_ChissMaser_Rifle</defName>
<label>maser rifle beam</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>CE_Laser</damageDef>
<damageAmountBase>24</damageAmountBase>
<armorPenetrationSharp>20</armorPenetrationSharp>
<armorPenetrationBlunt>0.001</armorPenetrationBlunt>
<secondaryDamage>
<li>
<def>EMP</def>
<amount>9</amount>
</li>
</secondaryDamage>
<empShieldBreakChance>0.8</empShieldBreakChance>
</projectile>
<lifetime>50</lifetime>
<beamWidth>1.4</beamWidth>
</ThingDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_ChissMaser_Pistol</defName>
<label>Pistol Maser Beam</label>
<ammoTypes>
<Ammo_PlasmaGasCartridge_Standard>Bullet_ChissMaser_Pistol</Ammo_PlasmaGasCartridge_Standard>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_ChissMaser_Carbine</defName>
<label>Carbine Maser Beam</label>
<ammoTypes>
<Ammo_PlasmaGasCartridge_Standard>Bullet_ChissMaser_Carbine</Ammo_PlasmaGasCartridge_Standard>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_ChissMaser_Rifle</defName>
<label>Rifle Maser Beam</label>
<ammoTypes>
<Ammo_PlasmaGasCartridge_Standard>Bullet_ChissMaser_Rifle</Ammo_PlasmaGasCartridge_Standard>
</ammoTypes>
</CombatExtended.AmmoSetDef>

</Defs>
26 changes: 13 additions & 13 deletions ...r_Rim_Chiss_Ascendancy_Ranged_Weapons.xml → ...r_Rim_Chiss_Ascendancy_Ranged_Weapons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<recoilAmount>3.0</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Bullet_BlasterPistol_Yellow</defaultProjectile>
<defaultProjectile>Bullet_ChissMaser_Pistol</defaultProjectile>
<burstShotCount>2</burstShotCount>
<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
<warmupTime>0.5</warmupTime>
<range>12</range>
<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
Expand All @@ -36,9 +36,9 @@
<li>CE_OneHandedWeapon</li>
</weaponTags>
<AmmoUser>
<magazineSize>24</magazineSize>
<magazineSize>21</magazineSize>
<reloadTime>3.7</reloadTime>
<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Pistol</ammoSet>
<ammoSet>AmmoSet_ChissMaser_Pistol</ammoSet>
</AmmoUser>
</Operation>

Expand All @@ -56,10 +56,10 @@
<recoilAmount>1.2</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
<defaultProjectile>Bullet_ChissMaser_Carbine</defaultProjectile>
<warmupTime>0.75</warmupTime>
<range>35</range>
<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
<ticksBetweenBurstShots>7</ticksBetweenBurstShots>
<burstShotCount>2</burstShotCount>
<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
<soundCastTail>GunTail_Medium</soundCastTail>
Expand All @@ -73,9 +73,9 @@
<aiAimMode>AimedShot</aiAimMode>
</FireModes>
<AmmoUser>
<magazineSize>70</magazineSize>
<magazineSize>60</magazineSize>
<reloadTime>3.84</reloadTime>
<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
<ammoSet>AmmoSet_ChissMaser_Carbine</ammoSet>
</AmmoUser>
</Operation>

Expand All @@ -93,15 +93,15 @@
<recoilAmount>1.48</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Bullet_BlasterRifle_Yellow</defaultProjectile>
<defaultProjectile>Bullet_ChissMaser_Rifle</defaultProjectile>
<warmupTime>2.0</warmupTime>
<range>62</range>
<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
<burstShotCount>2</burstShotCount>
<soundCast>OuterRim_Shot_MaserBlasterBolt</soundCast>
<soundCastTail>GunTail_Medium</soundCastTail>
<muzzleFlashScale>9</muzzleFlashScale>
<ammoConsumedPerShotCount>2</ammoConsumedPerShotCount>
<ammoConsumedPerShotCount>3</ammoConsumedPerShotCount>
<targetParams>
<canTargetLocations>true</canTargetLocations>
</targetParams>
Expand All @@ -110,9 +110,9 @@
<aiAimMode>AimedShot</aiAimMode>
</FireModes>
<AmmoUser>
<magazineSize>40</magazineSize>
<magazineSize>36</magazineSize>
<reloadTime>3.2</reloadTime>
<ammoSet>AmmoSet_PlasmaGasCartridgeYellow_Rifle</ammoSet>
<ammoSet>AmmoSet_ChissMaser_Rifle</ammoSet>
</AmmoUser>
</Operation>

Expand Down
Loading