From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sat, 16 Dec 2023 14:29:53 +0000 (+1100) Subject: Add vials (#22587) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=db74ca0e2c81ba4979dc5df5fa38f003759c2345;p=space-station-14.git Add vials (#22587) * vial * yea * s * fix something * yaml * fixer * aaaaaaaaaaa * update * sprite changes * a * fix'd --- diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl index 840965cf1d..303ede62e1 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl +++ b/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. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml index 16498a5a75..01a7192b35 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml +++ b/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: diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml index 8d62fbb515..aba61ce332 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml index a487138afd..f478713c1a 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index 352ff69c50..466171f6f8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml new file mode 100644 index 0000000000..35ac6bcad2 --- /dev/null +++ b/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 diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left.png index 71a75ca66e..4a82b48c90 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right.png index c9c7de38f4..0f835ece48 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/lid_vial.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/lid_vial.png deleted file mode 100644 index b1ad7e1a7c..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/lid_vial.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json index 7b251e87ff..800cb2b522 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json +++ b/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" } ] } diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-1.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-1.png new file mode 100644 index 0000000000..84c961944a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-2.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-2.png new file mode 100644 index 0000000000..2e477363e8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-3.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-3.png new file mode 100644 index 0000000000..b11c4a5266 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-4.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-4.png new file mode 100644 index 0000000000..c87cbf9032 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-5.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-5.png new file mode 100644 index 0000000000..bedbf5b855 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-6.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-6.png new file mode 100644 index 0000000000..ba57cf0f06 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-6.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1.png new file mode 100644 index 0000000000..983e6b6703 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial.png index 27b92b3209..983e6b6703 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial.png and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 07c91cafb5..47c69de027 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/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" } ] } diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/vials.png b/Resources/Textures/Objects/Storage/boxes.rsi/vials.png new file mode 100644 index 0000000000..daf97dc2e4 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/vials.png differ diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json index 8345f46658..3931b4f610 100644 --- a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json +++ b/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" } ] } diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/vials.png b/Resources/Textures/Objects/Storage/boxicons.rsi/vials.png new file mode 100644 index 0000000000..07a428bbb4 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxicons.rsi/vials.png differ