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
This commit is contained in:
@@ -142,8 +142,11 @@
|
||||
mode: CardinalFlags
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
puddle: { maxVol: 1000 }
|
||||
puddle:
|
||||
maxVol: 1000
|
||||
- type: Puddle
|
||||
- type: MixableSolution
|
||||
solution: puddle
|
||||
- type: Appearance
|
||||
- type: ActiveEdgeSpreader
|
||||
- type: EdgeSpreader
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
solutions:
|
||||
drink:
|
||||
maxVol: 30
|
||||
- type: MixableSolution
|
||||
solution: drink
|
||||
- type: SolutionTransfer
|
||||
canChangeTransferAmount: true
|
||||
- type: Drink
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
- ReagentId: Cola
|
||||
Quantity: 30
|
||||
maxVol: 30
|
||||
- type: MixableSolution
|
||||
solution: drink
|
||||
- type: SolutionTransfer
|
||||
canChangeTransferAmount: true
|
||||
maxTransferAmount: 15
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
solutions:
|
||||
drink:
|
||||
maxVol: 20
|
||||
canMix: true
|
||||
- type: MixableSolution
|
||||
solution: drink
|
||||
- type: FitsInDispenser
|
||||
solution: drink
|
||||
- type: DrawableSolution
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
solutions:
|
||||
drink:
|
||||
maxVol: 100
|
||||
- type: MixableSolution
|
||||
solution: drink
|
||||
- type: Drink
|
||||
- type: Shakeable # Doesn't do anything, but I mean...
|
||||
- type: FitsInDispenser
|
||||
|
||||
@@ -25,6 +25,8 @@
|
||||
damage:
|
||||
types:
|
||||
Blunt: 0
|
||||
- type: MixableSolution
|
||||
solution: drink
|
||||
- type: Spillable
|
||||
solution: drink
|
||||
- type: FitsInDispenser
|
||||
@@ -102,6 +104,8 @@
|
||||
solutions:
|
||||
drink:
|
||||
maxVol: 50
|
||||
- type: MixableSolution
|
||||
solution: drink
|
||||
- type: SolutionTransfer
|
||||
canChangeTransferAmount: true
|
||||
maxTransferAmount: 5
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
- map: ["enum.SolutionContainerLayers.Fill"]
|
||||
state: fill-1
|
||||
visible: false
|
||||
- type: MixableSolution
|
||||
solution: food
|
||||
- type: DamageOnLand
|
||||
damage:
|
||||
types:
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
solutions:
|
||||
beaker:
|
||||
maxVol: 200
|
||||
canMix: true
|
||||
- type: Sprite
|
||||
sprite: Objects/Specific/Chemistry/jug.rsi
|
||||
layers:
|
||||
@@ -19,6 +18,8 @@
|
||||
- type: Item
|
||||
size: Normal
|
||||
sprite: Objects/Specific/Chemistry/jug.rsi
|
||||
- type: MixableSolution
|
||||
solution: beaker
|
||||
- type: RefillableSolution
|
||||
solution: beaker
|
||||
- type: DrainableSolution
|
||||
|
||||
@@ -29,7 +29,8 @@
|
||||
solutions:
|
||||
drink: # This solution name and target volume is hard-coded in ChemMasterComponent
|
||||
maxVol: 30
|
||||
canMix: true
|
||||
- type: MixableSolution
|
||||
solution: drink
|
||||
- type: RefillableSolution
|
||||
solution: drink
|
||||
- type: DrainableSolution
|
||||
|
||||
@@ -35,7 +35,8 @@
|
||||
solutions:
|
||||
beaker:
|
||||
maxVol: 30
|
||||
canMix: true
|
||||
- type: MixableSolution
|
||||
solution: beaker
|
||||
- type: RefillableSolution
|
||||
solution: beaker
|
||||
- type: DrainableSolution
|
||||
|
||||
@@ -25,7 +25,8 @@
|
||||
solutions:
|
||||
beaker:
|
||||
maxVol: 50
|
||||
canMix: true
|
||||
- type: MixableSolution
|
||||
solution: beaker
|
||||
- type: FitsInDispenser
|
||||
solution: beaker
|
||||
- type: RefillableSolution
|
||||
@@ -117,7 +118,8 @@
|
||||
solutions:
|
||||
beaker:
|
||||
maxVol: 50
|
||||
canMix: true
|
||||
- type: MixableSolution
|
||||
solution: beaker
|
||||
- type: FitsInDispenser
|
||||
solution: beaker
|
||||
- type: RefillableSolution
|
||||
@@ -200,7 +202,6 @@
|
||||
solutions:
|
||||
beaker:
|
||||
maxVol: 100
|
||||
canMix: true
|
||||
- type: Appearance
|
||||
- type: SolutionContainerVisuals
|
||||
maxFillLevels: 6
|
||||
@@ -244,7 +245,6 @@
|
||||
solutions:
|
||||
beaker:
|
||||
maxVol: 1000
|
||||
canMix: true
|
||||
|
||||
- type: entity
|
||||
name: dropper
|
||||
|
||||
@@ -26,6 +26,8 @@
|
||||
solutions:
|
||||
bucket:
|
||||
maxVol: 250
|
||||
- type: MixableSolution
|
||||
solution: bucket
|
||||
- type: SolutionTransfer
|
||||
transferAmount: 100
|
||||
maxTransferAmount: 100
|
||||
|
||||
@@ -457,7 +457,8 @@
|
||||
solutions:
|
||||
tank:
|
||||
maxVol: 400
|
||||
canMix: true
|
||||
- type: MixableSolution
|
||||
solution: tank
|
||||
- type: DrainableSolution
|
||||
solution: tank
|
||||
- type: ExaminableSolution
|
||||
|
||||
Reference in New Issue
Block a user