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

Behold, a Box! #728

Merged
merged 73 commits into from
Mar 30, 2024
Merged

Behold, a Box! #728

merged 73 commits into from
Mar 30, 2024

Conversation

The-Black-Screen
Copy link
Contributor

@The-Black-Screen The-Black-Screen commented Dec 15, 2023 •
edited
Loading

About The Pull Request

After several months of development hell, I've finally gotten around to porting our version of BoxStation from the previous code.
Updated to better fit with our new code.

Why It's Good For The Game

Another map to play on.

Changelog

🆑
add: adds an updated version of our BoxStation back into the game, also adds the random bars and engines
code: changes roomspawner.dm to include BoxStation's random bars and engines
config: changes maps.txt to include BoxStation
/:cl:

@The-Black-Screen
Behold, a Box!
56b3839 
After several months of development hell, I've finally gotten around to porting our version of BoxStation from our previous code.
Includes the changes that NanoCats and I were making before the switch to TG code.
@The-Black-Screen
A fix
febcd53 
Fixes that whiskey bottle, I thought I already fixed that.
@The-Black-Screen
Fixes 2
7e62569 
More fixes.
@WonderPsycho
Copy link
Contributor

yooooo nice, that's cool to hear, do love me having both Boxstation and Iceboxstation on Monkestation, hope working on this PR goes well for you Black Screen

@The-Black-Screen
Fixes 3
60a452e 
Even more fixes.
@The-Black-Screen
Fixes 4
13aeab7 
Yet even more fixes.
@The-Black-Screen
Fixes 5
f9b4943 
Yet again, more fixes.
@The-Black-Screen
Fixes 6
6ebed0f 
Fixed a stray pipe.
@The-Black-Screen
Fixes 7
0431ca7 
Fixes some cyclelink stuff.
@The-Black-Screen
Fixes 8
caeeb0f 
More cyclelink stuff.
@DexeeXI
Copy link
Collaborator

DexeeXI commented Dec 16, 2023

Sweet. Finally got some shit handled on my end. I'll start running it through shortly.

@The-Black-Screen
Fixes 9
fc90a4e 
Fixes the cables for the engines and smes.
Adds APC for the TEG area.
@The-Black-Screen
Fixes 10
66fa2a4 
Miscellaneous.
@The-Black-Screen
Fixes 11
6058af0 
More miscellaneous fixes.
@The-Black-Screen
Fixes 12
4fbb177 
Fixes more things, rotates the cell block.
This was referenced Dec 18, 2023
Closed
Closed
@The-Black-Screen
Fixes 13
0d32e44 
Various things.
No HFR yet.
@The-Black-Screen
Fixes 14
a6f07d5 
Adds an external HFR.
Can be accessed through the Shared Storage external airlock.
@The-Black-Screen
Fixes 15
27196e4 
Adds two more consoles to medbay.
@The-Black-Screen
Fixes 16
5af31da 
A lot of stuff.
@The-Black-Screen
Fixes 17
6b9a3e3 
Another access.
This was referenced Dec 18, 2023
Closed
Closed
Closed
Closed
Closed
@The-Black-Screen
Fixes 18
48eeeef 
More miscellaneous things.
@The-Black-Screen
Fixes 19
25b3b46 
Fixes some stuff.
Adds a Blue Shift Uniform crate to the armory.
@The-Black-Screen
Fixes 20
00de6c1 
Fixes things.
This was referenced Mar 25, 2024
Closed
Closed
Closed
Closed
@Kmla2 Kmla2 mentioned this pull request Mar 26, 2024
Closed
This was referenced Mar 26, 2024
Closed
Closed
@The-Black-Screen
Fixes 70
c8f36f5 
Fixed the escape pod 4 lavaland loader.

Added the tiny fans back to the station-side particle accelerator airlocks.

Changed the AI Sat slightly.

Changed the Arrivals and Hydroponics APC cell helpers from 5k to 10k.
This was referenced Mar 27, 2024
Closed
Closed
Closed
Closed
@Kmla2 Kmla2 mentioned this pull request Mar 28, 2024
Closed
This was referenced Mar 28, 2024
Open
Closed
@The-Black-Screen
FIxes 71
5e7318c 
Adds an extra paper bin and pen set to the Prison Rec Room.

Adds the DNA Infuser machine and book to Genetics. I forgot about them.

Removes the TEG engine from the random engine pool. Temporarily done until TG PR 81044 is ported.
This was referenced Mar 28, 2024
Closed
Closed
@Gboster-0 Gboster-0 mentioned this pull request Mar 28, 2024
Closed
This was referenced Mar 28, 2024
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Open
@dwasint dwasint merged commit cbe04ec into Monkestation:master Mar 30, 2024
17 of 20 checks passed
github-actions bot added a commit that referenced this pull request Mar 30, 2024
@github-actions
Automatic changelog for PR #728 [ci skip]
c7d84a0
@The-Black-Screen The-Black-Screen deleted the BoxStation branch March 30, 2024 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@The-Black-Screen @WonderPsycho @DexeeXI @Absolucy @wraith-54321 @dwasint