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

BoxStation Post-Merge Fixes 4.1 #3405

Merged
merged 7 commits into from
Sep 16, 2024

Conversation

The-Black-Screen
Copy link
Contributor

@The-Black-Screen The-Black-Screen commented Sep 14, 2024

About The Pull Request

Continuation of PR 2213.

PR 2213 was accidentally merged after I had recently fixed merge conflicts on the branch, but before I was able to commit or recommit any of the changes done to BoxStation.dmm and the other files.

Added a lot more dirt and trash to all of Maintenance.

  • Get to cleaning, Janitors.

Added a lot more fire extinguishers around the map.

  • Space OSHA compliant. Probably.

Changed a majority of the shutters to start closed by default.

  • Helps with fixing the light related issues.

Changed all Maintenance areas.

  • Partially redone.
  • Deleted a ton of airlocks, particularly along specific paths and in areas with too many airlocks.
  • The redone parts were hastily filled in to get this fix out as soon as possible, I'll go back and change those spots later.

Changed the Atmospherics area.

  • Slightly redone
    • Slightly smaller, a consequence of moving other areas around.

Changed the Bar area.

  • Minor changes

Changed the Bridge area.

  • Almost completely redone.
    • A little cramped, but it doesn't compromise the flow of the area in front of the bridge.

Changed the Departure Lounge area.

  • Minor changes.

Changed the Engineering area.

  • Partially redone.

Changed the Library area.

  • Completely redone.

Changed the Medical area.

  • Completely redone.

Changed the Prison area.

  • Minor changes.

Changed the Technical Storage area.

  • Completely redone.
    • New layout taken from BeeStation.

Changed the Telecomms Control and Server Rooms areas.

  • Partially redone.
    • New layout taken from BeeStation.

Moved the Artificial Intelligence Satellite and Ordnance Testing Site areas further away from the map edge.

  • Apparently there's something like a 10 to 15 tile area from the edges of the maps used for smoothing transition between z-levels.

Removed the Construction area.

As well as a bunch of other miscellaneous additions, changes, fixes, etc.

Why It's Good For The Game

It adds a lot of the changes that were supposed to be in PR 2213.

Changelog

🆑
add: added more dirt to maintenance, added more fire extinguishers, miscellaneous things.
del: removed the construction area, miscellaneous things.
qol: added a northern entrance to all random bar maps, changed a lot of stuff in a lot of areas, removed airlocks from specific maintenance area paths.
fix: added a lot of the changes that were supposed to be in PR 2213.
/:cl:

Continuation of PR 2213.
Thanks for finding these, Linter.
Thanks again, Linter.
Just some lights and other stuff I missed.
@The-Black-Screen The-Black-Screen changed the title BoxStation Post Merge Fixes 4.1 BoxStation Post-Merge Fixes 4.1 Sep 15, 2024
Cleaned up the disposal pipe system a bit.

Did more stuff with lights.

Miscellaneous things.
Missed some more stuff.
Miscellaneous stuff.
@Absolucy Absolucy merged commit de55beb into Monkestation:master Sep 16, 2024
22 checks passed
github-actions bot added a commit that referenced this pull request Sep 16, 2024
@The-Black-Screen The-Black-Screen deleted the BoxStation-Fixes-4.1 branch September 17, 2024 03:34
The-Black-Screen added a commit to The-Black-Screen/MonkeStation-2.0 that referenced this pull request Nov 1, 2024
ThePooba pushed a commit that referenced this pull request Nov 6, 2024
* BoxStation Post-Merge Fixes 4.2

Continuation of #2213 and #3405.

* Fix 1

Didn't think that'd trigger the linters.

* Fix 2

Missed a cable.

* Fix 3

A quick fix for PR 3733.

* Fix 4

I knew I was forgetting something.

Removes the sink and shower from the Medical Storage area.

Replaces them with a medical modsuit and recharging station.

Other miscellaneous stuff.

* Fix 5

Attempts to fix issue 4105.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants