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] Dehardcodes microwave cleaning, allows spray cleaner to work on dense objects such as windows #366

Merged
merged 2 commits into from
Oct 31, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24684
Original PR: tgstation/tgstation#79354

About The Pull Request

  • Dehardcodes microwave cleaning

    • Instead of hard istyping for a rag, soap, or space cleaner, we just use wash.
  • Gets rid of a redundant signal

    • COMSIG_ATOM_WASHED: not only was it misleading (only sent to items), but it was pointless because COMSIG_COMPONENT_CLEAN_ACT is the same signal.
  • Improves microwave attackby code, splitting tool stuff into tool-procs

  • Allows spray cleaner to work on dense objects such as windows

    • Clicking on a dense object or mob adjacent to you with spray cleaner will spawn the puff cloud on the target, rather than on your own position.
    • This will skip the moveloop and just clean everything on the target turf alone.
    • This means you can spray down a bloody window with a spray bottle, as janitor gods intended.
    • It also means you can fill the spray with other stuff to spray onto dense objects directly, which might be worth noting. Especially for stuff like Napalm.

Fixes #79261

Why It's Good For The Game

Opens up the sandbox to allow more objects to clean microwaves + better code.

Changelog

🆑 Melbert
qol: Clicking on an adjacent dense object (or mob) with Spray Cleaner will now spritz it rather than doing nothing. This means you can use Spray Cleaner to clean bloodied windows, as the janitor gods intended. It also means you can fill a spray bottle with Napalm, I guess.
refactor: Any cleaning object can now clean a microwave.
/:cl:

… on dense objects such as windows [MDB IGNORE] (#24684)

* Dehardcodes microwave cleaning, allows spray cleaner to work on dense objects such as windows (#79354)

- Dehardcodes microwave cleaning
- Instead of hard istyping for a rag, soap, or space cleaner, we just
use `wash`.

- Gets rid of a redundant signal
- `COMSIG_ATOM_WASHED`: not only was it misleading (only sent to items),
but it was pointless because `COMSIG_COMPONENT_CLEAN_ACT` is the same
signal.

- Improves microwave attackby code, splitting tool stuff into tool-procs

- Allows spray cleaner to work on dense objects such as windows
- Clicking on a dense object or mob adjacent to you with spray cleaner
will spawn the puff cloud on the target, rather than on your own
position.
- This will skip the moveloop and just clean everything on the target
turf alone.
- This means you can spray down a bloody window with a spray bottle, as
janitor gods intended.
- It also means you can fill the spray with other stuff to spray onto
dense objects directly, which might be worth noting. Especially for
stuff like Napalm.

Fixes #79261

Opens up the sandbox to allow more objects to clean microwaves + better
code.

:cl: Melbert
qol: Clicking on an adjacent dense object (or mob) with Spray Cleaner
will now spritz it rather than doing nothing. This means you can use
Spray Cleaner to clean bloodied windows, as the janitor gods intended.
It also means you can fill a spray bottle with Napalm, I guess.
refactor: Any cleaning object can now clean a microwave.
/:cl:

* Dehardcodes microwave cleaning, allows spray cleaner to work on dense objects such as windows

---------

Co-authored-by: MrMelbert <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror Quality of Life Refactoring labels Oct 31, 2023
@Iajret Iajret merged commit 12a39a9 into master Oct 31, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-24684 branch October 31, 2023 19:35
AnywayFarus added a commit that referenced this pull request Oct 31, 2023
Iajret pushed a commit that referenced this pull request Jan 8, 2024
… li ke 600 times a life tick or something (#366)

* Cache heretic delusion icon so it doesn't call `getFlatIcon` li ke 600 times a life tick or something (#80842)

Heretic's weeping painting causes everyone who sees it to hallucinate
everyone else as heretics. So it caused this hallucination every 5 life
ticks.

Which means every 5 life ticks it would call GFI for every mob in view.
And like everyone on the station would get this effect.

So everyone on the station is now hallucinating every mob in view is a
heretic and it's calling GFI every time.

So yeah we should probably cache this.

* Cache heretic delusion icon so it doesn't call `getFlatIcon` li ke 600 times a life tick or something

---------

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

Successfully merging this pull request may close these issues.

3 participants