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 coffin cookie being invisible #1041

Merged
merged 1 commit into from
Dec 9, 2023
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25510
Original PR: tgstation/tgstation#80179

About The Pull Request

  • Fixes #80161

It's a seasonal bug i.e. occurs only during the holiday seasons. Yeah so its caused by this code
https://github.com/tgstation/tgstation/blob/2a359b817874c4bb52be814551780af304cc9e07/code/game/objects/items/food/pastries.dm#L191-L194

So like it changes the icon state based on the season. Unfortunately none of the icon states it picks are located in the icon file 'icons/obj/holiday/halloween_items.dmi i.e. it causes an invalid icon state causing it to go invisible(not spooky just a bug).

We now make sure this cookie type does not change based on the season. It will stay unique throughout the year

Changelog

🆑 SyncIt21
fix: coffin cookies are no longer invisible during the holiday seasons
/:cl:

* Fixes coffin cookie being invisible (#80179)

## About The Pull Request
- Fixes #80161

It's a seasonal bug i.e. occurs only during the holiday seasons. Yeah so
its caused by this code

https://github.com/tgstation/tgstation/blob/2a359b817874c4bb52be814551780af304cc9e07/code/game/objects/items/food/pastries.dm#L191-L194

So like it changes the icon state based on the season. Unfortunately
none of the icon states it picks are located in the icon file
`'icons/obj/holiday/halloween_items.dmi` i.e. it causes an invalid icon
state causing it to go invisible(not spooky just a bug).

We now make sure this cookie type does not change based on the season.
It will stay unique throughout the year

## Changelog
:cl:
fix: coffin cookies are no longer invisible during the holiday seasons
/:cl:

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>

* Fixes coffin cookie being invisible

---------

Co-authored-by: SyncIt21 <[email protected]>
Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>
@Iajret Iajret merged commit a711ecf into master Dec 9, 2023
23 checks passed
AnywayFarus added a commit that referenced this pull request Dec 9, 2023
@Iajret Iajret deleted the upstream-mirror-25510 branch December 12, 2023 23:21
Iajret pushed a commit that referenced this pull request Feb 18, 2024
* Reverts map vote to single method (#81539)

## About The Pull Request

Reverts map vote to single selection rather than multi selection

## Why It's Good For The Game

Now that map vote is weighted, multi selection serves no purpose anymore
other than allowing people to gain "additional weight" in the vote,
which is unfair. It's weighted, everyone should have 1 vote.


![image](https://github.com/tgstation/tgstation/assets/51863163/c1831505-f638-4036-8d53-d3524f4a5d4a)

## Changelog

:cl: Melbert
del: You can only vote for 1 map at a time again
/:cl:

* Reverts map vote to single method

* Update override

---------

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