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

Jump to bottom

Compat WS - Realistic Names #9419

Merged
merged 4 commits into from
Sep 23, 2023
Merged

Compat WS - Realistic Names #9419

merged 4 commits into from
Sep 23, 2023

Conversation

Mike-MF
Copy link
Member

@Mike-MF Mike-MF commented Sep 21, 2023 •
edited by BrettMayson
Loading

When merged this pull request will:

  • Adds realistic names to weapons for Western Sahara.
  • XMS wasn't done (see comment in CfgWeapons)

Assumes CBATeam/CBA_A3#1608 will be merged

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@jonpas jonpas added this to the 3.16.0 milestone Sep 21, 2023
@PabstMirror
Copy link
Contributor

might want to just put strings in base, and use ecstring in the subcompat?

@BrettMayson
Copy link
Member

I think we should just add SCSTRING, much easier to maintain than splitting something amongst multiple addons

@jonpas
Copy link
Member

jonpas commented Sep 22, 2023

ECSTRING(SUBCOMPONENT,string)

LinkIsGrim
LinkIsGrim approved these changes Sep 23, 2023
View reviewed changes
Copy link
Contributor

@LinkIsGrim LinkIsGrim left a comment

Choose a reason for hiding this comment

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

Not including XMS is fine IMO but I'd really like to get rid of that ugly "5.56 mm" at the end of their names.

@LinkIsGrim LinkIsGrim merged commit ab6dd01 into master Sep 23, 2023
5 checks passed
@PabstMirror PabstMirror deleted the compat_ws_realisticNames branch September 23, 2023 17:20
@Mike-MF Mike-MF mentioned this pull request Sep 24, 2023
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LinkIsGrim LinkIsGrim LinkIsGrim approved these changes

Assignees
No one assigned
Labels
area/compatibility
Projects
None yet
Milestone
3.16.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Mike-MF @PabstMirror @BrettMayson @jonpas @LinkIsGrim