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] Add watering cans and syringes to tram botany #2313

Merged
merged 1 commit into from
Mar 8, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1332
Original PR: tgstation/tgstation#81787

About The Pull Request

Tram botany now has roundstart watering cans and syringes

Why It's Good For The Game

Not having watering cans is annoying because every other map has them, but on tram you have to print them manually.
Syringes are also useful to botanists.

Changelog

🆑 cnleth
qol: Tramstation botany now has roundstart watering cans and syringes
/:cl:

* Add watering cans and syringes to tram botany (#81787)

## About The Pull Request
Tram botany now has roundstart watering cans and syringes
## Why It's Good For The Game
Not having watering cans is annoying because every other map has them,
but on tram you have to print them manually.
Syringes are also useful to botanists.
## Changelog
:cl:
qol: Tramstation botany now has roundstart watering cans and syringes
/:cl:

* Add watering cans and syringes to tram botany

---------

Co-authored-by: cnleth <[email protected]>
@ReezeBL ReezeBL merged commit e6cdb2f into master Mar 8, 2024
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-1332 branch March 8, 2024 09:41
AnywayFarus added a commit that referenced this pull request Mar 8, 2024
Iajret pushed a commit that referenced this pull request May 4, 2024
* Blood Brothers should start with objectives (#83030)

## About The Pull Request

Fixes #82064
Fixes a couple of different bugs with Blood Brothers.

- Delegates creating the objectives to the team rather than the ruleset,
so ones created via the traitor panel will also have objectives.
- Creates the objectives after the team has a member mind, so it doesn't
runtime when trying to give that mob the equipment needed to steal a
supermatter sliver.
- Creates the objectives before the first Blood Brother is assigned the
antag datum, so that they will correctly be given the starting
objectives.
- Check the maximum number of brothers that can be recruited when
deciding how many objectives to generate rather than the current number
of members (which would always be 1).

## Changelog

:cl:
fix: Blood Brothers should spawn knowing what their objectives are.
fix: Teams of 3 Blood Brothers will once more have an additional
objective.
/:cl:

* Blood Brothers should start with objectives

---------

Co-authored-by: Jacquerel <[email protected]>
ReezeBL pushed a commit that referenced this pull request May 5, 2024
* Blood Brothers should start with objectives (#83030)

## About The Pull Request

Fixes #82064
Fixes a couple of different bugs with Blood Brothers.

- Delegates creating the objectives to the team rather than the ruleset,
so ones created via the traitor panel will also have objectives.
- Creates the objectives after the team has a member mind, so it doesn't
runtime when trying to give that mob the equipment needed to steal a
supermatter sliver.
- Creates the objectives before the first Blood Brother is assigned the
antag datum, so that they will correctly be given the starting
objectives.
- Check the maximum number of brothers that can be recruited when
deciding how many objectives to generate rather than the current number
of members (which would always be 1).

## Changelog

:cl:
fix: Blood Brothers should spawn knowing what their objectives are.
fix: Teams of 3 Blood Brothers will once more have an additional
objective.
/:cl:

* Blood Brothers should start with objectives

---------

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