diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index ae2daac052..c3d51b9d7e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -1,23 +1,28 @@ - type: entity parent: DrinkBase + id: FlaskBase + abstract: true + components: + - type: Drink + - type: PhysicalComposition + materialComposition: + Steel: 300 + +- type: entity + parent: FlaskBase id: DrinkShinyFlask name: shiny flask description: A shiny metal flask. It appears to have a Greek symbol inscribed on it. components: - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/shinyflask.rsi - - type: PhysicalComposition - materialComposition: - Steel: 50 - type: entity - parent: DrinkBase + parent: FlaskBase id: DrinkMREFlask name: MRE flask description: An old military flask, filled with the finest contents for soldiers components: - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/mreflask.rsi - type: SolutionContainerManager @@ -30,61 +35,64 @@ solution: drink - type: entity - parent: DrinkBase + parent: FlaskBase id: DrinkDetFlask name: inspector's flask description: A metal flask with a leather band and golden badge belonging to the inspector. components: - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/detflask.rsi - type: entity - parent: DrinkBase + parent: FlaskBase + id: DrinkHosFlask + name: hos's flask + description: A metal flask, fit for a hard working HoS. + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/hosflask.rsi + +- type: entity + parent: FlaskBase id: DrinkFlask name: captain's flask description: A metal flask belonging to the captain components: - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/flask.rsi - type: entity - parent: DrinkBase + parent: FlaskBase id: DrinkFlaskBar name: bar flask description: A metal flask often given out by the bartender on loan. Don't forget to return it! components: - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/barflask.rsi - type: entity - parent: DrinkBase + parent: FlaskBase id: DrinkFlaskOld name: flask description: '' components: - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/flask_old.rsi - type: entity - parent: DrinkBase + parent: FlaskBase id: DrinkLithiumFlask name: lithium flask description: A flask with a Lithium Atom symbol on it. components: - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/lithiumflask.rsi - type: entity - parent: DrinkBase + parent: FlaskBase id: DrinkVacuumFlask name: vacuum flask description: Keeping your drinks at the perfect temperature since 1892. components: - - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/vacuumflask.rsi diff --git a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon.png new file mode 100644 index 0000000000..d4ae352675 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/meta.json new file mode 100644 index 0000000000..fbbb5eadce --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MrGreen06#0618 (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +}