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] Hardcore random will not assign incompatible quirks. #711

Merged
merged 1 commit into from
Nov 19, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25111
Original PR: tgstation/tgstation#79825

About The Pull Request

Fixes #78114.
Fixes #78505.

Grumble grumble, code rot.

#77727 inadvertently broke hardcore random quirk selection, making it not actually check the compatibility of quirks before adding them. This means that quirks that were never meant to go together could be randomly assigned, which broke all kinds of things. I've simply made it properly check for the typepath rather than checking typepaths against names, making it actually function as intended.

Why It's Good For The Game

Certain quirks are incompatible for a reason. Prevents unintended combos that break in unexpected ways.

Changelog

🆑 lizardqueenlexi
fix: Hardcore Random will no longer assign incompatible quirks.
/:cl:

…NORE] (#25111)

* Hardcore random will not assign incompatible quirks. (#79825)

## About The Pull Request

Fixes #78114.
Fixes #78505.

Grumble grumble, code rot.

#77727 inadvertently broke hardcore random quirk selection, making it
not actually check the compatibility of quirks before adding them. This
means that quirks that were never meant to go together could be randomly
assigned, which broke all kinds of things. I've simply made it properly
check for the typepath rather than checking typepaths against names,
making it actually function as intended.
## Why It's Good For The Game

Certain quirks are incompatible for a reason. Prevents unintended combos
that break in unexpected ways.
## Changelog
:cl:
fix: Hardcore Random will no longer assign incompatible quirks.
/:cl:

* Hardcore random will not assign incompatible quirks.

---------

Co-authored-by: lizardqueenlexi <[email protected]>
@Iajret Iajret merged commit 8857654 into master Nov 19, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-25111 branch November 19, 2023 17:20
AnywayFarus added a commit that referenced this pull request Nov 19, 2023
Iajret pushed a commit that referenced this pull request Jan 31, 2024
* Fix Ore Vent's well being on improper plane (#81181)

## About The Pull Request

Removed explicit plane set to `GAME_PLANE` and `ABOVE_MOB_LAYER` thus
fixing issue when well was drawn on improper plane, possibly the ghost
one.

## Why It's Good For The Game

This PR fixes a visual bug.


![Pic](https://github.com/tgstation/tgstation/assets/137328283/6d867b25-8aec-4f36-ae69-b2b1a918d908)

## Changelog

:cl:
fix: fixed ore vent's well being drawn over ash storm. 
/:cl:

* Fix Ore Vent's well being on improper plane

---------

Co-authored-by: Interception&? <[email protected]>
ReezeBL pushed a commit that referenced this pull request Feb 6, 2024
* Fix Ore Vent's well being on improper plane (#81181)

## About The Pull Request

Removed explicit plane set to `GAME_PLANE` and `ABOVE_MOB_LAYER` thus
fixing issue when well was drawn on improper plane, possibly the ghost
one.

## Why It's Good For The Game

This PR fixes a visual bug.


![Pic](https://github.com/tgstation/tgstation/assets/137328283/6d867b25-8aec-4f36-ae69-b2b1a918d908)

## Changelog

:cl:
fix: fixed ore vent's well being drawn over ash storm. 
/:cl:

* Fix Ore Vent's well being on improper plane

---------

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