Ed 04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml

2024-06-17 14:20:38 +03:00

..

RehydratableSystem.cs

disable rehydration prediction (#27166)

2024-04-20 09:51:56 -04:00

ScoopableSolutionSystem.cs

scoopable ash and foam, solution transfer prediction (#25832)

2024-04-01 17:27:39 +11:00

SharedHypospraySystem.cs

Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595)

2024-03-31 16:20:48 +11:00

SharedInjectorSystem.cs

Solution normalizer (#227)

2024-06-08 18:46:09 +03:00

SharedSolutionContainerMixerSystem.cs

Decouple interactions from hands, cleanup old events, add new fears (#28393)

2024-05-31 13:26:19 -07:00

SharedSolutionContainerSystem.Capabilities.cs

You can bless more containers with a bible (#26526)

2024-04-20 16:16:55 +10:00

SharedSolutionContainerSystem.cs

Resolve all non-obsoleting warnings in content (#27934)

2024-05-11 20:13:58 -07:00

SharedSolutionContainerSystem.Relays.cs

Revert 'Revert 'Solution Entities'' (#23168)

2023-12-29 08:47:43 -04:00

SolutionSpikerSystem.cs

predict egg cracking + refactor (#25028)

2024-02-08 17:24:24 +11:00

SolutionTransferSystem.cs

make RefillableSolution optional for SolutionTransfer (#28830)

2024-06-14 22:42:40 -04:00