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] [MDB IGNORE] updates martian can sprites, fixes misc text and bugs in wellcheers #7424

Merged
merged 2 commits into from
Aug 27, 2023

Conversation

TaleStationBot
Copy link
Contributor

Original PR: tgstation/tgstation#77757

About The Pull Request

this is kind of a miscellaneous pile of fixes for soda.dmi, rolled up with a larger resprite of the new cans that were added with #75988. you can see everything visually changed (other than inhands) in the image below
image
and then the inhands here:
image
also changes wellcheers mood event text, and the mood switch to be based on sanity instead. apparently the mood test allowed for foolproof traitor testing, which is not ideal. this hopefully fixes that.

Why It's Good For The Game

the new martian drinks used the previous style of cans, which was updated in #77424. this makes them consistent with that style. everything else is minor things i missed or forgot to do in that PR.
also things that enable traitor testing are not great, even if they're niche and require amputation to pull off.

Changelog

🆑
fix: wellcheers is now based on sanity rather than mood
image: resprites martian cans
image: adds inhands for martian cans and wellcheers
image: minor tweaks to other cans
spellcheck: updates wellcheers mood text
/:cl:

CoiledLamb and others added 2 commits August 20, 2023 19:19
…#77757)

## About The Pull Request
this is kind of a miscellaneous pile of fixes for soda.dmi, rolled up
with a larger resprite of the new cans that were added with #75988. you
can see everything visually changed (other than inhands) in the image
below

![image](https://github.com/tgstation/tgstation/assets/110322848/4c28f0c7-3975-4510-9958-9eef7f913051)
and then the inhands here:

![image](https://github.com/tgstation/tgstation/assets/110322848/03967e6e-6551-40d5-b2ec-7f27fabbc175)
also changes wellcheers mood event text, and the mood switch to be based
on sanity instead. apparently the mood test allowed for foolproof
traitor testing, which is not ideal. this hopefully fixes that.
## Why It's Good For The Game
the new martian drinks used the previous style of cans, which was
updated in #77424. this makes them consistent with that style.
everything else is minor things i missed or forgot to do in that PR.
also things that enable traitor testing are not great, even if they're
niche and require amputation to pull off.
## Changelog
:cl:
fix: wellcheers is now based on sanity rather than mood
image: resprites martian cans
image: adds inhands for martian cans and wellcheers
image: minor tweaks to other cans
spellcheck: updates wellcheers mood text
/:cl:
@keywordlabeler keywordlabeler bot added Fix Band-Aids work well Grammar and Formatting english Is A hard langue. Sprites Coder sprites are located somewhere within this PR Upstream Mirror [DEPRECEATED] /TG/ merged a pull request, and now its a mirror. Watch as it pings commit-access. labels Aug 21, 2023
@Jolly-66 Jolly-66 merged commit e9cfe4e into master Aug 27, 2023
25 checks passed
@Jolly-66 Jolly-66 deleted the upstream-merge-77757 branch August 27, 2023 16:07
TaleStationBot added a commit that referenced this pull request Aug 27, 2023
github-actions bot added a commit that referenced this pull request Aug 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Band-Aids work well Grammar and Formatting english Is A hard langue. Sprites Coder sprites are located somewhere within this PR Upstream Mirror [DEPRECEATED] /TG/ merged a pull request, and now its a mirror. Watch as it pings commit-access.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants