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

[MIRROR] Fixes modular computer boot-up #2603

Merged
merged 2 commits into from
Mar 28, 2024
Merged

[MIRROR] Fixes modular computer boot-up #2603

merged 2 commits into from
Mar 28, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1668
Original PR: tgstation/tgstation#82254

About The Pull Request

Fixes a bug where modular computers (specifically PDAs) will fail to start up if there is zero required application power draw.

PDA will now consume base active power usage during startup.

Related tgstation/tgstation#82196
Fixes tgstation/tgstation#82245
Fixes tgstation/tgstation#82229

Changelog

🆑 LT3
fix: Fixed modular computers failing to boot up using cell power (eg: contractor tablet)
/:cl:

* Fixes modular computer boot-up

* Prepare for merge master

* restore mirror

---------

Co-authored-by: lessthanthree <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror labels Mar 27, 2024
@Iajret Iajret merged commit 861af9d into master Mar 28, 2024
23 checks passed
@Iajret Iajret deleted the upstream-mirror-1668 branch March 28, 2024 13:06
AnywayFarus added a commit that referenced this pull request Mar 28, 2024
Iajret pushed a commit that referenced this pull request May 21, 2024
* push

* no more beeping : (

* Apply suggestions from code review

Co-authored-by: Bloop <[email protected]>

* Update _under.dm

* Update _under.dm

* Update code/modules/clothing/under/_under.dm

rogue space

---------

Co-authored-by: Bloop <[email protected]>
ReezeBL pushed a commit that referenced this pull request May 22, 2024
* push

* no more beeping : (

* Apply suggestions from code review



* Update _under.dm

* Update _under.dm

* Update code/modules/clothing/under/_under.dm

rogue space

---------

Co-authored-by: Zergspower <[email protected]>
Co-authored-by: Bloop <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Contractor tablet does not work Contractor PDA from traitor contractor kit doesnt work
3 participants