Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign up5.45x39mm Mainlining and Weapon Additions #12823
Conversation
This comment has been minimized.
This comment has been minimized.
|
Now to hope that it doesn't bork. EDIT: Amazing, worked on the first commit. |
This comment has been minimized.
This comment has been minimized.
|
Very nicely done! |
Rivet-the-Zombie
self-assigned this
Jul 3, 2015
This comment has been minimized.
This comment has been minimized.
|
It throws a debug error: duplicate ammo id '545'. |
Rivet-the-Zombie
removed their assignment
Jul 3, 2015
This comment has been minimized.
This comment has been minimized.
|
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. >.< |
and others
added some commits
Jul 3, 2015
This comment has been minimized.
This comment has been minimized.
|
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. |
Coolthulhu
self-assigned this
Jul 7, 2015
Coolthulhu
added a commit
that referenced
this pull request
Jul 7, 2015
Coolthulhu
merged commit 2796cf3
into
CleverRaven:master
Jul 7, 2015
1 check passed
This comment has been minimized.
This comment has been minimized.
|
And thank you for the merge. ^^ |
chaosvolt commentedJul 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
ammo and then only uses it for futureguns?
little more love.