BoxStation Post-Merge Fixes 4 #2213
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds another engine to the random engine pool. Adds more fire extinguishers around the map. Changes the layout of the atmospherics area slightly. Changes the layout of the engineering area slightly. Changes the layout of the medical area slightly. Changes the layout of the prison area slightly. Moves the ai sat and ordnance testing site further away from the map edge. Makes other miscellaneous additions, changes, and fixes.
|
Fixing conflicts. |
The-Black-Screen
force-pushed
the
BoxStation-Fixes-4
branch
from
f47cace to
410f98c
Compare
…een/MonkeStation-2.0 into BoxStation-Fixes-4
The-Black-Screen
force-pushed
the
BoxStation-Fixes-4
branch
from
93b14df to
a0edec4
Compare
|
Doing conflict fixes, again. |
…een/MonkeStation-2.0 into BoxStation-Fixes-4
|
I am once again doing conflict fixes. |
The-Black-Screen
force-pushed
the
BoxStation-Fixes-4
branch
from
b41aabc to
1c60850
Compare
The-Black-Screen
force-pushed
the
BoxStation-Fixes-4
branch
from
b70c897 to
37ba058
Compare
|
Just updating branch. |
…een/MonkeStation-2.0 into BoxStation-Fixes-4
The-Black-Screen
force-pushed
the
BoxStation-Fixes-4
branch
from
8a2cffa to
b024183
Compare
…een/MonkeStation-2.0 into BoxStation-Fixes-4
|
Still being worked on. |
|
@The-Black-Screen tell me whenever this is ready for a testmerge (either here or on discord) |
This was referenced Sep 13, 2024
The-Black-Screen
added a commit
to The-Black-Screen/MonkeStation-2.0
that referenced
this pull request
Nov 1, 2024
Continuation of Monkestation#2213 and Monkestation#3405.
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Adds another engine to BoxStation's random engine pool.
Adds more fire extinguishers around the map.
Changes the layout of the atmospherics area slightly.
Changes the layout of the engineering area slightly.
Changes the layout of the medical area slightly.
Changes the layout of the prison area slightly.
Moves the ai satellite and ordnance testing site further away from the map edge.
Makes a bunch of other miscellaneous additions, changes, and fixes.
Why It's Good For The Game
Adds more stuff and fixes for BoxStation.
Changelog
🆑
add: added a new random engine map for boxstation, added more fire extinguishers, miscellaneous things.
del: removed a pipe gun, removed the burned clown skeleton, miscellaneous things.
qol: added a direct entrance from the exam room to cryogenics, added a northern entrance to all random bar maps.
fix: tried to fix some lights being weird.
code: added the new engine to boxstation's engines file.
/:cl: