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

Bastion Station #20229

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

Conversation

Butterrobber202
Copy link
Contributor

Attempts to add a Interstellar War Solarian Military Station as an Odyssey Map. While not generic as other Odyssey maps, it can be converted to generic by simply deleting the Solarian flags scattered around and changing out the actor gear.

It is a fully functional station, with its own medical bay, engineering, atmos, crew quarters, brig, CIC, and hangar.

Your branch is up to date with 'origin/bastion_station'.

 Changes to be committed:
	modified:   code/__DEFINES/access.dm
	new file:   maps/away/scenarios/bastion_station/bastion.dmm
	new file:   maps/away/scenarios/bastion_station/bastion_station.dm
	new file:   maps/away/scenarios/bastion_station/bastion_station_areas.dm
	new file:   maps/away/scenarios/bastion_station/bastion_station_landmarks.dm
	new file:   maps/away/scenarios/bastion_station/bastion_station_roles.dm
	new file:   maps/away/scenarios/bastion_station/bastion_station_scenario.dm
@Butterrobber202
Copy link
Contributor Author

!wip

@BotBOREALIS BotBOREALIS added the WIP The PR is a work in progress and should not be reviewed yet. label Dec 2, 2024
@github-actions github-actions bot added the 🗺️ Mapping - Away Ship/Away Site The PR touches away ship and/or away site map files. label Dec 2, 2024
	modified:   aurorastation.dme
	modified:   aurorastation.dme
	modified:   maps/away/scenarios/bastion_station/bastion.dmm
	modified:   maps/away/scenarios/bastion_station/bastion.dmm
	modified:   maps/away/scenarios/bastion_station/bastion_station_scenario.dm
	modified:   maps/away/scenarios/bastion_station/bastion.dmm
	modified:   maps/away/scenarios/bastion_station/bastion_station_scenario.dm
	modified:   maps/away/scenarios/bastion_station/bastion_station_roles.dm
	modified:   maps/away/scenarios/bastion_station/bastion.dmm
Copy link

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
Changelog Required 🗺️ Mapping - Away Ship/Away Site The PR touches away ship and/or away site map files. Merge Conflict WIP The PR is a work in progress and should not be reviewed yet.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants