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

Particle Accelerator #5975

Merged
merged 13 commits into from
Feb 10, 2021
Merged

Particle Accelerator #5975

merged 13 commits into from
Feb 10, 2021

Conversation

ThatDan123
Copy link
Contributor

@ThatDan123 ThatDan123 commented Feb 9, 2021

image

CL: Added particle accelerator, can be obtained through cargo

-Adds singularity generator to cargo

-Adds radiation collector circuit board to circuit imprinter

-Fixes Geiger counter sounds

Current issues:

-PA wont work without voltage, but wires aren't feeding the controller for some reason, bod help pls

@ThatDan123 ThatDan123 added the Status: Awaiting Review for PRs that are awaiting reviews/rereviews label Feb 9, 2021
@github-actions github-actions bot added the UI label Feb 9, 2021
@corp-0
Copy link
Member

corp-0 commented Feb 10, 2021

I'd wait until this

PA wont work without voltage, but wires aren't feeding the controller for some reason, bod help pls

is fixed to merge. I will add a DNM for now.

@corp-0 corp-0 added the Status: DNM "Do Not Merge". Don't merge this Pull Request, as changes where requor further additions are needed. label Feb 10, 2021
@ThatDan123 ThatDan123 removed the Status: DNM "Do Not Merge". Don't merge this Pull Request, as changes where requor further additions are needed. label Feb 10, 2021
@ThatDan123
Copy link
Contributor Author

Good to be merged when ready

@corp-0
Copy link
Member

corp-0 commented Feb 10, 2021

Looks good, let''s give it a roll on staging.

bool correctArrangement = false;

//For each set up direction
foreach (var enumDirection in enumValues)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this nesting makes me angry tho haha

@corp-0 corp-0 merged commit b7ae467 into unitystation:develop Feb 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Awaiting Review for PRs that are awaiting reviews/rereviews UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants