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 Hilbert Hotel and adds a beach condo #1878

Merged
merged 1 commit into from
Feb 9, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#795

About The Pull Request

There was a plush that was mapped to a Skyrat folder that didnt exist anymore for the Apartment, given my internet is out i decided to just map in a beach condo as well.

image

image

How This Contributes To The Nova Sector Roleplay Experience

Proof of Testing

Screenshots/Videos

Exit works
image

Yeah the rocks are a bit unsightly but uh - better than the void of space using the normal flags
image
image

Changelog

🆑 Zergspower
add: Hilbert Hotel - Adds a beach condo
fix: Apartment in Hilberts hotel regains its birb plush
/:cl:

* beachboyssong.ogg

* plant

* byebye tree
@Iajret Iajret merged commit 7928843 into master Feb 9, 2024
24 checks passed
AnywayFarus added a commit that referenced this pull request Feb 9, 2024
@Iajret Iajret deleted the upstream-mirror-795 branch February 10, 2024 11:15
Iajret pushed a commit that referenced this pull request Apr 9, 2024
* Update lead acid batteries charge values (#82510)

## About The Pull Request

So during the whole power consistency update thing, it seems lead acid
batteries were entirely forgotten about.
Which, well, is easy, because they never actually used
`STANDARD_CELL_CHARGE`.

https://github.com/tgstation/tgstation/blob/c34d56a45b0461f5e0fad3cc75e81580c3357119/code/game/objects/items/maintenance_loot.dm#L32-L33
Looking into it, the previous value for `STANDARD_CELL_CHARGE` seemed to
have been 1000, so we convert it directly:
```dm
maxcharge = STANDARD_CELL_CHARGE * 20
chargerate = STANDARD_CELL_CHARGE * 1.4
```
But, comparing this to the normal power cells, it seems their charge
rates got _halved_ during the update.
So, we do that too.
```dm
maxcharge = STANDARD_CELL_CHARGE * 20
chargerate = STANDARD_CELL_CHARGE * 0.7
```
And that fixes it.
## Why It's Good For The Game

Fixes lead acid batteries still using the old power amounts, and not
being relative to `STANDARD_CELL_CHARGE`.
## Changelog
:cl:
fix: Lead acid batteries have had their power values fixed.
/:cl:

* Update lead acid batteries charge values

---------

Co-authored-by: _0Steven <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants