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.

Sign up for GitHub

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

Jump to bottom

Courier's Helpers mk2 #19498

Closed
wants to merge 37 commits into from
Closed

Courier's Helpers mk2 #19498

wants to merge 37 commits into from

Conversation

courierbravo
Copy link
Contributor

Adding a series of new shuttles and buildings to use for events. Along with some bugfixes for the mk1.
Adding some more guidelines as well.

courierbravo added 16 commits June 4, 2024 17:51
@courierbravo
guideline
0188101
@courierbravo
conversion from local to branch
c3ce434 
starts the actual branch and process of making this. I've had this sitting in my computer since the warehouse raid of the konyang arc.
@courierbravo
more work done
7670b03
@courierbravo
mini c130 shuttle lmao
1a4de52
@courierbravo
more shutte work
4a5ab30
@courierbravo
final commit before pr
865f2c7
@courierbravo
nvm i forgor about writing fluff
d117284
@courierbravo
Merge branch 'courier-helpers-mk2' into event-shuttlepilled
6b23f65
@courierbravo
merges another branch, moves around stuff
945af90
@courierbravo
yeah alright I'm actually adding way more to this
9b0a332
@courierbravo
various changes
81508c3
@courierbravo
Merge branch 'master' of https://github.com/courierbravo/courierscont…
d9e6543 
…ribs into event-shuttlepilled
@courierbravo
g
c6598bc
@courierbravo
more security work
2487557
@courierbravo
more security work
13dbd3b
@courierbravo
Merge branch 'master' of https://github.com/courierbravo/courierscont…
c9da2e7 
…ribs into event-shuttlepilled
@courierbravo
Copy link
Contributor Author

!wip

@BotBOREALIS BotBOREALIS added the WIP The PR is a work in progress and should not be reviewed yet. label Jun 20, 2024
@DreamySkrell
Copy link
Contributor

ping me on discord when this is ready for review

@courierbravo
Copy link
Contributor Author

Will do, I can have it done here soon (within a week). I had to take an unscheduled break due to irl issues.

@github-actions github-actions bot added 🗺️ Mapping - Horizon The PR touches the Horizon map files. 🗺️ Mapping - Away Ship/Away Site The PR touches away ship and/or away site map files. labels Jul 16, 2024
@github-actions github-actions bot added the 🗺️ Mapping - Random Ruins The PR touches random ruins map files. label Jul 16, 2024
@github-actions GitHub Actions
Copy link

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

@courierbravo
Merge branch 'master' of https://github.com/courierbravo/courierscont…
adad41e 
…ribs into event-shuttlepilled

# Conflicts:
#	maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm
@courierbravo
Copy link
Contributor Author

!review

@BotBOREALIS BotBOREALIS added Review Required and removed WIP The PR is a work in progress and should not be reviewed yet. labels Jul 18, 2024
@courierbravo
Copy link
Contributor Author

Map freeze, consider this on pause for now.

@github-actions GitHub Actions
Copy link

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

@courierbravo
Copy link
Contributor Author

closing due to merge conflict resolving causing a headache

@courierbravo courierbravo deleted the event-shuttlepilled branch October 18, 2024 20:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DreamySkrell DreamySkrell Awaiting requested review from DreamySkrell DreamySkrell is a code owner

@NonQueueingMatt NonQueueingMatt Awaiting requested review from NonQueueingMatt NonQueueingMatt is a code owner

Assignees
No one assigned
Labels
🗺️ Mapping - Away Ship/Away Site The PR touches away ship and/or away site map files. 🗺️ Mapping - Horizon The PR touches the Horizon map files. 🗺️ Mapping - Random Ruins The PR touches random ruins map files. Merge Conflict Review Required
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@courierbravo @DreamySkrell @BotBOREALIS