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

Add mercenary outfit to clothesmate #2306

Merged
merged 10 commits into from
Dec 2, 2024

Conversation

Kr8art
Copy link
Contributor

@Kr8art Kr8art commented Nov 28, 2024

About the PR

Adds parts of the mercenary outfit (bandana, beret, jumpsuit, fingerless gloves) to the Clothesmate.

Why / Balance

Someone was asking for this, but I also think this is a good idea to add some more variety for appearances. Namely, this would allow passengers to roleplay as mercenaries or other military personnel like colonial marines who are off-duty or on their way to their next deployment.

Technical details

  • Added two of each Mercenary bandana, beret, jumpsuit and fingerless gloves in the DeltaV section of the Clothesmate

Media

image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

n/a

Changelog
🆑

  • add: Mercenaries and marines can now find a fitting outfit in the Clothesmate!

@Kr8art Kr8art requested a review from a team as a code owner November 28, 2024 10:49
@github-actions github-actions bot added size/XS Under 16 lines Changes: YML Changes any yml files S: Needs Review labels Nov 28, 2024
deltanedas
deltanedas previously approved these changes Nov 28, 2024
Copy link
Member

@deltanedas deltanedas left a comment

Choose a reason for hiding this comment

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

lgtm cc @therealDLondon

@therealDLondon
Copy link
Member

lgtm cc @therealDLondon

Yeah no issues from me, I love the merc outfits. Cant wait for sec to batong the passenger for wearing it :trollface:

@therealDLondon
Copy link
Member

Took me 17 minutes to remember I have merge perms

@therealDLondon therealDLondon enabled auto-merge (squash) November 28, 2024 12:45
@therealDLondon
Copy link
Member

Took me 20 seconds to realise I cant bypass the epic shader troll

@Unkn0wnGh0st333
Copy link
Contributor

Wouldn't it be better if it was in the costume vendor and not the clothing vendor?

@Kr8art
Copy link
Contributor Author

Kr8art commented Nov 28, 2024

Wouldn't it be better if it was in the costume vendor and not the clothing vendor?

Honestly not sure, but to be honest I don't think it matters a great deal.

@Unkn0wnGh0st333
Copy link
Contributor

Honestly not sure, but to be honest I don't think it matters a great deal.

Any other outfit that isn't general clothing/jumpsuits is usually put into the costume vendor. Plus most people who will be using this will mostly be using it as a costume I wouldn't doubt.

@Kr8art
Copy link
Contributor Author

Kr8art commented Nov 29, 2024

Honestly not sure, but to be honest I don't think it matters a great deal.

Any other outfit that isn't general clothing/jumpsuits is usually put into the costume vendor. Plus most people who will be using this will mostly be using it as a costume I wouldn't doubt.

Can't really say if people are more likely to use it as a costume than a legitimate military outfit, but based on the current inventory the ClothesMate seems like a better fit.

ClothesMate has:

  • Bandanas
  • Gloves
  • Jumpsuits
  • Berets

AutoDrobe has:

  • Bandanas
  • Gloves
  • Jumpsuits
  • Berets

@Kr8art
Copy link
Contributor Author

Kr8art commented Dec 2, 2024

Merge Branch Merge Branch Merge Branch Merge Branch (I don't know why this is still failing when it's just 4 lines of yaml but it's driving me crazy).

@Radezolid
Copy link
Contributor

Fail says that with your change now a cloth vend restock gives more money than it's worth

@Kr8art
Copy link
Contributor Author

Kr8art commented Dec 2, 2024

You know that makes a lot of sense, actually. Though I kinda hate to increase the price of the restock even more given it's already 3500$ for something that doesn't have that many benefits. But I guess Cargo shouldn't have a source of free money, so I'll look into changing it.

@Radezolid
Copy link
Contributor

It's by 20 spesos, make it cost 50 more and you're good

auto-merge was automatically disabled December 2, 2024 14:18

Head branch was pushed to by a user without write access

@Kr8art
Copy link
Contributor Author

Kr8art commented Dec 2, 2024

Raised the price by 50$ so it should hopefully pass now. Thanks.

@MilonPL MilonPL merged commit 6604ec6 into DeltaV-Station:master Dec 2, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files S: Needs Review size/XS Under 16 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants