Skip to content

Merge R21.9 into master#938

Merged
Defiant88 merged 144 commits intomasterfrom
buildTest-R21.9.00
Feb 20, 2026
Merged

Merge R21.9 into master#938
Defiant88 merged 144 commits intomasterfrom
buildTest-R21.9.00

Conversation

@leonssz
Copy link
Contributor

@leonssz leonssz commented Feb 14, 2026

No description provided.

shrine-engie and others added 30 commits January 18, 2026 21:04
Properly adds fire nade
slight SBD hp nerf due to saber damage coming down
HP 230 > 225
HP buy 255 > 275
Armor 25 > 10
Removed damage taken bonus
Armor 180 > 225
Added Knockback and stagger to Thermal Nades and Frags
Added Knockback, stagger, and knockdown to Thermal Det, Trip Mines, and Det Packs
Added Dexterity 1
Increased clip size of Rifle and Pistol to 872 (funny gimmick but I get annoyed at lack of ammo)
Again encouraging more careful FP consideration
Feel free to add on

Converted Sonic Dets into 'Electro-Sonic Flashbangs', behavior is in the name.
Saber damage 70 > 120
Saber special damage mult default > 1.2
Added 15% faster velocity to pistol
Removed Ion reload penalty
Battery Recharge 2 > 3
Armor Regen 1 reinstated
Battery pool 80 > 100
Batter regen 1 > 1.2
KB taken .5 > .2
Defaulted resource decay, small nerf to fury sustain
resource regencap 25 > 15
Removing Blast Armor and 3rd Conc, excessive for infantry classes.
Chime in on this one if you want... might be overkill but I want to continue to zone in on "too angry to die" concept. This is why he keeps heal on Saber.

Removed Force Focus
Deflect 3 > 1
Saber Defense 3 > 2
Added Wook Strength 1
Added Env Protection 3
Push 2 > 1
Rage 2 > 3
Rage pool 125 > 120
Regen cap 125 > 120
Rage decay 50% slower > default
KB taken default > 15% less
Added 15 armor, allowing Sion to barely survive 1 saber strike at full vitality
BPmult 1.15 > 1.1
APmult 1.15 > 1.2
Adusted Saber DFAs (and added new Sion legends saber entry)
Speed 233 > 231
Added Bloody Melee
Added mag reload to Trad Caster
Disabled charge shots on Trad Caster
HP 120 > 125
Pistol ammo 725 > 800
Pistol damage mult 1 > 1.1
Setting up cultist_pull and saber_pull for each force power for testing force power usage for both CLASS_MAGE and CLASS_REBORN

Buffs to saber boss.

Nerf to med-tier reborn.

Nerf to assassin_droid.

Setting up isDroid for all droids.

Removing darkjedi.npc, revan.npc, and ubermouse.npc.

MB_ATT_ENV_PROT added to hazardtroopers and rockettrooper2s

Restored ragnos.npc.
Armor 105 > 125
Removed No Locational Damage
Was always intended to have this instead of physical protection.
Switching from isDroid to MBClass

Also setting up saber_powers which have a Sith with saber and 1 force power each for testing.
JKO testing
shrine-engie and others added 29 commits February 9, 2026 12:16
Kyle
Armor ranks 20/50/100 > 20/50/80

Malak
HP 190 > 100
Armor 0 > 45

Kylo Ren
Protect 2 > 1
1 pulse to frag as it was before.
Guess we're back at the start for this one. She needs proper HP though since otherwise it doesn't make sense. Buff a little if needed later.
1 frag to pulse for uniqueness and stuff.
2 life variant buff to get nearly everything to make them useful at all.
Same as clone. Buff to 2 life variant.
Nerf to mines/detpacks but lets them spam those cute thermals as they should.
Fixed weapon descriptions.
Reverted poison to flame thrower.
Just let him be unique and not have heal but instead get armor. He's tanky enough as is.
Same as kyle. Maybe make her 100/50 hp if she needs durability buffs and it would be more accurate to MOTS.
No Jyn space program
size increase for accuracy
Update slime_explosion_new.efx
Update VR_mgs1_psychomantis.mbch
remove pushblur/saber_clash artifacts
Senate Guard
HP 105 > 115

Bo Katan
Pistol dmg 1 > 1.1

Nite Owl
Proj dmg .8 > .8

Hera
Clone Pistol damage 1.1 > 1.15

Lobot
Dmg/fp mult 1.15 > 1.2

T3M4
Arm Blaster dmg 1 > 1.1
Arm Blaster ammo 500 > 600

NRSec
A280 cost 2/5/2 > 2/4/2
Pull cost 7 > 6

Zam
Healing 3 > 2

Gamorrean
Skill timer .5 > .4
Disable gunkick
just a soundpath edit on maskless Sith Eradicator
@Defiant88 Defiant88 merged commit 32fc30c into master Feb 20, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants