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

fix and small refactor of Areas in lower deck on almayer part2 #5373

Merged
merged 12 commits into from
Jan 25, 2024

Conversation

Huffie56
Copy link
Contributor

@Huffie56 Huffie56 commented Jan 3, 2024

About the pull request

properly made some comment to doc standard with ///
create a new area type /area/almayer/mnt
it will be a parent to hull area.
changed hull/lower_hull to hull/lower (same for upper)
added two maintenance areas /area/almayer/mnt/lower/constr and /area/almayer/mnt/lower/s_bow
added a bunch of missing apc because of all the recent change in hull areas...
map tweak hull areas where a lot to bright so i moved a bunch of light (hope it doesn't break the freeze....)

Explain why it's good for the game

1-making hull area match well separated area will help a lot people to use the system to locate dead people etc....
2-making hulls areas darker will add a more fitting vibe to it.
3-seperate hull and maint area is in preparation to the future also allow to know hull area area with access to exterior hull
and know maint aren't
4-adding more apc will allow them have area being unpowered...

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
fix: corrected the name of an area from "Lower Deck Starboard Hull" to "Lower Deck Starboard-Aft Hull".
fix: added apc's to area that where missing one.
maptweak: added some areas to almayers (constr site, Starboard-Bow Maintenance, Bow Hull(port and starboard),cryo maintenance.
/:cl:

Julien added 5 commits January 3, 2024 11:36
make hull area at 0C want the place to be colder.
adding port and star bow hull lower deck
adding two areas
added constru and s-bow maintainenance area
@github-actions github-actions bot added Mapping did you remember to save in tgm format? Fix Fix one bug, make ten more labels Jan 3, 2024
@Huffie56 Huffie56 marked this pull request as ready for review January 3, 2024 21:33
@Huffie56
Copy link
Contributor Author

Huffie56 commented Jan 3, 2024

those change make sense to me.
if it doesn't for you just ask me to rephrase i am a bit tired...

code/game/area/almayer.dm Outdated Show resolved Hide resolved
code/game/area/almayer.dm Outdated Show resolved Hide resolved
code/game/area/almayer.dm Outdated Show resolved Hide resolved
code/game/area/almayer.dm Outdated Show resolved Hide resolved
code/game/area/almayer.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft January 4, 2024 00:39
@Huffie56 Huffie56 marked this pull request as ready for review January 4, 2024 14:36
@Huffie56 Huffie56 requested a review from Drulikar January 4, 2024 14:48
@Huffie56 Huffie56 added this to the USS Almayer Updates/Changes milestone Jan 4, 2024
@Huffie56 Huffie56 requested a review from Nanu308 January 5, 2024 09:37
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Are these changes to maint intended? See https://github.com/cmss13-devs/cmss13/pull/5373/checks?check_run_id=20164023790

image
image

The old locations for these hazard lines seemed to line up with the entire ship.

code/game/area/almayer.dm Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft January 9, 2024 02:33
@Huffie56
Copy link
Contributor Author

Huffie56 commented Jan 9, 2024

Are these changes to maint intended? See https://github.com/cmss13-devs/cmss13/pull/5373/checks?check_run_id=20164023790

image image

The old locations for these hazard lines seemed to line up with the entire ship.

@Drulikar
yes those changed where intended to make each hull area close to the same length.
for that i had to move those emergency shutter since they marked the end of area inside hull.
i can totally revert emplacement of those emergency shutter emplacement if you want.
but i think this way it's better to locate where those area are...

@Huffie56 Huffie56 marked this pull request as ready for review January 9, 2024 10:56
@Huffie56 Huffie56 requested a review from Drulikar January 9, 2024 10:56
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 Jan 17, 2024
@Nanu308 Nanu308 removed the Stale beg a maintainer to review your PR label Jan 17, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 18, 2024
@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 Jan 19, 2024
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.

Mapping is fine, just change the area thing and it's good

code/game/area/almayer.dm Outdated Show resolved Hide resolved
@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Jan 22, 2024
@Nanu308 Nanu308 marked this pull request as draft January 22, 2024 15:58
@Huffie56 Huffie56 marked this pull request as ready for review January 22, 2024 17:05
@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 Jan 23, 2024
@Huffie56 Huffie56 marked this pull request as draft January 23, 2024 10:14
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 23, 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 January 23, 2024 19:21
@Nanu308 Nanu308 disabled auto-merge January 25, 2024 17:23
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

Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Engage merging.

@Nanu308 Nanu308 added this pull request to the merge queue Jan 25, 2024
Merged via the queue into cmss13-devs:master with commit 86d6ca6 Jan 25, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Jan 25, 2024
@Huffie56 Huffie56 deleted the area_change_part2 branch January 26, 2024 12:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more 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