tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cans that cant be spilled (#10529)

Browse Source
This commit is contained in:
corentt
2022-08-14 07:19:45 +02:00
committed by GitHub
parent 0c2d1b79c0
commit 7deb22e163
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Fluids/EntitySystems/SpillableSystem.cs
View File

@@ -95,6 +95,9 @@ public sealed class SpillableSystem : EntitySystem
{ {
if (!_solutionContainerSystem.TryGetSolution(uid, component.SolutionName, out var solution)) return; if (!_solutionContainerSystem.TryGetSolution(uid, component.SolutionName, out var solution)) return;
if (TryComp<DrinkComponent>(uid, out var drink) && (!drink.Opened))
return;
if (args.User != null) if (args.User != null)
{ {
_adminLogger.Add(LogType.Landed, _adminLogger.Add(LogType.Landed,

2
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
View File

@@ -34,6 +34,8 @@
- type: DrinkCanVisualizer - type: DrinkCanVisualizer
stateClosed: icon stateClosed: icon
stateOpen: icon_open stateOpen: icon_open
- type: Spillable
solution: drink
- type: ItemCooldown - type: ItemCooldown
- type: Recyclable - type: Recyclable
- type: SpaceGarbage - type: SpaceGarbage

2
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
View File

@@ -18,6 +18,8 @@
solution: drink solution: drink
- type: SolutionTransfer - type: SolutionTransfer
canChangeTransferAmount: true canChangeTransferAmount: true
- type: Spillable
solution: drink
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/shaker.rsi sprite: Objects/Consumable/Drinks/shaker.rsi
state: icon state: icon