Add vials (#22587)

* vial

* yea

* s

* fix something

* yaml

* fixer

* aaaaaaaaaaa

* update

* sprite changes

* a

* fix'd

Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl

@@ -6,6 +6,9 @@ ent-CrateMedicalSupplies = Medical supplies crate
 ent-CrateChemistrySupplies = Chemistry supplies crate
     .desc = Basic chemistry supplies.
 
+ent-CrateChemistryVials = Vial supply crate
+    .desc = Crate filled with a box of vials.
+
 ent-CrateMindShieldImplants = MindShield implant crate
     .desc = Crate filled with 3 MindShield implants.
 

Resources/Prototypes/Catalog/Cargo/cargo_medical.yml

@@ -18,6 +18,16 @@
   category: Medical
   group: market
 
+- type: cargoProduct
+  id: MedicalChemistryVials
+  icon:
+    sprite: Objects/Specific/Chemistry/vial.rsi
+    state: vial
+  product: CrateChemistryVials
+  cost: 1000
+  category: Medical
+  group: market
+
 - type: cargoProduct
   id: EmergencyBurnKit
   icon:

Resources/Prototypes/Catalog/Fills/Boxes/medical.yml

@@ -126,3 +126,21 @@
     whitelist:
       tags:
         - BodyBag
+
+- type: entity
+  name: vial box
+  parent: BoxCardboard
+  id: BoxVial
+  description: A box full of vials.
+  components:
+  - type: Storage
+    grid:
+    - 0,0,2,1
+  - type: StorageFill
+    contents:
+      - id: BaseChemistryEmptyVial
+        amount: 6
+  - type: Sprite
+    layers:
+      - state: box
+      - state: vials

Resources/Prototypes/Catalog/Fills/Crates/medical.yml

@@ -28,6 +28,14 @@
       - id: BoxBottle
         amount: 2
 
+- type: entity
+  id: CrateChemistryVials
+  parent: CrateMedical
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxVial
+
 - type: entity
   id: CrateMindShieldImplants
   parent: CrateMedical

Resources/Prototypes/Catalog/Fills/Lockers/medical.yml

@@ -116,6 +116,7 @@
         prob: 0.3
       - id: BoxPillCanister
       - id: BoxBottle
+      - id: BoxVial
       - id: ChemBag
       - id: ClothingHandsGlovesLatex
       - id: ClothingHeadsetMedical

Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml

@@ -0,0 +1,95 @@
+# TODO: Have a seperate lid state that can be popped on and off (not as a seperate item) that changes whether the vial can be spilled or not
+
+- type: entity
+  name: vial
+  parent: BaseItem
+  id: BaseChemistryEmptyVial
+  description: A small vial.
+  components:
+  - type: Tag
+    tags:
+    - Trash
+  - type: PhysicalComposition
+    materialComposition:
+      Glass: 25
+  - type: FitsInDispenser
+    solution: beaker
+  - type: SpaceGarbage
+  - type: Sprite
+    sprite: Objects/Specific/Chemistry/vial.rsi
+    layers:
+      - state: vial-1
+      - state: vial-1-1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: vial-1-
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        canMix: true
+  - type: RefillableSolution
+    solution: drink
+  - type: DrainableSolution
+    solution: drink
+  - type: ExaminableSolution
+    solution: drink
+  - type: DrawableSolution
+    solution: drink
+  - type: SolutionTransfer
+    maxTransferAmount: 30
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
+  - type: Item
+    size: Tiny
+    sprite: Objects/Specific/Chemistry/vial.rsi
+    shape:
+    - 0,0,0,0
+  - type: MeleeWeapon
+    soundNoDamage:
+      path: "/Audio/Effects/Fluids/splat.ogg"
+    damage:
+      types:
+        Blunt: 0
+  - type: TrashOnSolutionEmpty
+    solution: drink
+  - type: StaticPrice
+    price: 100
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 2
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+          params:
+            volume: -4
+      - !type:SpillBehavior { }
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 0
+            max: 1
+        transferForensics: true
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Spillable
+    solution: drink

Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json

@@ -1,15 +1,12 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi",
+  "copyright": "Drawn by Ubaser, taken inspiration by /tg/'s vials",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-    {
-      "name": "lid_vial"
-    },
     {
       "name": "vial"
     },
@@ -20,6 +17,27 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "vial-1"
+    },
+    {
+      "name": "vial-1-1"
+    },
+    {
+      "name": "vial-1-2"
+    },
+    {
+      "name": "vial-1-3"
+    },
+    {
+      "name": "vial-1-4"
+    },
+    {
+      "name": "vial-1-5"
+    },
+    {
+      "name": "vial-1-6"
     }
   ]
 }

Resources/Textures/Objects/Storage/boxes.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
@@ -202,6 +202,9 @@
         },
         {
             "name": "darts"
+        },
+        {
+            "name": "vials"
         }
     ]
 }

Resources/Textures/Objects/Storage/boxicons.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43",
+  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43, vials drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
@@ -78,6 +78,9 @@
     },
     {
       "name": "ziptie"
+    },
+    {
+      "name": "vials"
     }
   ]
 }