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

Project ARES: Added Tech Unlock logs #5006

Merged
merged 23 commits into from
Apr 3, 2024

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Nov 22, 2023

About the pull request

As the title says, you can now view who unlocked techs in the ARES Interface (if you're senior command)
I have also split the cameras in the core to an indivual network that is not shared with the rest of the ship, and placed a camera console to view this network in CIC, CO's Office, CE's Office and Brig Office

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: Added AI Core camera consoles to CE, CO and Brig offices, along with CIC and Lifeboat bubble.
maptweak: Added Tech Control Console to ARES Core.
add: Added Tech Unlock logs to ARES Interface
/:cl:

@realforest2001 realforest2001 added this to the Project ARES milestone Nov 22, 2023
@github-actions github-actions bot added Mapping did you remember to save in tgm format? UI deletes nanoui/html Feature Feature coder badge labels Nov 22, 2023
@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Nov 23, 2023
@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 Nov 29, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 29, 2023
@cm13-github
Copy link
Contributor

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

Copy link
Contributor

github-actions bot commented Dec 9, 2023

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Dec 9, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 14, 2023
@cm13-github
Copy link
Contributor

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

@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 Dec 14, 2023
@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label Dec 15, 2023
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Dec 23, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 25, 2023
@cm13-github
Copy link
Contributor

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

@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label Dec 26, 2023
cm13-github added a commit that referenced this pull request Mar 21, 2024
cm13-github added a commit that referenced this pull request Mar 22, 2024
cm13-github added a commit that referenced this pull request Mar 23, 2024
@Drulikar Drulikar marked this pull request as draft March 25, 2024 19:39
cm13-github added a commit that referenced this pull request Mar 26, 2024
cm13-github added a commit that referenced this pull request Mar 26, 2024
cm13-github added a commit that referenced this pull request Mar 26, 2024
@cuberound cuberound mentioned this pull request Mar 26, 2024
3 tasks
cm13-github added a commit that referenced this pull request Mar 26, 2024
cm13-github added a commit that referenced this pull request Mar 26, 2024
cm13-github added a commit that referenced this pull request Mar 26, 2024
cm13-github added a commit that referenced this pull request Mar 27, 2024
cm13-github added a commit that referenced this pull request Mar 27, 2024
cm13-github added a commit that referenced this pull request Mar 27, 2024
@realforest2001 realforest2001 marked this pull request as ready for review March 27, 2024 22:15
cm13-github added a commit that referenced this pull request Mar 28, 2024
@Drulikar Drulikar added this pull request to the merge queue Apr 3, 2024
Merged via the queue into cmss13-devs:master with commit 18eddb2 Apr 3, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Apr 3, 2024
@realforest2001 realforest2001 deleted the project/ares/techs branch May 10, 2024 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Stale Exempt PR can't go stale UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants