diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index bb5be215d1d..2b7d249e855 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -7,8 +7,9 @@ DrinkVacuumFlask: 15 DrinkFlaskBar: 15 DrinkShaker: 15 - DrinkKegSteel: 5 # Frontier: kegs - DrinkKegWood: 5 # Frontier: kegs + DrinkKegSteel: 4 # Frontier: kegs + DrinkKegWood: 4 # Frontier: kegs + DrinkKegPlastic: 4 # Frontier: kegs DrinkAbsintheBottleFull: 4 DrinkAleBottleFull: 15 DrinkBeerBottleFull: 15 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml index 0a961fecb66..36743a984fc 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml @@ -1,8 +1,8 @@ - type: entity parent: BaseItem - id: DrinkKegSteel + id: DrinkKegBase name: keg - suffix: Steel + abstract: true description: I don't have a drinking problem - the keg solved it. components: - type: Sprite @@ -22,6 +22,9 @@ drink: maxVol: 600 - type: Drink +# - type: Openable +# sound: +# collection: bottleOpenSounds - type: DrawableSolution solution: drink - type: RefillableSolution @@ -39,9 +42,6 @@ interfaces: - key: enum.TransferAmountUiKey.Key type: TransferAmountBoundUserInterface - - type: PhysicalComposition - materialComposition: - Steel: 50 - type: ItemSlots slots: label_slot: @@ -60,6 +60,20 @@ ents: [] label_slot: !type:ContainerSlot {} - type: Appearance + +- type: entity + parent: DrinkKegBase + id: DrinkKegSteel + suffix: Steel + components: + - type: Sprite + sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi + state: icon + - type: Clothing + sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi + - type: PhysicalComposition + materialComposition: + Steel: 150 - type: ItemMapper mapLayers: label: @@ -67,11 +81,10 @@ tags: - Document sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi - + - type: entity - parent: DrinkKegSteel + parent: DrinkKegBase id: DrinkKegWood - name: keg suffix: Wood components: - type: Sprite @@ -81,8 +94,35 @@ sprite: _NF/Objects/Consumable/Drinks/keg_wood.rsi - type: PhysicalComposition materialComposition: - Wood: 50 - - type: Appearance + Wood: 150 + - type: ItemMapper + mapLayers: + label: + whitelist: + tags: + - Document + sprite: _NF/Objects/Consumable/Drinks/keg_wood.rsi + +- type: entity + parent: DrinkKegBase + id: DrinkKegPlastic + suffix: Plastic + components: + - type: Sprite + sprite: _NF/Objects/Consumable/Drinks/keg_plastic.rsi + layers: + - state: keg-empty + - state: keg-alpha-6 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Clothing + sprite: _NF/Objects/Consumable/Drinks/keg_plastic.rsi + - type: PhysicalComposition + materialComposition: + Plastic: 150 + - type: SolutionContainerVisuals + maxFillLevels: 6 + fillBaseName: keg-alpha- - type: ItemMapper mapLayers: label: diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..c069d638b26 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/icon.png new file mode 100644 index 00000000000..36523eacca8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/inhand-left.png new file mode 100644 index 00000000000..5ae97b89515 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/inhand-right.png new file mode 100644 index 00000000000..8abca2b678a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-1.png new file mode 100644 index 00000000000..0f190b6e601 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-2.png new file mode 100644 index 00000000000..76b94da399d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-3.png new file mode 100644 index 00000000000..7cc2604365a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-4.png new file mode 100644 index 00000000000..9a0c9ab9efd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-4.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-5.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-5.png new file mode 100644 index 00000000000..d397b020b67 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-5.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-6.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-6.png new file mode 100644 index 00000000000..5b24ce1ecdc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-alpha-6.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-empty.png new file mode 100644 index 00000000000..03125eef97d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/keg-empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/label.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/label.png new file mode 100644 index 00000000000..11758f597d0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/label.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/meta.json new file mode 100644 index 00000000000..eeb3b5583a6 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_plastic.rsi/meta.json @@ -0,0 +1,50 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation, resprited by erhardsteinhauer (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "keg-empty" + }, + { + "name": "keg-alpha-1" + }, + { + "name": "keg-alpha-2" + }, + { + "name": "keg-alpha-3" + }, + { + "name": "keg-alpha-4" + }, + { + "name": "keg-alpha-5" + }, + { + "name": "keg-alpha-6" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "label" + } + ] +}