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 crafting menu incorrect use of reagents #915

Merged
merged 1 commit into from
Dec 2, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25382
Original PR: tgstation/tgstation#80046

About The Pull Request

  • Fixes #79931

The way crafting menu handles reagents is an abomination. It manually updates its volume, rather than calling the correct procs for it and also "clones" reagents like... it does some weird stuff that can leave the beaker in an inconsistent state let's just leave it at that.

Now we properly consume the reagent via remove_reagent() proc and don't do stuff manually so it works now. Also added some sanity checks such as >= and not simply > when checking for reagent volumes and also checks if we actually found a container in our surroundings which could runtime if none was available

Also for my sanity please don't tell me to change any single letter var names here. This whole file is crawling with them so let someone else get their GBP from that

Changelog

🆑 SyncIt21
fix: crafting food or any other items that require reagents will not leave behind blank reagents. That and properly updates the holder those reagents are stored in
/:cl:

…#25382)

* Fixes crafting menu incorrect use of reagents (#80046)

## About The Pull Request
- Fixes #79931

The way crafting menu handles reagents is an abomination. It manually
updates its volume, rather than calling the correct procs for it and
also "clones" reagents like... it does some weird stuff that can leave
the beaker in an inconsistent state let's just leave it at that.

Now we properly consume the reagent via `remove_reagent()` proc and
don't do stuff manually so it works now. Also added some sanity checks
such as `>=` and not simply `>` when checking for reagent volumes and
also checks if we actually found a container in our surroundings which
could runtime if none was available

Also for my sanity please don't tell me to change any single letter var
names here. This whole file is crawling with them so let someone else
get their GBP from that

## Changelog
:cl:
fix: crafting food or any other items that require reagents will not
leave behind blank reagents. That and properly updates the holder those
reagents are stored in
/:cl:

* Fixes crafting menu incorrect use of reagents

---------

Co-authored-by: SyncIt21 <[email protected]>
@ReezeBL ReezeBL merged commit 1b33097 into master Dec 2, 2023
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-25382 branch December 2, 2023 15:22
AnywayFarus added a commit that referenced this pull request Dec 2, 2023
Iajret pushed a commit that referenced this pull request Feb 11, 2024
* Contractor loadout adjustment + Price tweak

* Merge conflict fix

---------

Co-authored-by: Xander3359 <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
Iajret added a commit that referenced this pull request Feb 15, 2024
* [MIRROR] Contractor loadout adjustment + Price tweak (#915)

* Contractor loadout adjustment + Price tweak

* Merge conflict fix

---------

Co-authored-by: Xander3359 <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>

* Update uplink_kits.dm

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Xander3359 <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
Co-authored-by: Iajret <[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