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] [MODULAR] Fixes primitive wooden fencing (and gate) dropping iron rods instead of wood #2899

Merged
merged 2 commits into from
Apr 16, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#1979

About The Pull Request

Because these are a subtype of railing (with no drop set), they were dropping iron rods. Now, they return the same amount of wood required to craft them (5).

How This Contributes To The Nova Sector Roleplay Experience

Fixes #1864

Proof of Testing

Screenshots/Videos
MedalTVScreenRecording20240414073340.mp4

Changelog

🆑 Chelxox
fix: Primitive wooden fencing drops wood upon deconstruction (instead of iron rods)
/:cl:

…s instead of wood (#1979)

* fixes primitive fencing drop

* Update modular_nova/modules/primitive_structures/code/fencing.dm

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

---------

Co-authored-by: Tom <[email protected]>
Co-authored-by: Bloop <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота Nova Mirror labels Apr 15, 2024
@Iajret Iajret merged commit 8f5ea74 into master Apr 16, 2024
24 of 25 checks passed
@Iajret Iajret deleted the upstream-mirror-1979 branch April 16, 2024 13:11
AnywayFarus added a commit that referenced this pull request Apr 16, 2024
Iajret pushed a commit that referenced this pull request Jun 8, 2024
…ells. [MDB IGNORE] (#2899)

* Fixes borg chargers constantly (abet slowly) draining borg cells. (#83743)

## About The Pull Request
- Adds in checks for the borg consumables resupplying to stop drawing
power once supplies are full. Specifically, the `respawn_consumables()`
proc will run attempting to stock everything it can, and will return
TRUE if any item required stocking.
## Why It's Good For The Game
Certain borg tools are still supplied by the borg chargers directly at a
power cost because material costs just don't make sense. These did not
have a check in place for if the various resources were full, meaning
every process cycle a bit of the borg's cell would be used attempting to
restock things. Since it's a percentage of the cell's current charge, a
filled bluespace cell could have a surprising power leak.

Now that borg chargers pull directly from the SMES units, borgs don't
recharge if the powernet is empty (regardless of local APC charge). But
borg consumables restocking carries on, which causes borgs to slowly
drain. So I have added some checks to stop the drain if nothing was
actually done.
## Changelog
:cl:
fix: Fixed borg chargers (especially unpowered ones) constantly draining
a borg's cell.
/:cl:

* Fixes borg chargers constantly (abet slowly) draining borg cells.

---------

Co-authored-by: zxaber <[email protected]>
Co-authored-by: NovaBot13 <[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 во что-то уткнулся. Не ставить вручную, только для бота Nova Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants