]> git.smokeofanarchy.ru Git - space-station-14.git/commit
You can bless more containers with a bible (#26526)
authorVerm <32827189+Vermidia@users.noreply.github.com>
Sat, 20 Apr 2024 06:16:55 +0000 (01:16 -0500)
committerGitHub <noreply@github.com>
Sat, 20 Apr 2024 06:16:55 +0000 (16:16 +1000)
commit089c9cb96786b21d2602ca0dd71fb643d116d3fa
treed4aae9da51ddd84cd14428de002e1e1d655013c0
parentc85bdef7f1394bb9115816aa02072c52bb510647
You can bless more containers with a bible (#26526)

* Made more things blessable

* Removed junk

* Remove whatever that was

* Make bowls blessable

* New mixablesolution component, converted everything to work with it

* Fix minor mishaps

* Fix extra spaces in bottle yml

* Fix last extra space, fix bottle havign the wrong solution name

* Remvoe unneeded event(I think), fix alcohol bottles not being mixable

* I missed cans
24 files changed:
Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs
Content.Shared/Chemistry/Components/MixableSolutionComponent.cs [new file with mode: 0644]
Content.Shared/Chemistry/Components/Solution.cs
Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs
Content.Shared/Chemistry/Reaction/ReactionMixerComponent.cs
Resources/Maps/Test/dev_map.yml
Resources/Maps/atlas.yml
Resources/Maps/cluster.yml
Resources/Maps/core.yml
Resources/Maps/fland.yml
Resources/Maps/saltern.yml
Resources/Prototypes/Entities/Effects/puddle.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
Resources/Prototypes/Entities/Objects/Tools/bucket.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml