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

Modular Computers Part 2: Disk Burner #1580

Merged
merged 43 commits into from
Jan 20, 2025

Conversation

Erisfiregamer1
Copy link
Contributor

@Erisfiregamer1 Erisfiregamer1 commented Jan 17, 2025

Description

This is Part 2 of the Modular Computers system, adding the functional player facing stuff- the modular computer itself, a way to make and burn disks via the Disk Burner and a related research.

Also comes with some cleanup changes to fix parts of the system that broke in testing.


TODO

  • Actually run through this thing when my laptop is out of battery (everything worked except CONSTRUCTING the disk burner)
  • Add disk burning delay, make it more intuitive? Maybe a guidebook entry?

Media

NO.


Changelog

🆑

  • add: Added the Disk Burner, the Modular Computer as a board and a way to make computer disks.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Audio Changes any ogg files labels Jan 17, 2025
@Erisfiregamer1 Erisfiregamer1 marked this pull request as ready for review January 17, 2025 15:35
Signed-off-by: sleepyyapril <[email protected]>
@sleepyyapril
Copy link
Contributor

Fix #1584 first :)

@Erisfiregamer1
Copy link
Contributor Author

Fix #1584 first :)

👍

@Erisfiregamer1
Copy link
Contributor Author

Fix #1584 first :)

Fixed, ready for merge

@sleepyyapril
Copy link
Contributor

This too
image

@Erisfiregamer1
Copy link
Contributor Author

This too image

I'm like 99% sure that comes from adding ItemSlots component which I don't think I can get around, so...

Not My Fault

@sleepyyapril
Copy link
Contributor

Not My Fault

How does anything else get around it then, silly? Check guns, for example. It's your code doing something to containers

@Erisfiregamer1
Copy link
Contributor Author

@sleepyyapril Fixed, both in testfix PR and this one

@Erisfiregamer1
Copy link
Contributor Author

I am beginning to lose sanity over the failure of tests.
reality

@Erisfiregamer1
Copy link
Contributor Author

Can I stop catching EVERY heisentest under the sun man?!

@Erisfiregamer1
Copy link
Contributor Author

Finally, tests passing

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 19, 2025
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Erisfiregamer1
Copy link
Contributor Author

are you fucking kidding me

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 19, 2025
@VMSolidus VMSolidus merged commit 7d59d26 into Simple-Station:master Jan 20, 2025
11 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants