Skip to content
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

5.6 Dev to Master PR #2932

Merged
merged 394 commits into from
Feb 1, 2024
Merged

5.6 Dev to Master PR #2932

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
394 commits
Select commit Hold shift + click to select a range
3bff38f
Whitespace housekeeping.
N7Huntsman Nov 16, 2023
1c46ced
Finish whitespace pass.
N7Huntsman Nov 16, 2023
033fedd
For real this time.
N7Huntsman Nov 16, 2023
a2b6942
Merge pull request #2889 from CombatExtended-Continued/NoStuff4Unfini…
N7Huntsman Nov 16, 2023
db15add
Fix incorrect texture path for Plasma projectile.
N7Huntsman Nov 16, 2023
f614ed4
Rotate melta projectile 90 deg.
N7Huntsman Nov 16, 2023
04187f2
Grenades wip
N7Huntsman Nov 17, 2023
afd2b15
height fuse
CMDR-Bill-Doors Nov 17, 2023
de8ea1b
effect xml, accept multiple compfrag
CMDR-Bill-Doors Nov 17, 2023
4f6709d
Update ProjectileCE_BunkerBuster.cs
CMDR-Bill-Doors Nov 17, 2023
fdd50db
Patch some apparel.
N7Huntsman Nov 18, 2023
d8086b7
Brazilian Portuguese - Create AmmoContainerKeyed.xml
isyuricunha Nov 18, 2023
5a74b42
fix path Brazilian Portuguese - AmmoContainerKeyed.xml
isyuricunha Nov 18, 2023
18b690e
Portuguese ArmorDurability.xml
isyuricunha Nov 18, 2023
8ff60da
Portuguese BipodStatWorker.xml
isyuricunha Nov 18, 2023
9728748
up to date Portuguese Descriptions.xml
isyuricunha Nov 18, 2023
f1c5390
up to date Portuguese Keys.xml
isyuricunha Nov 18, 2023
ee8d02a
format portuguese LongEventHandler.xml
isyuricunha Nov 18, 2023
e0a6af1
portuguese MechTakeAmmoKeyed.xml
isyuricunha Nov 18, 2023
6c03890
portuguese Messages.xml
isyuricunha Nov 18, 2023
300edde
portuguese ModMenu.xml
isyuricunha Nov 18, 2023
ffb1c3c
portuguese Stats.xml
isyuricunha Nov 18, 2023
5bd084e
Rename Galavic ammo file
N7Huntsman Nov 19, 2023
0895bd4
Add Tox Ammo and art
N7Huntsman Nov 20, 2023
f1c31cb
Move 40k Ammo to Defs
N7Huntsman Nov 20, 2023
c795885
Increase lasgun mag size
N7Huntsman Nov 20, 2023
5736364
Update Harmony_StunHandler.cs
CMDR-Bill-Doors Nov 20, 2023
723a00d
Update RangedArchotech.xml
SaltyKarl Nov 21, 2023
bc6855e
Fix all the grenades.
N7Huntsman Nov 21, 2023
bc316be
Simplify scenario patch
N7Huntsman Nov 21, 2023
3809426
pawnkind wip
N7Huntsman Nov 21, 2023
fa5d75a
Fixes to Archotech Weaponry.
N7Huntsman Nov 21, 2023
1949010
Create FSF_Hediff_BodyParts.xml
SaltyKarl Nov 21, 2023
4fb21d5
Revert "Update RangedArchotech.xml"
SaltyKarl Nov 21, 2023
4b2175d
Merge pull request #2881 from CombatExtended-Continued/RimElves-Patch
N7Huntsman Nov 22, 2023
67f7ce6
Merge pull request #2890 from CombatExtended-Continued/40k-Ogam-Patches
N7Huntsman Nov 22, 2023
dcea472
More pawnkind wip
N7Huntsman Nov 22, 2023
cf25305
Finish Pawnkinds
N7Huntsman Nov 23, 2023
b40dc9c
Patch Traders
N7Huntsman Nov 23, 2023
0943c5d
Merge pull request #2896 from isyuricunha/Development
N7Huntsman Nov 23, 2023
c6e83aa
Update MissileAmmo.xml
SaltyKarl Nov 23, 2023
ea385e8
Update MissileAmmo.xml
SaltyKarl Nov 23, 2023
350d65d
Merge branch 'Development' into 40k-Ogam-Patches-2
N7Huntsman Nov 25, 2023
158bed6
Merge pull request #2880 from CombatExtended-Continued/KG-WW2
N7Huntsman Nov 26, 2023
2ac5a94
Merge pull request #2879 from CombatExtended-Continued/BugFixes-Tweaks
N7Huntsman Nov 26, 2023
5ad3048
Patch some clothing to avoid autopatch
N7Huntsman Nov 26, 2023
1d1fe4c
Merge pull request #2901 from SaltyKarl/Orassans-ammo-fix
N7Huntsman Nov 26, 2023
37bb790
Patches for most things.
Tostov Nov 27, 2023
ccbe939
Update CompThrownFleckEmitterSmooth.cs
CMDR-Bill-Doors Nov 28, 2023
90b0bd7
big rocket change
CMDR-Bill-Doors Nov 28, 2023
b8c6610
ED shields compatibility (not tested yet)
MaxDorob Nov 29, 2023
9f9a4ca
Rimatomics suppression compatibility (not tested yet)
MaxDorob Nov 29, 2023
65adbb7
VEF.CompShieldField-based shield suppression compatibility (not teste…
MaxDorob Nov 29, 2023
247e1bc
Missing type fix
MaxDorob Nov 29, 2023
9a1dc29
ED Shields missing fix
MaxDorob Nov 29, 2023
465ab52
VEF missing type fix
MaxDorob Nov 29, 2023
a09af0c
Cache pawn heights
perkinslr Nov 29, 2023
923a945
patch bandage bulk
Miner239 Dec 1, 2023
cba9f5b
Merge branch 'Development' into SamaelGray-AmmoHousekeeping
SamaelGray Dec 1, 2023
bcb122a
Fixed incorrect adjacent cells collection (for some reason rot west a…
MaxDorob Dec 1, 2023
a6d1b83
Merge pull request #2905 from CombatExtended-Continued/cacheheights
N7Huntsman Dec 2, 2023
05627b9
Add link and description for windows batch builder
perkinslr Dec 2, 2023
58cc5cf
Mention git and dotnet dependencies
perkinslr Dec 2, 2023
a6000b5
Properly separate out dotnet build section.
perkinslr Dec 3, 2023
72d83b2
Merge pull request #2912 from CombatExtended-Continued/perkinslr-patch-1
N7Huntsman Dec 3, 2023
81e3e43
Consolidate patch, add to modlist
N7Huntsman Dec 4, 2023
d21a38e
Merge pull request #2907 from Miner239/patch-1
N7Huntsman Dec 4, 2023
0caf3b2
Reorganize patches a bit.
N7Huntsman Dec 4, 2023
94d0149
Update modlist
N7Huntsman Dec 4, 2023
c68d87a
Merge pull request #2900 from SaltyKarl/Archo-fix
N7Huntsman Dec 4, 2023
0c17afa
Mech coverage patches.
Tostov Dec 5, 2023
dc7dd26
Stoneborn Delights Compatibility Patch
ViralReaction Dec 6, 2023
8ee6410
Stoneborn Feybug Patch
ViralReaction Dec 6, 2023
636bb2d
housekeeping
ViralReaction Dec 6, 2023
49ad080
Update supported mod page
ViralReaction Dec 6, 2023
b8a34b5
Patch for Thrumbo Plushie
Dev-LyonLee Dec 6, 2023
5251fdc
Merge pull request #2875 from CombatExtended-Continued/RocketThruster…
N7Huntsman Dec 6, 2023
b041a18
Merge pull request #2899 from CombatExtended-Continued/EMPdontStunMan…
N7Huntsman Dec 6, 2023
f551d1b
HE basebleed texture
albertbokor-unideb Dec 10, 2023
ea9545a
BowRecurve and BowGreat retex
albertbokor-unideb Dec 10, 2023
7f068ce
refined bow offsets
SerinaCE Dec 11, 2023
175f1f2
Housekeeping
N7Huntsman Dec 12, 2023
fc1a2e2
Housekeeping + consolidate patches
N7Huntsman Dec 12, 2023
36fcacc
Create Fungoid_Hediffs_BodyParts.xml
SaltyKarl Dec 13, 2023
7877f66
Update SupportedThirdPartyMods.md
SaltyKarl Dec 13, 2023
60cf6d8
Update Fungoid_Hediffs_BodyParts.xml
SaltyKarl Dec 13, 2023
f7abc40
Merge pull request #2916 from Dev-LyonLee/Development
N7Huntsman Dec 14, 2023
6d9b703
Merge pull request #2915 from ViralReaction/Stoneborn-Delights-Compat
N7Huntsman Dec 14, 2023
bc87ca1
fixed filename
SerinaCE Dec 14, 2023
10f1f22
Add files via upload
Tostov Dec 14, 2023
d3a7f34
Housekeeping
N7Huntsman Dec 15, 2023
067bf4e
Patch spacesuit
N7Huntsman Dec 15, 2023
31ede7f
Fix typo
N7Huntsman Dec 15, 2023
188a269
Merge pull request #2921 from SaltyKarl/VXE-Fungoid
N7Huntsman Dec 15, 2023
e10cac4
Merge pull request #2910 from CombatExtended-Continued/Grenade_Throwi…
N7Huntsman Dec 15, 2023
707285b
Fix Caverns Typo
N7Huntsman Dec 18, 2023
0af1884
Adjust NightVison quality factors
N7Huntsman Dec 18, 2023
10c4a43
Change HCB AI firemode.
N7Huntsman Dec 18, 2023
5595a85
Add MechTurretBase from Determinism Carl
perkinslr Dec 18, 2023
6003005
fixed artifact
SerinaCE Dec 20, 2023
fbb1258
Lower mech rifle caliber power.
N7Huntsman Dec 21, 2023
df3a6fd
N7 drawsize
SerinaCE Dec 21, 2023
60d00bb
Merge pull request #2919 from albertbokor-unideb/HE-BB,-bows-retex
N7Huntsman Dec 22, 2023
4f57dcc
Housekeeping
N7Huntsman Dec 22, 2023
f26f0c3
Fix smart grenade, update modlist
N7Huntsman Dec 22, 2023
bedc4c4
Merge pull request #2903 from Tostov/Rimsenal-Spacer-Faction
N7Huntsman Dec 22, 2023
6c60260
Merge pull request #2926 from CombatExtended-Continued/dc-art
N7Huntsman Dec 22, 2023
e856a90
Demo shell recipe and other misc ammo housekeeping
SamaelGray Dec 22, 2023
5dadaaa
patch biotech fire genes
Person243546 Dec 22, 2023
254f3dc
patch heat immunity (alpha genes)
Person243546 Dec 22, 2023
c7d51da
patch fire immunity (big and small genes)
Person243546 Dec 22, 2023
650b1ba
Update GeneDefs_Temperature.xml
Person243546 Dec 22, 2023
850bd8f
Update GeneDefs_Archite.xml
Person243546 Dec 22, 2023
4fb03cd
Cleanup whitespace
N7Huntsman Dec 26, 2023
b5c04bc
Merge pull request #2928 from Person243546/Development
N7Huntsman Dec 26, 2023
f2944b2
Revise grammar
N7Huntsman Dec 26, 2023
b0bca24
Fix duplicate tag
N7Huntsman Dec 26, 2023
4dfd5b8
change pulse pack label
N7Huntsman Dec 26, 2023
c0fa8a5
whitespace and modlist
N7Huntsman Dec 27, 2023
bb86e52
Merge pull request #2884 from SaltyKarl/Glitter&Pulse
N7Huntsman Dec 27, 2023
bc4a515
Revert "Cache pawn heights"
N7Huntsman Dec 28, 2023
544aaef
Merge pull request #2935 from CombatExtended-Continued/revert-2905-ca…
N7Huntsman Dec 28, 2023
23f8fd5
Merge pull request #2809 from CombatExtended-Continued/ShieldsAndSupp…
N7Huntsman Jan 1, 2024
25ce96f
Boost archon shields
N7Huntsman Jan 1, 2024
3dd9e8b
Whitespace housekeeping
N7Huntsman Jan 2, 2024
d58b8ad
Remove mech shell generic patch ops
N7Huntsman Jan 6, 2024
1b0a07c
Adjust 5x35mm generic
N7Huntsman Jan 7, 2024
320668a
Merge pull request #2908 from SamaelGray/SamaelGray-AmmoHousekeeping
N7Huntsman Jan 7, 2024
b2e295c
No generic mech ammo patches
SamaelGray Jan 7, 2024
337a44d
Update mod name
N7Huntsman Jan 7, 2024
29cb8b6
Update persona to relic
N7Huntsman Jan 7, 2024
e02882b
Swap aim mode of some other charge blasters
N7Huntsman Jan 7, 2024
71d5680
Merge branch 'VariousTweaks' of https://github.com/CombatExtended-Con…
N7Huntsman Jan 7, 2024
f25e2fd
Remove sniper burst fire
N7Huntsman Jan 7, 2024
a772a48
Fix grenader launcher
N7Huntsman Jan 8, 2024
b724f64
Patch Ark weapons
N7Huntsman Jan 8, 2024
6c2d475
Merge pull request #2925 from CombatExtended-Continued/VariousTweaks
N7Huntsman Jan 9, 2024
9318b02
Fix vehicles No Ammo Mode
N7Huntsman Jan 9, 2024
da066ed
Merge pull request #2938 from CombatExtended-Continued/VF-GenericAmmoFix
N7Huntsman Jan 9, 2024
e1d7f8a
Set chargePerAmmoCount to 1 if ammo enabled
perkinslr Jan 9, 2024
2567c8a
Remove chargePerAmmoCount ops.
N7Huntsman Jan 9, 2024
b8aff54
There is some lovely filth down here.
N7Huntsman Jan 9, 2024
d406d9a
Merge pull request #2939 from CombatExtended-Continued/VF-patch-cpac
N7Huntsman Jan 9, 2024
1956f24
Add ammoConsumedPerShot to ammosetdefs
perkinslr Jan 9, 2024
f1976b2
Merge branch 'Development' into ammo-consumed-per-shot
perkinslr Jan 9, 2024
cc0c958
Pawns with bipodded weapons no longer drop carried pawns to automatic…
Thorbane Jan 10, 2024
3ba22f0
Patch more weapons
N7Huntsman Jan 11, 2024
1ce5935
Give lassguns auto fire
N7Huntsman Jan 11, 2024
6937e44
Patch hellguns
N7Huntsman Jan 11, 2024
11f6926
Ancient Eastern Armory (Continued) Findmod
SerinaCE Jan 11, 2024
6da97b3
Merge pull request #2892 from CombatExtended-Continued/40k-Ogam-Patch…
N7Huntsman Jan 12, 2024
a71b651
Change 15x65mm similarTo ammo type.
N7Huntsman Jan 12, 2024
1b3b1d9
Merge pull request #2937 from SamaelGray/SamaelGray-GenericMechAmmoFix
N7Huntsman Jan 12, 2024
0f33630
virtualized something for fiddling with projectile movement
CMDR-Bill-Doors Jan 12, 2024
1082171
reomved old version, fixed some names
SerinaCE Jan 12, 2024
3b01f25
Add kinetic parameters to ProjectilePropertiesCE
perkinslr Jan 13, 2024
2368f46
Mark required fields protected for use in new fragments
perkinslr Jan 13, 2024
8a15d20
Add lerpPosition field to ProjectileCE
perkinslr Jan 13, 2024
9fef0ef
Fix wrong axis in shotSpeed documentation
perkinslr Jan 13, 2024
59776dd
Switch impactPosition for explicit exactPosition
perkinslr Jan 13, 2024
89d647b
Add kinetic fields to ProjectileCE
perkinslr Jan 13, 2024
e1f38ab
For kinetic projectiles, scale damage with velocity
perkinslr Jan 13, 2024
40b8e73
Use new ExactPosition for returning Height
perkinslr Jan 13, 2024
5b25530
kineticProjectiles disable the ticksToImpact system
perkinslr Jan 13, 2024
070313c
Explicitly use flightTicks instead of calculating them on the fly
perkinslr Jan 13, 2024
620febd
use shotHeight for initial exactPosition
perkinslr Jan 13, 2024
31415b0
Use ExactPosition for 2d draw position
perkinslr Jan 13, 2024
2d3c65e
Use ExactPosition for 3d draw position
perkinslr Jan 13, 2024
6b4a848
Make LastPos a simple cached field
perkinslr Jan 13, 2024
bed7847
Filter out ProjectileCE as early as possible in impact checks
perkinslr Jan 13, 2024
fab1d30
Calculate nextPosition via lerp or discrete kinetics
perkinslr Jan 13, 2024
0afc3f7
Set ExactPosition once per tick
perkinslr Jan 13, 2024
1918b72
Set base Position from nextPosition
perkinslr Jan 13, 2024
cf7304b
If ticksToImpact is 0 or when the projectile hits the ground, find
perkinslr Jan 13, 2024
c969625
Use nextPosition for checks within Tick
perkinslr Jan 13, 2024
1f1b8a3
Remove unused GetHeightAtTicks
perkinslr Jan 13, 2024
fad32f5
Add default implementation for kinetic MoveForward and Accelerate
perkinslr Jan 13, 2024
1356b39
Add virtual Throw for launching kinetic projectiles
perkinslr Jan 13, 2024
b108a5b
Fix whitespace
perkinslr Jan 13, 2024
9abd25f
Merge pull request #2943 from albertbokor-unideb/Ancient-Eastern-Armo…
N7Huntsman Jan 13, 2024
4e37bb9
Merge pull request #2944 from CombatExtended-Continued/VirtualizeProj…
N7Huntsman Jan 13, 2024
ffc3bf1
Merge pull request #2942 from CombatExtended-Continued/bipodDoesntDro…
N7Huntsman Jan 14, 2024
74241cd
Indentation housekeeping part 3
SamaelGray Jan 14, 2024
680a6c6
Update VehiclesCompat.cs
CMDR-Bill-Doors Jan 14, 2024
194d324
updated the old patches from the 1.2 mods
ThatCoolSnek Jan 15, 2024
39357a1
Merge pull request #2941 from CombatExtended-Continued/ammo-consumed-…
N7Huntsman Jan 15, 2024
5fa6d2e
Merge pull request #2893 from CombatExtended-Continued/HeightFuse
N7Huntsman Jan 15, 2024
757681f
Merge branch 'Development' into new-ballistics
perkinslr Jan 15, 2024
98fbb2a
Merge pull request #2950 from SamaelGray/SamaelGray-MoreIndentationsS…
N7Huntsman Jan 15, 2024
76b745b
Update ProjectileCE.cs
perkinslr Jan 15, 2024
5bb00e9
Merge pull request #2951 from CombatExtended-Continued/VehicleCompatA…
N7Huntsman Jan 15, 2024
ab7f8cf
Specially handle fire damage based on apparel flammability
perkinslr Jan 15, 2024
086e20e
fix whitespace
perkinslr Jan 15, 2024
ebefdcb
Ignore damage to armor if penAmount or armorAmount are both zero.
perkinslr Jan 15, 2024
e7c49f3
Update Divine Order Patch
ViralReaction Jan 15, 2024
975824c
DO Shield
ViralReaction Jan 15, 2024
374a3a4
Add to modlist
N7Huntsman Jan 16, 2024
80b8628
Fix error
N7Huntsman Jan 16, 2024
b0b6dd0
Merge pull request #2952 from ThatCoolSnek/Patch-for-RH2-DOOM-and-MGS
N7Huntsman Jan 16, 2024
c810231
Merge pull request #2954 from ViralReaction/Update-Divine-Order
N7Huntsman Jan 16, 2024
74c0869
Revise Airburst 81mm mortar
N7Huntsman Jan 17, 2024
7cd36a0
Add new shell art
N7Huntsman Jan 19, 2024
688c33d
Tweak filth stats
N7Huntsman Jan 19, 2024
971236f
Update CE_Utility.cs
CMDR-Bill-Doors Jan 20, 2024
e277947
Whitespace fix
perkinslr Jan 22, 2024
8226123
Fix whitespace
perkinslr Jan 22, 2024
be8674e
Merge pull request #2958 from CombatExtended-Continued/AdditionalNull…
N7Huntsman Jan 22, 2024
9e75afc
Merge pull request #2940 from CombatExtended-Continued/Filth-Housekee…
N7Huntsman Jan 22, 2024
3e26839
Fix to recipedefs
Tostov Jan 22, 2024
b598db3
Mech exoskeleton
Tostov Jan 22, 2024
72f0821
Tinkerer Ability Hediffs
Tostov Jan 22, 2024
99649e3
init commit
CMDR-Bill-Doors Jan 22, 2024
af9b3fa
made fleck redder
CMDR-Bill-Doors Jan 22, 2024
69f9950
adjusted offset for bunsen tank
CMDR-Bill-Doors Jan 22, 2024
6d45bd4
Simplify fallback
Safairette Jan 22, 2024
4d26e78
Merge pull request #2953 from CombatExtended-Continued/fix-fire-damage
N7Huntsman Jan 23, 2024
31bdbbd
Update Harmony_ThingDef.cs
CMDR-Bill-Doors Jan 23, 2024
6253b9d
changed to last occurance
CMDR-Bill-Doors Jan 23, 2024
f46965a
Update CE_Utility.cs
CMDR-Bill-Doors Jan 23, 2024
c50bcd5
Update CE_Utility.cs
CMDR-Bill-Doors Jan 23, 2024
2bc4859
Add 105 and 155mm airburst
N7Huntsman Jan 24, 2024
82d4480
Adjust frag angle
N7Huntsman Jan 24, 2024
207b8b6
Adjust world shelling damage of HFuzed rounds
N7Huntsman Jan 25, 2024
1ce86bd
Fix duplicate patch
N7Huntsman Jan 25, 2024
7345ade
Merge pull request #2960 from Tostov/Miho-updates/fixes
N7Huntsman Jan 25, 2024
15681b4
Merge pull request #2961 from CombatExtended-Continued/FlamethrowerGr…
N7Huntsman Jan 25, 2024
568f531
Revise Thunder Javelins patch
N7Huntsman Jan 25, 2024
4d684a6
Revised thunder javelin
N7Huntsman Jan 25, 2024
64b93c0
Indentation housekeeping part 4...
SamaelGray Jan 25, 2024
afcc0d2
Clean up new calibers, police indents.
N7Huntsman Jan 26, 2024
36a932c
Add to modlist
N7Huntsman Jan 26, 2024
82962cd
Merge pull request #2855 from AKEKHQ/Development
N7Huntsman Jan 26, 2024
7668f7b
Merge pull request #2964 from SamaelGray/SamaelGray-EvenMoreIndentaio…
N7Huntsman Jan 26, 2024
eb1acf6
Fix typo, boost frag count 50%
N7Huntsman Jan 28, 2024
c3c5295
Adjust det height and frag angle
N7Huntsman Jan 29, 2024
ec938c2
Reduce frag angle and remove the added 50% frag count
N7Huntsman Jan 29, 2024
1725fc4
Merge pull request #2962 from CombatExtended-Continued/Magless-pickups
N7Huntsman Jan 29, 2024
e608d64
Merge pull request #2956 from CombatExtended-Continued/MortarAirburst
N7Huntsman Jan 29, 2024
5454323
Merge pull request #2963 from CombatExtended-Continued/MergePartialAr…
N7Huntsman Jan 29, 2024
0cddcc5
Merge pull request #2949 from CombatExtended-Continued/new-ballistics
N7Huntsman Jan 29, 2024
eae5431
Remove Duplicate node
N7Huntsman Jan 29, 2024
f0260fe
Remove duplicate recipe base
N7Huntsman Jan 29, 2024
f27f179
Fix typo
N7Huntsman Jan 29, 2024
a8332f0
Load VFE - Tribals before CE
N7Huntsman Jan 29, 2024
8d6015a
wip
N7Huntsman Jan 29, 2024
e69ae5b
Resolve AM style errors
N7Huntsman Jan 30, 2024
d37647f
Merge pull request #2966 from CombatExtended-Continued/5.6-Final-Fixes
N7Huntsman Jan 30, 2024
ec9c149
Update About.xml
N7Huntsman Jan 30, 2024
2c07f07
Update Manifest.xml
N7Huntsman Jan 30, 2024
edc5556
Merge pull request #2967 from CombatExtended-Continued/N7IsADummy
N7Huntsman Jan 30, 2024
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
28 changes: 0 additions & 28 deletions Biotech/Patches/Misc/Ammo_Generic.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/15x65mmDiffusingCharged.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ammoTypes>
<Ammo_15x65mmDiffusingCharged>Bullet_15x65mmDiffusingCharged</Ammo_15x65mmDiffusingCharged>
</ammoTypes>
<similarTo>AmmoSet_MechCharged</similarTo>
<similarTo>AmmoSet_ChargedShotgun</similarTo>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->
Expand Down