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] Coffee Cartridge Racks now start with a spare Coffee Cartridge #1170

Merged
merged 1 commit into from
Dec 18, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25665
Original PR: tgstation/tgstation#80336

About The Pull Request

Fixes #80131

Fix to make coffee cart racks start with a coffee cart in them, as (I assume) intended.
Racks didn't have a set spawn_count, which defaults to 0. Meaning that the cartridges set to spawn, didn't actually spawn.

Why It's Good For The Game

Coffee cart racks were assumingly meant to start with cartridges in them, but didn't. This fixes the spawn count so they can spawn as intended, giving any caffeicionados an extra cartridge for their coffee making endeavors.

Changelog

🆑 Ical92
fix: coffee cartridge racks start with a coffee cartridge in them
/:cl:

…ge [MDB IGNORE] (#25665)

* Coffee Cartridge Racks now start with a spare Coffee Cartridge (#80336)

## About The Pull Request
Fixes #80131

Fix to make coffee cart racks start with a coffee cart in them, as (I
assume) intended.
Racks didn't have a set spawn_count, which defaults to 0. Meaning that
the cartridges set to spawn, didn't actually spawn.
## Why It's Good For The Game
Coffee cart racks were assumingly meant to start with cartridges in
them, but didn't. This fixes the spawn count so they can spawn as
intended, giving any caffeicionados an extra cartridge for their coffee
making endeavors.
## Changelog
:cl:
fix: coffee cartridge racks start with a coffee cartridge in them
/:cl:

* Coffee Cartridge Racks now start with a spare Coffee Cartridge

---------

Co-authored-by: Ical <[email protected]>
@Iajret Iajret merged commit 1ca2f6d into master Dec 18, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25665 branch December 18, 2023 20:39
AnywayFarus added a commit that referenced this pull request Dec 18, 2023
Iajret pushed a commit that referenced this pull request Feb 27, 2024
* Tram mob throwing adjustments (#81617)

## About The Pull Request

- Corrects grille breaking related to PR
tgstation/tgstation#81594
- Throw chance moved to a var on the controller instead of hardcoded
- Corrects a bit of documentation on tram controller landmarks
- Fixes the collision multiplier being set to a static value during
malfunction instead of the intended multiplier
- Includes throw chance in tram malfunction
- Cursed mobs now guaranteed to be thrown

## Changelog

:cl: LT3
code: Tram throwing now breaks grilles consistently
code: Tram malfunction lethality/throw chance are now a multiplier
instead of flat value
code: Tram throw chance can be adjusted
code: Unlucky trait is now used in tram throw calculation 
/:cl:

---------

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

* Tram mob throwing adjustments

---------

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