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 for mat container & ORM #1363

Closed
wants to merge 1 commit into from

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25885
Original PR: tgstation/tgstation#80573

About The Pull Request

  • Fixes #80559
  1. The ORM now hooks onto the local container only if off station. The ui act if statement was also messed up but that's fixed now too.

  2. Creates a dedicated signal for items inserted into the silo for clarity & uses the helper proc defined inside remote materials for inserting items so we don't have to specify the context manually.

  3. Properly updates the auto Doc for the container signal defines

Changelog

🆑 SyncIt21
fix: Off station ORM's can redeem points again.
/:cl:

* Fixes for mat container & ORM (#80573)

- Fixes #80559

1) The ORM now hooks onto the local container only if off station. The
ui act if statement was also messed up but that's fixed now too.

2) Creates a dedicated signal for items inserted into the silo for
clarity & uses the helper proc defined inside remote materials for
inserting items so we don't have to specify the `context` manually.

3) Properly updates the auto Doc for the container signal defines

:cl:
fix: Off station ORM's can redeem points again.
/:cl:

* Fixes for mat container & ORM

---------

Co-authored-by: SyncIt21 <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror Fix labels Dec 28, 2023
@Iajret Iajret closed this Jan 3, 2024
@Iajret Iajret deleted the upstream-mirror-25885 branch January 3, 2024 18:40
Iajret pushed a commit that referenced this pull request Mar 10, 2024
…ition (and lone ops get some spare ammo for their bulldog) (#1363)

* Mini-Nukie Update: The Bulldog is a 2-shot burst fire gun edition (and lone ops get some spare ammo for their bulldog)

* Update shotgun.dm

---------

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

Successfully merging this pull request may close these issues.

3 participants