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

Réorganisation des Pilotes et assistants #5619

Closed
wants to merge 16 commits into from

Conversation

LC4492
Copy link
Contributor

@LC4492 LC4492 commented Feb 1, 2024

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

  1. The Secondary Preparations room for auxiliary personnel have been removed from the cryocells to improve the use of space and because its existence became a complete redundancy, as the Pilot Crew wouldn't need to walk the entire Ship anymore, and the Tank Crew...wait, where is the Tank Crew?
  2. Other small fixes to the cryocell area have been made, such as wrongly-directed emergency shutters of the SEA office, or overlapping semiotics/lamps/cameras, cryo pods have been added to the place where the S. Preps once were.
  3. Latejoin landmarks have been added to the Pilot Preps and the vents on it have been better positioned to correctly display that they are actually working (as depending of the pipe position, the light that confirms the pipes are properly connected to the vents will not show).

CODING CHANGES

  1. The vendors have been updated and adjusted to give more item options to the Crews, such as more headgear options, more utility equipment that could have some good use in their position (Whistles, Space Cleaners, etc).
  2. Utility and holster belts have been separated to give the possibility of taking one of both at the same time, this being a pat on the back of those who fit their sidearms on their armored vest, and another utility belt on their waist.
  3. Sidearm options have been removed from the clothing vendors because of the redundancy with the actual guns vendors [VP78s have also been transferred, but in half the quantity of the normal sidearms (two instead of four) to better follow their quite rare numbers, anything else in the gun vendor remained completely untouched]. More snowgear options, more backpack options, adds a prescription option to the MED HUD.
  4. Headsets will not wake up with the Piloting members anymore, with them only waking up in uniform, shoes and backpack, for better lore coherence.

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:

@LC4492 LC4492 requested a review from Nanu308 as a code owner February 1, 2024 02:51
@github-actions github-actions bot added Mapping did you remember to save in tgm format? Quality of Life Make the game harder to play Code Improvement Make the code longer labels Feb 1, 2024
@Vicacrov
Copy link
Contributor

Vicacrov commented Feb 1, 2024

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.

@Huffie56
Copy link
Contributor

Huffie56 commented Feb 1, 2024

i think this is respecting the current freeze.
as it's adding a new feature: late join spawn for PO and DCC.
it's normal to adapt the map to those change.

@Huffie56
Copy link
Contributor

Huffie56 commented Feb 1, 2024

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.

you can check it in the test called mapdiffbot2 bellow.

@Nanu308 Nanu308 marked this pull request as draft February 2, 2024 16:38
@LC4492 LC4492 requested a review from Nanu308 February 2, 2024 19:38
@LC4492 LC4492 marked this pull request as ready for review February 2, 2024 19:39
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 now map wise

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Feb 3, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 19, 2024
@cm13-github
Copy link
Contributor

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

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

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 22, 2024
@cm13-github
Copy link
Contributor

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

Copy link
Member

@harryob harryob left a 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
Copy link
Member

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

Copy link
Contributor

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.

@harryob harryob marked this pull request as draft February 22, 2024 16:20
Copy link
Contributor

github-actions bot commented Mar 2, 2024

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 Mar 2, 2024
@github-actions github-actions bot closed this Mar 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Merge Conflict PR can't be merged because it touched too much code Quality of Life Make the game harder to play Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants