Various bar-related fixes (#19126)

* Various bar-related fixes

* smartfwidge

* gumbo
This commit is contained in:
Kara
2023-08-14 14:03:20 -07:00
committed by GitHub
parent f6f0351487
commit ec02907446
9 changed files with 7 additions and 24 deletions

View File

@@ -1,8 +1,8 @@
<DefaultWindow xmlns="https://spacestation14.io" <DefaultWindow xmlns="https://spacestation14.io"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client" xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
Title="{Loc 'reagent-dispenser-bound-user-interface-title'}" Title="{Loc 'reagent-dispenser-bound-user-interface-title'}"
SetSize="590 450" SetSize="620 450"
MinSize="590 450"> MinSize="620 450">
<BoxContainer Orientation="Vertical"> <BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal"> <BoxContainer Orientation="Horizontal">
<Label Text="{Loc 'reagent-dispenser-window-amount-to-dispense-label'}"/> <Label Text="{Loc 'reagent-dispenser-window-amount-to-dispense-label'}"/>

View File

@@ -27,12 +27,6 @@
- type: reagentDispenserInventory - type: reagentDispenserInventory
id: BoozeDispenserInventory id: BoozeDispenserInventory
inventory: inventory:
- LemonLime
- Sugar
- JuiceOrange
- JuiceLime
- SodaWater
- TonicWater
- Beer - Beer
- CoffeeLiqueur - CoffeeLiqueur
- Whiskey - Whiskey

View File

@@ -100,16 +100,12 @@
- type: VendingMachine - type: VendingMachine
pack: CondimentInventory pack: CondimentInventory
offState: off offState: off
normalState: normal-unshaded
- type: Sprite - type: Sprite
sprite: Structures/Machines/VendingMachines/condiments.rsi sprite: Structures/Machines/VendingMachines/condiments.rsi
drawdepth: SmallObjects drawdepth: SmallObjects
layers: layers:
- state: "off" - state: "off"
map: ["enum.VendingMachineVisualLayers.Base"] map: ["enum.VendingMachineVisualLayers.Base"]
- state: "off"
map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
shader: unshaded
- type: Advertise - type: Advertise
pack: CondimentVendAds pack: CondimentVendAds
- type: Speech - type: Speech
@@ -877,11 +873,10 @@
components: components:
- type: VendingMachine - type: VendingMachine
pack: SmartFridgeInventory pack: SmartFridgeInventory
offState: off-real offState: off
brokenState: broken brokenState: broken
normalState: off normalState: normal-unshaded
denyState: deny-unshaded denyState: deny-unshaded
screenState: normal-unshaded
loopDeny: false loopDeny: false
- type: Advertise - type: Advertise
pack: SmartFridgeAds pack: SmartFridgeAds
@@ -889,14 +884,11 @@
- type: Sprite - type: Sprite
sprite: Structures/Machines/VendingMachines/smartfridge.rsi sprite: Structures/Machines/VendingMachines/smartfridge.rsi
layers: layers:
- state: off-real - state: off
map: ["enum.VendingMachineVisualLayers.Base"] map: ["enum.VendingMachineVisualLayers.Base"]
- state: off-real - state: off
map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
shader: unshaded shader: unshaded
- state: normal-unshaded
map: ["enum.VendingMachineVisualLayers.Screen"]
shader: unshaded
- state: panel - state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"] map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: PointLight - type: PointLight

View File

@@ -7,9 +7,6 @@
"y": 32 "y": 32
}, },
"states": [ "states": [
{
"name": "normal-unshaded"
},
{ {
"name": "off" "name": "off"
}, },

Binary file not shown.

Before

Width:  |  Height:  |  Size: 817 B

View File

@@ -53,7 +53,7 @@
] ]
}, },
{ {
"name": "off-real" "name": "on"
}, },
{ {
"name": "off" "name": "off"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB