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 false walls icons using the wrong icon files #1039

Merged
merged 2 commits into from
Dec 9, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25504
Original PR: tgstation/tgstation#80175

About The Pull Request

Closes #80180

I was trying to merge tgstation/tgstation#79659 downstream and I couldn't figure out why the false wall icons were not showing up ingame--turns out there was a bug.

The icon files for false walls and the 'fake' (normal wall) version were just in each others' spots and needed to be swapped.

Why It's Good For The Game

No more invisible sprites

dreamseeker_4JbR2TXVK5

Changelog

🆑 vinylspiders
fix: false walls icons will now display again
/:cl:

…RE] (#25504)

* Fixes false walls icons using the wrong icon files

* Update false_walls.dm

---------

Co-authored-by: Bloop <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror Fix labels Dec 8, 2023
@Iajret Iajret merged commit 9f271d4 into master Dec 9, 2023
22 checks passed
@Iajret Iajret deleted the upstream-mirror-25504 branch December 9, 2023 15:49
AnywayFarus added a commit that referenced this pull request Dec 9, 2023
Iajret pushed a commit that referenced this pull request Feb 18, 2024
… a mob (#1039)

* Circuit multitools can now mark (visible) items worn/held by a mob (#81215)

## About The Pull Request
Title. This includes a small change to the get_visible_items proc, only
used by phobias until now, to include worn accessories. Not really worth
of a changelog entry itself.

## Why It's Good For The Game
This makes the process of scanning oft worn equipment a bit easier,
perhaps weavering the need of consent for some pranks and shenanigans.


![immagine](https://github.com/tgstation/tgstation/assets/42542238/a0d62488-2ee1-4051-9737-62c9247a6137)

I've added a bit of contrast to the icon for the "mob" option since
then.

## Changelog

:cl:
qol: Circuit multitools can now mark (visible) items worn/held by a mob.
/:cl:

* Circuit multitools can now mark (visible) items worn/held by a mob

---------

Co-authored-by: Ghom <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants