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: Reception Remodel #6117

Merged
merged 10 commits into from
Apr 16, 2024

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Apr 8, 2024

About the pull request

Remodels the AI Core Reception Desk to be behind a window. Also adds item chutes to depost visitor weapons into a vault.

Explain why it's good for the game

Being behind the window makes things a little more thematic. Further, the downstairs remodel gives a bit more space.

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
maptweak: Remodelled the AI Core Reception and WJ spawn area.
maptweak: Switches AI Core cameras over to manual naming.
imageadd: Added sprites for AI Core windows on black Almayer frames.
/:cl:

@realforest2001 realforest2001 added this to the Project ARES milestone Apr 8, 2024
@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? labels Apr 8, 2024
Copy link
Member

Choose a reason for hiding this comment

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

Mapping is fine, a bit unsure about the right stairwell but we'll see it in action if it becomes an issue

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Apr 14, 2024
Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

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

sprites fine

@sleepynecrons sleepynecrons added the Sprites Approved confirmed no stray pixels label Apr 14, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Apr 15, 2024
@cm13-github
Copy link
Contributor

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

@Drulikar Drulikar marked this pull request as draft April 15, 2024 19:55
@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 Apr 15, 2024
@realforest2001 realforest2001 marked this pull request as ready for review April 15, 2024 23:03
cm13-github added a commit that referenced this pull request Apr 15, 2024
@Drulikar Drulikar added this pull request to the merge queue Apr 16, 2024
Merged via the queue into cmss13-devs:master with commit 0a7aadf Apr 16, 2024
28 checks passed
cm13-github added a commit that referenced this pull request Apr 16, 2024
@realforest2001 realforest2001 deleted the project/ares/receptiondesk branch May 10, 2024 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants