]> git.smokeofanarchy.ru Git - space-station-14.git/commit
[#20285 fix] Carp Plush and Rehydratables can now be put into mop bucket (#33079)
authorSlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Thu, 31 Oct 2024 18:46:19 +0000 (19:46 +0100)
committerGitHub <noreply@github.com>
Thu, 31 Oct 2024 18:46:19 +0000 (19:46 +0100)
commit4626904fa8e5915a4faddd74a4d917d8442bfb99
tree3840716e0ae3bece40dfa7983e34bcb674e5e043
parent1c2a96590bd12608937395329c7370cdfca00537
[#20285 fix] Carp Plush and Rehydratables can now be put into mop bucket (#33079)

* Make shark plush janitor-bucketable

* fix bucketed grey shark texture

* Make sprites less shiny and adapt copyright notice

* Made shark way way less shiny

* Allow carp plush and rehydratables in mop bucket.

* Remove old mop bucket shark sprites

* Fix post-merge bugs

* Fix errors

* Move ReactiveContainer stuff to shared

That should mean it is now predicted.

* Custom eject verb for the mop bucket

* Fixes OnSolutionChange, removes pop-up as there already is one.

* .ftl is not necessary as the custom pop-up was removed

* Review fixes

* Update Content.Shared/Chemistry/Components/ReactiveContainerComponent.cs

* Update Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs

---------

Co-authored-by: Psychpsyo <psychpsyo@gmail.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
12 files changed:
Content.Shared/Chemistry/Components/ReactiveContainerComponent.cs [new file with mode: 0644]
Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs [new file with mode: 0644]
Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
Resources/Prototypes/tags.yml
Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_carpplush.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_blue.png [moved from Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_blue.png with 100% similarity]
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_grey.png [moved from Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_grey.png with 100% similarity]
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_pink.png [moved from Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_pink.png with 100% similarity]