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 damage ranging on feral cats #950

Merged
merged 2 commits into from
Dec 5, 2023
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25390
Original PR: tgstation/tgstation#80076

About The Pull Request

I fucked up and made the cats always do 15 damage, should be doing between 7 and 15 per hit.

Why It's Good For The Game

Bug feex

Changelog

🆑 Vekter
fix: Fixed damage ranging on feral cats
/:cl:

…5390)

[NO GBP] Fixes damage ranging on feral cats

Co-authored-by: Vekter <[email protected]>
Co-authored-by: Bloop <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror Fix labels Dec 3, 2023
@ReezeBL ReezeBL merged commit 71d141d into master Dec 5, 2023
21 of 22 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-25390 branch December 5, 2023 07:08
AnywayFarus added a commit that referenced this pull request Dec 5, 2023
Iajret pushed a commit that referenced this pull request Feb 13, 2024
* Makes some space ruin area names more distinct (#81432)

## About The Pull Request

This slightly changes some space ruin area names. They should be
slightly more distinctive and collide less with actual station locations
(I.E. there can be two "The Quartermaster's Office" areas or two "The
Bridge" areas).
## Why It's Good For The Game

Slightly more naming consistency, less confusion in the jump-to-area
menu.
## Changelog
:cl: Rhials
spellcheck: Some space ruin area names have been made more distinct.
/:cl:

* Makes some space ruin area names more distinct

---------

Co-authored-by: Rhials <[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.

4 participants