Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Puddle drinking (#16373)

Browse Source
This commit is contained in:
Kara
2023-05-12 18:32:57 -07:00
committed by GitHub
parent 2112cc30ad
commit 9059185efe
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/Nutrition/Components/DrinkComponent.cs
View File

@@ -21,6 +21,7 @@ namespace Content.Server.Nutrition.Components
internal bool DefaultToOpened; internal bool DefaultToOpened;
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("transferAmount")]
public FixedPoint2 TransferAmount { get; [UsedImplicitly] private set; } = FixedPoint2.New(5); public FixedPoint2 TransferAmount { get; [UsedImplicitly] private set; } = FixedPoint2.New(5);
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]

4
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
View File

@@ -155,7 +155,7 @@ namespace Content.Server.Nutrition.EntitySystems
if (component.Pressurized && if (component.Pressurized &&
!component.Opened && !component.Opened &&
_random.Prob(0.25f) && _random.Prob(0.25f) &&
_solutionContainerSystem.TryGetDrainableSolution(uid, out var interactions)) _solutionContainerSystem.TryGetSolution(uid, component.SolutionName, out var interactions))
{ {
component.Opened = true; component.Opened = true;
UpdateAppearance(component); UpdateAppearance(component);
@@ -229,7 +229,7 @@ namespace Content.Server.Nutrition.EntitySystems
return true; return true;
} }
if (!_solutionContainerSystem.TryGetDrainableSolution(item, out var drinkSolution) || if (!_solutionContainerSystem.TryGetSolution(item, drink.SolutionName, out var drinkSolution) ||
drinkSolution.Volume <= 0) drinkSolution.Volume <= 0)
{ {
_popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-is-empty", _popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-is-empty",

5
Resources/Prototypes/Entities/Effects/puddle.yml
View File

@@ -116,3 +116,8 @@
puddle: puddle:
!type:SpreaderNode !type:SpreaderNode
nodeGroupID: Spreader nodeGroupID: Spreader
- type: Drink
isOpen: true
delay: 3
transferAmount: 1
solution: puddle