-
Notifications
You must be signed in to change notification settings - Fork 4
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
Stanford #27
base: master
Are you sure you want to change the base?
Stanford #27
Conversation
…ange it it deletes every single map file involved so keeping it as is for now. ready tomerge
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.
Another classic D.H!
The new arrivals shuttle will need to be moved from ss14's file to a separate one so merge conflicts don't override the changes.
Arrivals shuttle file path can be changed in CVars.
…aw. He was probably just lookin’ at the picture one day, noticed an off-color patch of snow, and went on with his day.
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.
seperate more marked stuff into sp14 files, create separate event scheduler (spacetrafficcontrol) for prison transfer events.
its sick but the shuttle stuff should really be its own pr.
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
this might go terribly |
will fix yammul when back from work |
…ze/prison-station-14-mapdev into stanford-finished" This reverts commit c3b7737, reversing changes made to 5e523cc.
9488eed
to
5a23148
Compare
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
About the PR
Creates a map (80 pop) for the fork.
Why / Balance
ma p
Media
(mapping screenshot tool brok :[ )
Check the boxes below to confirm that you have in fact seen these (put an X in the brackets, like [X]):
-->
Breaking changes
Changelog
🆑