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] Fix Kinetic Projectiles in non PKAs breaking #2583

Merged
merged 1 commit into from
Mar 27, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1656
Original PR: tgstation/tgstation#82243

About The Pull Request

Kinetic blasts are fired from things which are not PKAs sometimes which makes this runtime

image

Changelog

🆑 Melbert
fix: Non-PKA kinetic blasts should work better
/:cl:

* Fix Kinetic Projectiles in non PKAs breaking (#82243)

## About The Pull Request

Kinetic blasts are fired from things which are not PKAs sometimes which
makes this runtime


![image](https://github.com/tgstation/tgstation/assets/51863163/53d3fe5f-7ab8-4e0d-ba81-36d148d671ae)

## Changelog

:cl: Melbert
fix: Non-PKA kinetic blasts should work better
/:cl:

* Fix Kinetic Projectiles in non PKAs breaking

---------

Co-authored-by: MrMelbert <[email protected]>
@ReezeBL ReezeBL merged commit 3fea20b into master Mar 27, 2024
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-1656 branch March 27, 2024 17:38
AnywayFarus added a commit that referenced this pull request Mar 27, 2024
Iajret pushed a commit that referenced this pull request May 20, 2024
* [No GBP] Slime people will not be eaten be slimes (#83340)

## About The Pull Request

This PR readds a missing faction check that got lost during basic mob
conversion. Partially at least, previous, it ensured that
FACTION_NEUTRAL was a one way faction, protecting slimes from other
things, while keeping all the other factions via a check that fully
reimplemented `faction_check` in a less efficient way. Rather then
reimplementing this behaviour, I have just made them check for the
FACTION_SLIME, similarly how regal rats skip converting already
converted frogs and cockroaches.

So in short, slimes once again will not attack slime people, but
everything else is fair game once they get hungry (except for people who
are in their friend list).

I am not fully happy with this solution, but I would rather not make a
new list by subtracting FACTION_NEUTRAL every time they check someone.

## Why It's Good For The Game

One of the unique features of slime people was that slimes consider them
friends and family. This PR brings this back this feature I forgot to
reimplement.

Fixes #83324

## Changelog

:cl:
fix: Slimes will no longer consider feeding upon slime people
/:cl:

* [No GBP] Slime people will not be eaten be slimes

---------

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