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

adding vendors for maintenance technician #5749

Merged
merged 11 commits into from
Feb 26, 2024
Merged

Conversation

Huffie56
Copy link
Contributor

@Huffie56 Huffie56 commented Feb 18, 2024

About the pull request

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: adding vendor for maintenance technician.
code: remove some item that maintenance technician spawned with and put them in is vendor instead.
maptweak: replaced secured closet by vendor for maintenance technician.
/:cl:

@Huffie56 Huffie56 added this to the USS Almayer Updates/Changes milestone Feb 18, 2024
@github-actions github-actions bot added Mapping did you remember to save in tgm format? Feature Feature coder badge Code Improvement Make the code longer labels Feb 18, 2024
@Huffie56 Huffie56 marked this pull request as ready for review February 18, 2024 12:50
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

Vendors are good and all sure, but, i think it honestly looks better for this spot to have lockers.

Find a better spot for the vendors if we are to add them.

@Nanu308 Nanu308 marked this pull request as draft February 20, 2024 01:55
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 20, 2024
@cm13-github
Copy link
Contributor

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

@Huffie56
Copy link
Contributor Author

Vendors are good and all sure, but, i think it honestly looks better for this spot to have lockers.

Find a better spot for the vendors if we are to add them.

i think i found a better spot just east of their cryo area.

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 20, 2024
@Huffie56 Huffie56 marked this pull request as ready for review February 20, 2024 08:44
@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Feb 20, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 22, 2024
@Huffie56 Huffie56 marked this pull request as draft February 22, 2024 14:53
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 22, 2024
@cm13-github
Copy link
Contributor

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

@Huffie56 Huffie56 marked this pull request as ready for review February 22, 2024 19:10
Copy link
Member

@SabreML SabreML left a comment

Choose a reason for hiding this comment

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

Thanks! Last thing I think:

removing having two mandatory backpack and put one as recommended instead.
@SabreML SabreML added this pull request to the merge queue Feb 26, 2024
Merged via the queue into cmss13-devs:master with commit 62ef80e Feb 26, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Feb 26, 2024
@Huffie56 Huffie56 deleted the mtvendor branch February 26, 2024 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants