From 0d2bf9d23c16a9f0258eeb92a03a0d8be9816cbe Mon Sep 17 00:00:00 2001
From: OctoRocket <88291550+OctoRocket@users.noreply.github.com>
Date: Thu, 27 Jul 2023 14:41:33 -0500
Subject: [PATCH] [Add] Adds HoS Flask (#18268)

* [Add] Adds HoS fask

* Added flask base
---
 .../Consumable/Drinks/drinks_flasks.yml       |  44 +++++++++++-------
 .../Consumable/Drinks/hosflask.rsi/icon.png   | Bin 0 -> 573 bytes
 .../Consumable/Drinks/hosflask.rsi/meta.json  |  14 ++++++
 3 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/hosflask.rsi/meta.json

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 0000000000000000000000000000000000000000..d4ae3526750a5d8db09f3a062d13085ddf2364f6
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$-AP12R9J=WmceQpF%X8ob)#q@ECu5ne6t%I_8EHY(TCD=LLVT<_60&NIi}BG
zN_%cf9%dmVK7>NS!4QODRoOc|Y%JCxY2}S?+5a?>M)UtjqZvVi1`S?1qPiQ?G!+1A
zEm~``EUOi(Rabzu7HcitZntiT=LrDlbUHZau-4X&v9*qKzuy<FH2_JH`1$)&5Un-V
zTE^pX@O1<`rfDiklAx5rIkzGJAkTB0b10>lPN%^+5#*GnskGZ|0OC0Qr*EF;0Kp=H
z1bm2<ywk5%=60fT>r8~3g|OQy$CE-ZBK%$mKXUiq_`ylIB;1K2Zv!jjfVclhSlnO%
z!%@%MGZBWP9y2M)KYr~4@ag9OfaC9bYzJmnuz=3%El+-QKH%)|nxpf9Uz-%d?cJP7
zA>MbR0-!wpn?*@<da)1SiK}=x-iUzPyE(&A&)@Nv_m`gN<lu_ai+#=xulfA#4JQXz
z!2*I`!Q1Wf6-<iN>@p%G_ep7_TuY*e%Xty>3f8KG56PEgPYDUZS~;-WihOV*vSL3b
zBm_YxkoETXRVl+tDdITB7~}0~DR$0bjDalMi~!(KascNXP?qSWt&|E48{Uknov_+|
zt8>e4_?!<)g9a}Te*uRH;L?yTGCTkP01jnXNoGw=04e|g00;m8000000Mb*F00000
LNkvXXu0mjfFgyRT

literal 0
HcmV?d00001

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"
+        }
+    ]
+}