Marine Weapon Repalettes #208
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit ec45cf1.
Repalettes for the wood of the M4A3, M44, 1911 and M37. Darkens the M41, updates it and the M37s back sprites. Jungle binocs are now a brown instead of a lighter green.
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
commit 6392549 Merge: 5c27cc6 72a1e3f Author: AmoryBlaine <[email protected]> Date: Tue Apr 9 23:38:50 2024 -0400 Merge branch 'PvE-CMSS13:master' into master commit 72a1e3f Author: KoishiVibe <[email protected]> Date: Tue Apr 9 21:04:11 2024 -0500 more fluff, removes kevlar mentions and replaces with venlar (cmss13-devs#188) Co-authored-by: KoishiVibe <[email protected]> Co-authored-by: morrowwolf <[email protected]> commit 0c61b76 Author: DexterDude <[email protected]> Date: Tue Apr 9 21:24:46 2024 -0400 M44 sprite and sound changes (cmss13-devs#196) commit 4475857 Author: morrowwolf <[email protected]> Date: Tue Apr 9 21:22:51 2024 -0400 Medals (cmss13-devs#222) commit 4020295 Author: grifp71 <[email protected]> Date: Tue Apr 9 21:22:20 2024 -0400 Biblically Accurate Smartguns (cmss13-devs#213) Co-authored-by: morrow <[email protected]> commit 5c27cc6 Merge: 298847c 0976be2 Author: AmoryBlaine <[email protected]> Date: Mon Apr 8 17:13:21 2024 -0400 Merge branch 'PvE-CMSS13:master' into master commit 0976be2 Author: AndroBetel <[email protected]> Date: Mon Apr 8 23:30:12 2024 +0300 machetes now have belt slot sprites (cmss13-devs#224) Fix for a previously invisible belt scabbard. commit 1a5b544 Author: grifp71 <[email protected]> Date: Sun Apr 7 19:15:10 2024 -0400 Machetes on back for smartgunners (cmss13-devs#177) commit 784a01f Author: AmoryBlaine <[email protected]> Date: Sat Apr 6 19:00:35 2024 -0400 Fixes horizontal access denied sprite (cmss13-devs#218) Horizontal fix. commit c91382d Author: Nihisohel <[email protected]> Date: Sun Apr 7 00:03:12 2024 +0800 Tactical reload on the move (cmss13-devs#217)
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
morrowwolf
approved these changes
May 2, 2024
AndroBetel
pushed a commit
to kirieee/PvE-CMSS13
that referenced
this pull request
Jun 1, 2024
Co-authored-by: AmoryBlaine <[email protected]>
AndroBetel
pushed a commit
to kirieee/PvE-CMSS13
that referenced
this pull request
Jun 1, 2024
Co-authored-by: AmoryBlaine <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re-palettes for the wood of the M4A3, M44, 1911 and M37. Darkens the M41, updates it and the M37s back sprites. Jungle binocs are now a brown instead of a lighter green.