diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml index 2c2569dc16..9ac4e896e1 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -113,10 +113,10 @@ - id: HandheldHealthAnalyzer - id: MedicatedSuture - id: RegenerativeMesh + - id: BruteAutoInjector + - id: BurnAutoInjector - id: SyringeEphedrine - id: SyringeTranexamicAcid - - id: SyringeBicaridine - - id: SyringeDermaline - id: AntiPoisonMedipen - id: Bloodpack diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 1561e06491..114e1a65ed 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -131,6 +131,52 @@ - type: Tag tags: [] +- type: entity + name: brute auto-injector + parent: ChemicalMedipen + id: BruteAutoInjector + description: A rapid dose of bicaridine and tranexamic acid, intended for combat applications. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: bicpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: Bicaridine + Quantity: 15 + - ReagentId: TranexamicAcid + Quantity: 5 + - type: Tag + tags: [] + +- type: entity + name: burn auto-injector + parent: ChemicalMedipen + id: BurnAutoInjector + description: A rapid dose of dermaline and leporazine, intended for combat applications. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: dermpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: Dermaline + Quantity: 10 + - ReagentId: Leporazine + Quantity: 10 + - type: Tag + tags: [] + - type: entity name: space medipen parent: ChemicalMedipen diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen.png new file mode 100644 index 0000000000..599026eee8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen_empty.png new file mode 100644 index 0000000000..f959d0449a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen_empty.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen.png new file mode 100644 index 0000000000..9eb79b6d92 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen_empty.png new file mode 100644 index 0000000000..eca6df5b78 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen_empty.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json index 961f1a0e31..a421caa595 100644 --- a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json @@ -52,6 +52,18 @@ { "name": "salacid" }, + { + "name": "bicpen" + }, + { + "name": "bicpen_empty" + }, + { + "name": "dermpen" + }, + { + "name": "dermpen_empty" + }, { "name": "salacid_empty" },