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.

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.45x39mm Mainlining and Weapon Additions #12823

Merged
merged 5 commits into from Jul 7, 2015

Conversation

Projects
None yet
3 participants
@chaosvolt
Copy link
Contributor

commented Jul 3, 2015

I hope that mainlining the 5.45 ammo will be acceptable, as it's a bit odd to have that be mod-only. And odder still that Icecoon didn't add any real weapons alongside it. :V

  1. Mainlined 5.45x39mm ammo.
  2. Added the AK-74 and AN-94 weapons. Seriously, who adds a real-world
    ammo and then only uses it for futureguns?
  3. Also added 9x18mm Makarov ammo.
  4. Makarov pistol and 2 variants of Skorpion SMG. .32 ACP could use a
    little more love.
Chaosvolt
5.45x39mm Mainlining and Weapon Additions
I hope that mainlining the 5.45 ammo will be acceptable, as it's a bit
odd to have that be mod-only. And odder still that Icecoon didn't add
any real weapons alongside it. ✌️ have that be mod-only. And odder
still that Icecoon didn't add any real weapons alongside it. :V

1. Mainlined 5.45x39mm ammo.
2. Added the AK-74 and AN-94 weapons. Seriously, who adds a real-world
ammo and then only uses it for futureguns?
3. Also added 9x18mm Makarov ammo.
4. Makarov pistol and 2 variants of Skorpion SMG. .32 ACP could use a
little more love.
@chaosvolt

This comment has been minimized.

Copy link
Contributor Author

commented Jul 3, 2015

Now to hope that it doesn't bork.

EDIT: Amazing, worked on the first commit.

@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member

commented Jul 3, 2015

Very nicely done!

@Rivet-the-Zombie Rivet-the-Zombie self-assigned this Jul 3, 2015

@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member

commented Jul 3, 2015

It throws a debug error: duplicate ammo id '545'.

@Rivet-the-Zombie Rivet-the-Zombie removed their assignment Jul 3, 2015

@chaosvolt

This comment has been minimized.

Copy link
Contributor Author

commented Jul 3, 2015

Ack. Huh, let me see what I derped up here...

EDIT: I vaguely recall seeing this "duplicate ammo ID" error in the past when using the weapon mod.

EDIT 2: Doh. Will need to correct another thing in the weapon pack now. >.<

chaosvolt and others added some commits Jul 3, 2015

chaosvolt
Update 2
1. Tweaked ammo and ammo type IDs to hopefully avoid the "duplicate ammo
ID" error.
chaosvolt
Update 3
1. Updated the mod to account for the change to the ammo type ID.
2. Also, I initially forgot to move the recipes for handloaded 5.45
ammo.
Chaosvolt
Update 4
1. Crediting comment.
@chaosvolt

This comment has been minimized.

Copy link
Contributor Author

commented Jul 6, 2015

Also, the only piece of mod content removed instead of mainlined was the inclusion of 5.45x39mm ammunition into the "HOME_GUNS" item group. Only a limited selection of ammunition appears on that list, whereas a far wider selection of casings are present.

EDIT: Okay, I tested a thing and it seems that I only needed to rename the ammotype, not the default ammo. Will have to undo that as that might break saves, and the tilesets that have sprites for 5.45mm ammo.

chaosvolt
Update 5
1. Renamed the basic 5.45mm ammo to avoid save errors and/or tileset
errors.

@Coolthulhu Coolthulhu self-assigned this Jul 7, 2015

Coolthulhu added a commit that referenced this pull request Jul 7, 2015

Merge pull request #12823 from chaosvolt/ic-mainlining-and-weapons
5.45x39mm Mainlining and Weapon Additions

@Coolthulhu Coolthulhu merged commit 2796cf3 into CleverRaven:master Jul 7, 2015

1 check passed

default This has been rescheduled for testing as the 'master' branch has been updated.
@chaosvolt

This comment has been minimized.

Copy link
Contributor Author

commented Jul 7, 2015

And thank you for the merge. ^^

@chaosvolt chaosvolt deleted the chaosvolt:ic-mainlining-and-weapons branch Jul 8, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.