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

CMB/MP gear loadout edits, Mod 88 edits, CMB/MP resprites #311

Merged
merged 21 commits into from
Aug 5, 2024

Conversation

AmoryBlaine
Copy link
Contributor

@AmoryBlaine AmoryBlaine commented Jun 27, 2024

  • Updates CMB jackets to reflect peerage with Hybrisa PD jackets.
  • Changes wood palette of highpower pistols
  • Replaces emergency syringe kit from Deputy ERT with alt kit (bandages, gauze, tri, splints)
  • Gets rid of beanbag handful in favour of more slugs
  • Replaces boots on Deputy and Marshal with laceup shoes
  • Replaces MP5 Deputy with rarer M41A Deputy
  • Gives all CMBs flare boxes
  • Gets rid of extra misc items unimportant to CMB RP and gameplay (cigarette, binocs, legacy holobadge, holdout pistol, sechud, ect) This gives you room to pick things up or spawn in with your loadout gear
  • Changes wording of CMB jacket desc
  • Makes the 88 Mod use FMJ rounds, also makes it deal no additional damage that was intended to work in tandem with the AP rounds it fired
  • Makes the MP uniform into a standard BDU outfit with a red Hybrisa PD armband

USCM MP, CMB Deputy, CMB Marshal
image

- Updates CMB jackets to reflect peerage with Hybrisa PD jackets.
- Changes wood palette of highpower pistols
- Replaces emergency syringe kit from Deputy ERT with alt kit (bandages, gauze, tri, splints)
- Gets rid of beanbag handful in favour of more slugs
- Replaces boots on Deputy and Marshal with laceup shoes
- Replaces MP5 Deputy with rarer M41A Deputy
- Gives all CMBs flare boxes
Additional CMB changes
- revolver and highpower specific variants of the full belt

MP related changes in the same vein as the CMB changes
- Removes unnecessary gear
- MPs now spawn with a hosltered M88 pistol and 4 magazines across the holster and belt
- Adds more ammo
- Given standard OD green uniforms
- Rebalanced MP vendor
- New colony security vendor
- 88 Mod no longer FF bone break gun, now only FMJ is available
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link

Conflicts have been resolved. A maintainer will review the pull request shortly.

@AmoryBlaine AmoryBlaine changed the title CMB Resprites, ERT gear changes CMB/MP gear loadout edits, Mod 88 edits, CMB/MP resprites Jul 2, 2024
- MPs share armor with Drop Crew Chiefs
- DCC vests now defend more against melee and explosion damage since it's a multi-layered ballistic/flak armor and presumably decently hard to slash through/stab through/blunt force through
- MPs now wear standard marine uniforms with an accessory armband
- MPs now have a new helmet design
@AmoryBlaine
Copy link
Contributor Author

Stopping myself here cause I will keep adding shit like a mad man otherwise

- USCM ship roles and CMB have had their preset appearances redone to be less goofy.
- Wardens and Chief MPs now dress the same as standard MPs.
- Wardens and Chief MPs both use dogtags
- CMB cap desc rewrite
- CMB earpieces only grant access to CMB freq and colony
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Doubleumc
Doubleumc previously approved these changes Aug 1, 2024
Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good to me.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@AndroBetel AndroBetel merged commit 9f7b539 into cmss13-devs:master Aug 5, 2024
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants