-
Notifications
You must be signed in to change notification settings - Fork 565
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
Warfan1815
wants to merge
16
commits into
cmss13-devs:master
from
Warfan1815:SquadBriefings(Optional)
Closed
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad #4531
Warfan1815
wants to merge
16
commits into
cmss13-devs:master
from
Warfan1815:SquadBriefings(Optional)
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
added
the
Merge Conflict
PR can't be merged because it touched too much code
label
Sep 27, 2023
Merge Conflict Fixed |
cm13-github
removed
the
Merge Conflict
PR can't be merged because it touched too much code
label
Sep 27, 2023
Conflicts have been resolved. A maintainer will review the pull request shortly. |
This was referenced Sep 27, 2023
Closed
Should no longer conflict with #4440, |
cm13-github
added
the
Merge Conflict
PR can't be merged because it touched too much code
label
Sep 28, 2023
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
PR can't be merged because it touched too much code
label
Sep 28, 2023
Conflicts have been resolved. A maintainer will review the pull request shortly. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: