]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 11f3087) | patch
Spray bottles with visible reagent contents (#42155)
authorchaisftw <30545471+chaisftw@users.noreply.github.com>
Mon, 12 Jan 2026 22:01:35 +0000 (08:01 +1000)
committerGitHub <noreply@github.com>
Mon, 12 Jan 2026 22:01:35 +0000 (22:01 +0000)
commit360bfd6e1c9cdec8b4eeccdb4b4b380072448252
tree419e6b8995d54d0cbed63cdcb2eb1d6a7ddefa91tree | snapshot
parent11f308729d3f73bd6421207d86f6ea9d603df8c5commit | diff
Spray bottles with visible reagent contents (#42155)

* Spray bottles with visible reagent contents

* Fixed cargo catalog to correctly reference the new spray bottle rsi

* Fixed indentation on rsi meta files

* Updated copyright in spray_bottle.rsi meta

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml

Co-authored-by: āda <ss.adasts@gmail.com>
* Updated to follow yml convention, modified to inherit from DrinkBase and renamed fill textures

* Fixed solution names

* Updated solution name in BorgMegaSprayBottle

* de-hardcode solution name

* less breaking

---------

Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
35 files changed:
Content.Server/Fluids/EntitySystems/SpraySystem.cs diff | blob | history
Content.Shared/Fluids/Components/SprayComponent.cs diff | blob | history
Resources/Prototypes/Catalog/Cargo/cargo_service.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml diff | blob | history
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/cleaner.png [deleted file] blob | history
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/cleaner_large.png [deleted file] blob | history
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-left.png [deleted file] blob | history
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-right.png [deleted file] blob | history
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json diff | blob | history
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-1.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-2.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-3.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-4.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner-fill-5.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-1.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-2.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-3.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-4.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-5.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-6.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large-fill-7.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/cleaner_large.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-1.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-2.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-3.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left-fill-4.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-1.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-2.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-3.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right-fill-4.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Janitorial/spray_bottle.rsi/meta.json [new file with mode: 0644] blob
Форк Space Station 14 с переводами на русский