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

Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad #4531

Closed

Conversation

Warfan1815
Copy link
Contributor

@Warfan1815 Warfan1815 commented Sep 27, 2023

About the pull request

Adds optional briefing rooms in place of long-rest bunks (moved closer to hangar) that don't replace standard briefing.

Explain why it's good for the game

Gives SLs a platform where they can host anything they want. As well , if command wants to brief the SLs and then have the SLs brief command they can also do that.

The old squad briefing room PR was cool, its just it was replacing instead of adding. Here I hope to satisfy both camps.

Testing Photographs and Procedure

Screenshots & Videos ![map](https://cdn.discordapp.com/attachments/746325498896056329/1156699977750413352/2023-09-27_22.12.02.png?ex=6515ec4d&is=65149acd&hm=c3714095cc2af47b74f98730fbde3a813258ee5cac50664f7170d5fa41cb426e&)

🆑
mapadd: New Squad Briefings south and north of normal briefing! Feel free to use them to your heart's content.
maptweak: Moved long-rest bunks further north and further south of where they were originally
/:cl:

@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 Sep 27, 2023
@github-actions github-actions bot added the Mapping did you remember to save in tgm format? label Sep 27, 2023
@Warfan1815
Copy link
Contributor Author

Merge Conflict Fixed

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

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

@koltoast
Copy link

seems to contradict both #4440 and #4476

@Warfan1815
Copy link
Contributor Author

Should no longer conflict with #4440,

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

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

@Huffie56 Huffie56 added this to the USS Almayer Updates/Changes milestone Sep 28, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Sep 28, 2023
@cm13-github
Copy link
Contributor

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

@Warfan1815 Warfan1815 closed this Sep 28, 2023
@Warfan1815 Warfan1815 deleted the SquadBriefings(Optional) branch September 28, 2023 20:16
@Warfan1815 Warfan1815 restored the SquadBriefings(Optional) branch September 28, 2023 20:17
@Warfan1815 Warfan1815 deleted the SquadBriefings(Optional) branch September 28, 2023 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants