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

[TG Mirror] Distillation fixed [MDB IGNORE] #121

Merged
merged 1 commit into from
Oct 18, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24409
Original PR: tgstation/tgstation#79045

About The Pull Request

The recent changes to the food defines have broken the quality scaling for the fruit wine. This PR fixes the regression.

Why It's Good For The Game

Bug fix

Changelog

🆑 MTandi
fix: Distilled drink quality is fixed - can't give a mood debuff anymore
/:cl:

* Distillation fixed (#79045)

## About The Pull Request

The recent changes to the food defines have broken the quality scaling
for the fruit wine. This PR fixes the regression.

## Why It's Good For The Game

Bug fix

## Changelog

:cl:
fix: Distilled drink quality is fixed - can't give a mood debuff anymore
/:cl:

* Distillation fixed

---------

Co-authored-by: Andrew <[email protected]>
@AnywayFarus AnywayFarus merged commit d67f504 into master Oct 18, 2023
22 checks passed
@AnywayFarus AnywayFarus deleted the upstream-mirror-24409 branch October 18, 2023 06:31
FluffySSbot added a commit that referenced this pull request Oct 18, 2023
Iajret pushed a commit that referenced this pull request Feb 9, 2024
* PLEASE

* remove the remnants of the fallen state

* we should improve this somewhat

* Apply suggestions from code review

* Apply suggestions from code review

* Update code/modules/jobs/job_types/_job.dm

* Update code/datums/brain_damage/creepy_trauma.dm

* me when

* Typo

* Skyrat defines->nova defines

* Revert "Skyrat defines->nova defines"

This reverts commit 46f5fd5ab97edd58aac59d0fdbdcd48bebc54f95.

* Update tgstation.dme

* Revert "Update tgstation.dme"

This reverts commit 1f5bc9672bba5b28e7d08c47eac695222ee36d67.

* Update tgstation.dme

* Update tgstation.dme

* fix config

* awarfgh

* this should work?

* ill finish this later

* okay

* arggh

* well, at least it can be lazy

* agshj

* lil fixy

* config

* tis is a g ood  change

* guess who forgot to push a commit

* Apply suggestions from code review

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

* lets just safeguard

* move maroon to rr

* Trigger CI

* awagga

* 2nd debug code

* lets fix compile

* respect the be antag switch

* i need to push this shit already

* ok

---------

Co-authored-by: Bloop <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants