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

Stanford #27

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Conversation

rynkatze
Copy link
Collaborator

@rynkatze rynkatze commented Aug 18, 2024

About the PR

Creates a map (80 pop) for the fork.

Why / Balance

ma p

Media

image
(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]):
-->

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog
🆑

  • 🗺️ : Added Stanford, an 80 max pop map, to the game.

@rynkatze rynkatze added the Status: Unfinished Currently being worked on. not yet ready to merge. label Aug 18, 2024
…ange it it deletes every single map file involved so keeping it as is for now. ready tomerge
@rynkatze rynkatze removed the Status: Unfinished Currently being worked on. not yet ready to merge. label Aug 19, 2024
Copy link
Collaborator

@Truoizys Truoizys left a 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.

@Truoizys Truoizys added the Status: Changes Needed will not be merged without requested changes. label Aug 19, 2024
@rynkatze rynkatze removed the Status: Changes Needed will not be merged without requested changes. label Aug 20, 2024
Copy link
Collaborator

@Truoizys Truoizys left a 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.

Resources/Prototypes/Entities/Markers/Spawners/corpses.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Shuttles/shuttle_incoming_event.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Shuttles/shuttle_incoming_event.yml Outdated Show resolved Hide resolved
Resources/Prototypes/GameRules/unknown_shuttles.yml Outdated Show resolved Hide resolved
@Truoizys Truoizys added the Status: Changes Needed will not be merged without requested changes. label Aug 20, 2024
Copy link
Contributor

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

@rynkatze
Copy link
Collaborator Author

this might go terribly

@rynkatze
Copy link
Collaborator Author

will fix yammul when back from work

Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map No C# size/XL Status: Changes Needed will not be merged without requested changes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants