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] conveyors stop conveying whatever exits their z level (#80787) #1468

Merged
merged 1 commit into from
Jan 6, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#335

ORIGINAL PR: tgstation/tgstation#80787

About The Pull Request

not fixed

2024-01-04.09-51-05.mp4

fixed

2024-01-04.10-00-29.mp4

Why It's Good For The Game

fixes #80575

Changelog

🆑 mc-oofert
fix: conveyor belts no longer maintain movement if whatever is on them suddenly leaves their z level
/:cl:

… (#80787) (#335)

conveyors stop conveying whatever exits their z level (#80787)

## About The Pull Request

not fixed


https://github.com/tgstation/tgstation/assets/70376633/a6269a2f-abaf-48af-98de-561f7b1db8e6


fixed


https://github.com/tgstation/tgstation/assets/70376633/f77fe38d-aa3f-468a-a4fd-95a2dfca0a1f



## Why It's Good For The Game
fixes #80575

## Changelog
:cl:
fix: conveyor belts no longer maintain movement if whatever is on them
suddenly leaves their z level
/:cl:

Co-authored-by: jimmyl <[email protected]>
@Iajret Iajret merged commit 418d2f0 into master Jan 6, 2024
23 checks passed
@Iajret Iajret deleted the upstream-mirror-335 branch January 6, 2024 19:33
AnywayFarus added a commit that referenced this pull request Jan 6, 2024
Iajret pushed a commit that referenced this pull request Mar 16, 2024
* Adds a collar bomb to the black market. (#81898)

## About The Pull Request
Originally part of the other blackmarket PR, but it seemed a tad awkward
to have it mandatorily installed on mobs rescued from the holding
facility.

But yeah, this PR adds a neck item that causes the wearer's death with a
5 seconds countdown when triggered, which can be bought from the market
uplinks. The box comes with a yellow button to trigger it, but it can
also hold a signaler (which the wearer cannot tamper) if you wish to use
assemblies. Take note that, upon being worn, the item cannot be removed
by any mean beside beheading iirc (so HARS should counter it), and
fire/acid if you have a ton of patience because of its high armor
values.

## Why It's Good For The Game
More mean and evilish stuff to populate the black market with.

## Changelog

:cl:
add: Added a collar bomb to the black market.
add: Added a possible kit to the special syndie bundle B, which also has
uses these collars.
/:cl:

---------

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

* Adds a collar bomb to the black market.

* Update clothing.dm

---------

Co-authored-by: Ghom <[email protected]>
Co-authored-by: san7890 <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
ReezeBL pushed a commit that referenced this pull request Mar 17, 2024
* Adds a collar bomb to the black market. (#81898)

## About The Pull Request
Originally part of the other blackmarket PR, but it seemed a tad awkward
to have it mandatorily installed on mobs rescued from the holding
facility.

But yeah, this PR adds a neck item that causes the wearer's death with a
5 seconds countdown when triggered, which can be bought from the market
uplinks. The box comes with a yellow button to trigger it, but it can
also hold a signaler (which the wearer cannot tamper) if you wish to use
assemblies. Take note that, upon being worn, the item cannot be removed
by any mean beside beheading iirc (so HARS should counter it), and
fire/acid if you have a ton of patience because of its high armor
values.

## Why It's Good For The Game
More mean and evilish stuff to populate the black market with.

## Changelog

:cl:
add: Added a collar bomb to the black market.
add: Added a possible kit to the special syndie bundle B, which also has
uses these collars.
/:cl:

---------



* Adds a collar bomb to the black market.

* Update clothing.dm

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Ghom <[email protected]>
Co-authored-by: san7890 <[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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants