-
Notifications
You must be signed in to change notification settings - Fork 464
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
Réorganisation des Pilotes et assistants #5619
Conversation
Please add screenshots to your PR if it contains a mapping change - plus note that by #5587 , the Almayer map is on a feature freeze. |
i think this is respecting the current freeze. |
you can check it in the test called mapdiffbot2 bellow. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm now map wise
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Conflicts have been resolved. A maintainer will review the pull request shortly. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
undraft once you've fixed ci
@@ -16495,6 +16480,7 @@ | |||
/obj/structure/reagent_dispensers/fueltank, | |||
/turf/open/floor/plating/plating_catwalk, | |||
/area/almayer/maint/hull/upper/u_m_p) | |||
>>>>>>> master |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these are merge conflict markers that you've committed, and you'll need to fix your map
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It also indicates you do not have the merge hooks installed. I highly recommend you do so conflicts like this are easier to deal with.
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 |
About the pull request
Pilot Team members have specified latejoin landmarks that will spawn them in the exact same place they spawn when firstjoining, making the walk between cryo and the preps much smaller, and facilitating the gearing.
MAPPING CHANGES
CODING CHANGES
Explain why it's good for the game
Improves the Quality of Life of the Player to a much higher standard when playing as Pilot or Dropship Crew Chief, and also removes the completely ugliness of that out-of-place-afterthought S. Preparations.
Testing Photographs and Procedure
N/A
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>
tags.Changelog
🆑
qol: Separates utility belts from holster belts, as a pat in the back to all those that like to use a sidearm holster in their armored vest, and an utility belt in their waist.
code: Added latejoin landmarks to both Pilot Officers and Dropship Crew Chiefs to the code. Changes to the PO/DCC gear setups in their vendors, now giving them significantly options for fitting themselves to duty.
code: Adds a Prescription Med HUD to the clothing vendors. Sidearms have been removed from the clothing vendors because of their redundancy with the actual guns vendor, two VP78s (instead of the usual four for sidearms) have been added to the vendor to counter-balance it and to give more rarity to the gun.
maptweak: Latejoin Landmarks have been added to the same places both Pilot Officers and Dropship Crew Chiefs wake up when they are firstjoiners, improving gearing time significantly.
/:cl: