Skip to content

Commit

Permalink
Transparent Plastic Kegs (#813)
Browse files Browse the repository at this point in the history
* transparent plastic kegs

* bottle opening mechanic for kegs was sorta annoying

* quick fix for sprite

* yml clean

---------

Co-authored-by: Dvir <[email protected]>
  • Loading branch information
ErhardSteinhauer and dvir001 authored Jan 2, 2024
1 parent e30267b commit b073993
Show file tree
Hide file tree
Showing 15 changed files with 103 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -22,6 +22,9 @@
drink:
maxVol: 600
- type: Drink
# - type: Openable
# sound:
# collection: bottleOpenSounds
- type: DrawableSolution
solution: drink
- type: RefillableSolution
Expand All @@ -39,9 +42,6 @@
interfaces:
- key: enum.TransferAmountUiKey.Key
type: TransferAmountBoundUserInterface
- type: PhysicalComposition
materialComposition:
Steel: 50
- type: ItemSlots
slots:
label_slot:
Expand All @@ -60,18 +60,31 @@
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:
whitelist:
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
Expand All @@ -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:
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
]
}

0 comments on commit b073993

Please sign in to comment.