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

Bureau du commandant - CO office #4827

Merged
merged 63 commits into from
Nov 22, 2023
Merged

Bureau du commandant - CO office #4827

merged 63 commits into from
Nov 22, 2023

Conversation

LC4492
Copy link
Contributor

@LC4492 LC4492 commented Nov 2, 2023

About the pull request

An update to the CO office

Explain why it's good for the game

If people like, its good, if people don't, it is not

Testing Photographs and Procedure

image

Changelog

🆑
maptweak: Changes to the CO office: The bathroom now faces into the CO's bedroom, and not to his main office. Victory cabinet have been moved to the Officer's mess because of logical issues. Extra-detail to the office, including an exclusive stamp, table flags and others. The safe is now inside the CO's bedroom, and not in his office. The energy APC is now inside the CO's bedroom, and not in his office. Jones finally have a BED again, or something like that. Other minor changes to objects, such the addition of a cane, a box of glasses for serving guests, etc.
/:cl:

LC4492 added 30 commits April 1, 2023 14:25
@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label Nov 12, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 13, 2023
@cm13-github
Copy link
Contributor

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

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.

bilde

You've made the CO's place look really boxy, we try and avoid blocky squares when possible as it looks plain bad.
Remove the CO's uniform lockdown button, there is one to the south in the hallway right outside his office.
There is a paperbin on the CO's toilet.
There is very little space in front of the CO's office chair now with only 3x tiles. It will be crowded when event's or meetings and such are done there. Shift it back to how it was and get rid of the two file cabinets there.
In the CO's bedroom there are two vendors to the north, same as with south ones place metal flooring/warning stripe usage.
The two flags on the table looks cool, nice edit.
Moving the bathroom to face the bedroom is a good change.
And finally remember, more detailing isn't always better, moderation to hinder things from being full of too much clutter!

bilde
There is a floating table in space.

Fix the above and I'll go over it again, overall good.

@Nanu308 Nanu308 marked this pull request as draft November 14, 2023 13:37
@LC4492
Copy link
Contributor Author

LC4492 commented Nov 15, 2023

bilde

You've made the CO's place look really boxy, we try and avoid blocky squares when possible as it looks plain bad. Remove the CO's uniform lockdown button, there is one to the south in the hallway right outside his office. There is a paperbin on the CO's toilet. There is very little space in front of the CO's office chair now with only 3x tiles. It will be crowded when event's or meetings and such are done there. Shift it back to how it was and get rid of the two file cabinets there. In the CO's bedroom there are two vendors to the north, same as with south ones place metal flooring/warning stripe usage. The two flags on the table looks cool, nice edit. Moving the bathroom to face the bedroom is a good change. And finally remember, more detailing isn't always better, moderation to hinder things from being full of too much clutter!

bilde There is a floating table in space.

Fix the above and I'll go over it again, overall good.

The paperbin on the toilet is supposed to be the toilet paper, and it would be in the rack on the side of the toilet. The rest I understand

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 19, 2023
@cm13-github
Copy link
Contributor

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

@LC4492 LC4492 marked this pull request as ready for review November 19, 2023 15:58
@LC4492 LC4492 requested a review from Nanu308 November 19, 2023 15:58
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.

Delete the paper bin, we would need a specific sprite to ever add toilet paper..
Remember to unboxify the CO's main office as i said in the original review, add in the two corner walls again.

Shift/delete a plant maybe and move a 2x1 table down there or even put the stuff up north down there.
Good work on the CO's bedroom, but add a couple vents! and it's perfect.

@Nanu308 Nanu308 marked this pull request as draft November 21, 2023 07:17
@LC4492
Copy link
Contributor Author

LC4492 commented Nov 21, 2023

Delete the paper bin, we would need a specific sprite to ever add toilet paper.. Remember to unboxify the CO's main office as i said in the original review, add in the two corner walls again.

Shift/delete a plant maybe and move a 2x1 table down there or even put the stuff up north down there. Good work on the CO's bedroom, but add a couple vents! and it's perfect.

Simply doesn't make sense for the things up north to be down in the entrance, its just going to make everything weird! But I will see what can I do

@LC4492
Copy link
Contributor Author

LC4492 commented Nov 21, 2023

Done and done

@LC4492 LC4492 marked this pull request as ready for review November 21, 2023 19:17
@LC4492 LC4492 requested a review from Nanu308 November 21, 2023 19:17
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.

lgtm

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Nov 22, 2023
@Nanu308 Nanu308 added this pull request to the merge queue Nov 22, 2023
Merged via the queue into cmss13-devs:master with commit ed3628e Nov 22, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 22, 2023
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?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants