Fix barrels (#1600)
* Update bucket and barrel solution components Replaces SolutionTransfer with Injector for buckets, adjusting transfer parameters and solution handling. Enables RefillableSolution for barrels, allowing them to be refilled. These changes improve consistency and functionality for liquid transfer between containers. * 1306 * fix lobby audio
This commit is contained in:
@@ -65,9 +65,6 @@ public sealed partial class CP14DemiplaneTravelingSystem : EntitySystem
|
||||
if (!_mind.TryGetMind(ent, out var mindId, out var mind))
|
||||
continue;
|
||||
|
||||
if (!_interaction.InRangeUnobstructed(ent, uid))
|
||||
continue;
|
||||
|
||||
teleportedEnts.Add(ent);
|
||||
}
|
||||
|
||||
|
||||
@@ -61,6 +61,9 @@ flavor_text = true
|
||||
[tips]
|
||||
dataset = "CP14Tips"
|
||||
|
||||
[audio]
|
||||
lobby_music_collection = "CP14LobbyMusic"
|
||||
|
||||
[ooc]
|
||||
show_ooc_patron_color = false
|
||||
enable_during_round = true
|
||||
|
||||
@@ -40,11 +40,15 @@
|
||||
solutions:
|
||||
bucket:
|
||||
maxVol: 50
|
||||
- type: SolutionTransfer
|
||||
transferAmount: 100
|
||||
maxTransferAmount: 100
|
||||
minTransferAmount: 10
|
||||
canChangeTransferAmount: true
|
||||
- type: Injector
|
||||
solutionName: bucket
|
||||
injectOnly: false
|
||||
ignoreMobs: true
|
||||
ignoreClosed: false
|
||||
minTransferAmount: 1
|
||||
maxTransferAmount: 50
|
||||
transferAmount: 50
|
||||
toggleState: 1 # draw
|
||||
- type: UserInterface
|
||||
interfaces:
|
||||
enum.TransferAmountUiKey.Key:
|
||||
@@ -61,7 +65,7 @@
|
||||
solution: bucket
|
||||
- type: CP14WeatherRefillable
|
||||
solution: bucket
|
||||
- type: DrawableSolution
|
||||
- type: MixableSolution
|
||||
solution: bucket
|
||||
- type: RefillableSolution
|
||||
solution: bucket
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
solution: barrel
|
||||
- type: MixableSolution
|
||||
solution: barrel
|
||||
#- type: RefillableSolution
|
||||
# solution: barrel
|
||||
- type: RefillableSolution
|
||||
solution: barrel
|
||||
- type: DrawableSolution
|
||||
solution: barrel
|
||||
- type: Drink
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
- type: soundCollection
|
||||
id: CP14LobbyMusic
|
||||
files:
|
||||
- /Audio/Lobby/absconditus.ogg
|
||||
- /Audio/_CP14/Lobby/crystal.ogg
|
||||
- /Audio/_CP14/Lobby/eldermourne.ogg
|
||||
- /Audio/_CP14/Lobby/arcane_winds.ogg
|
||||
|
||||
Reference in New Issue
Block a user