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 ghost role descriptions on NTTS Independence #1184

Merged
merged 1 commit into from
Dec 18, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25694
Original PR: tgstation/tgstation#80377

About The Pull Request

Fixes #80251

Fixes the group descriptions for the barmaid ghost roles on the NTTS Independence from the default to "bar staff on the NTTS Independence"

Why It's Good For The Game

Causes less confusion for ghosts attempting to spawn as the barmaids or as the spiders that it was previously labled.

Changelog

🆑 Ical92
fix: fixed ghost role descriptions on NTTS Independence
/:cl:

…RE] (#25694)

* Fixes ghost role descriptions on NTTS Independence (#80377)

## About The Pull Request
Fixes #80251

Fixes the group descriptions for the barmaid ghost roles on the NTTS
Independence from the default to "bar staff on the NTTS Independence"
## Why It's Good For The Game
Causes less confusion for ghosts attempting to spawn as the barmaids or
as the spiders that it was previously labled.
## Changelog
:cl:
fix: fixed ghost role descriptions on NTTS Independence
/:cl:

* Fixes ghost role descriptions on NTTS Independence

---------

Co-authored-by: Ical <[email protected]>
@ReezeBL ReezeBL merged commit fbf1c71 into master Dec 18, 2023
23 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-25694 branch December 18, 2023 14:49
AnywayFarus added a commit that referenced this pull request Dec 18, 2023
Iajret pushed a commit that referenced this pull request Feb 28, 2024
* Fix rat heart (#81698)

## About The Pull Request

Fixes #81696

`on_mob_insert` doesn't return a truthy value from parent call, it
returns null / nothing

Also patches a potential exploit involving that can mutate check 

## Changelog

:cl: Melbert
fix: Rat hearts apply their damage modifier malus correctly
/:cl:

* Fix rat heart

---------

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