From c93433839f5edf3d42456941ed628701f9e82875 Mon Sep 17 00:00:00 2001 From: Alekshhh <44923899+Alekshhh@users.noreply.github.com> Date: Wed, 20 Sep 2023 10:50:19 +0300 Subject: [PATCH] Medkit Fill Change (#19362) Co-authored-by: metalgearsloth --- .../Catalog/Fills/Items/firstaidkits.yml | 34 +++++---- .../Objects/Specific/Medical/healing.yml | 68 ++++++++++++++++++ .../Objects/Specific/Medical/hypospray.yml | 30 +++++++- .../Specific/Chemistry/pills.rsi/meta.json | 3 + .../Specific/Chemistry/pills.rsi/pill21.png | Bin 0 -> 210 bytes .../Specific/Medical/medipen.rsi/arithpen.png | Bin 0 -> 252 bytes .../Medical/medipen.rsi/arithpen_empty.png | Bin 0 -> 282 bytes .../Specific/Medical/medipen.rsi/meta.json | 6 ++ 8 files changed, 126 insertions(+), 15 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill21.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen_empty.png diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml index 8d0dd2041f..b3cdae752d 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -23,9 +23,13 @@ components: - type: StorageFill contents: - - id: SyringeInaprovaline + - id: RegenerativeMesh + amount: 2 - id: Ointment - amount: 4 + amount: 2 + - id: SyringeSigynate + - id: PillKelotane + amount: 5 - id: PillDermaline amount: 5 @@ -54,10 +58,12 @@ - type: StorageFill contents: - id: SyringeIpecac - amount: 2 - - id: AntiPoisonMedipen + - id: SyringeEthylredoxrazine + - id: PoisonAutoInjector - id: PillDylovene - amount: 7 + amount: 5 + - id: PillCharcoal + amount: 3 - type: entity id: MedkitOxygenFilled @@ -80,12 +86,14 @@ components: - type: StorageFill contents: - - id: Ointment - amount: 3 + - id: GeigerCounter + - id: SyringePhalanximine + - id: RadAutoInjector + amount: 1 - id: EmergencyMedipen - amount: 2 + amount: 1 - id: PillHyronalin - amount: 9 + amount: 5 - type: entity id: MedkitAdvancedFilled @@ -97,7 +105,7 @@ - id: MedicatedSuture amount: 2 - id: RegenerativeMesh - - id: Gauze + amount: 2 - id: Bloodpack amount: 2 @@ -111,11 +119,11 @@ - id: HandheldHealthAnalyzer - id: MedicatedSuture - id: RegenerativeMesh + - id: SyringeEphedrine + - id: SyringeSaline - id: BruteAutoInjector - id: BurnAutoInjector - - id: SyringeEphedrine - - id: SyringeTranexamicAcid - - id: AntiPoisonMedipen + - id: EmergencyMedipen - id: Bloodpack - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 76d21deb80..5083ae4a44 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -442,6 +442,22 @@ - ReagentId: Bicaridine Quantity: 10 +- type: entity + name: charcoal pill (10u) + parent: Pill + id: PillCharcoal + components: + - type: Sprite + sprite: Objects/Specific/Chemistry/pills.rsi + state: pill21 + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Charcoal + Quantity: 10 + - type: entity name: romerol pill parent: Pill @@ -586,6 +602,58 @@ - ReagentId: Ambuzol Quantity: 15 +- type: entity + name: sigynate syringe + parent: BaseSyringe + id: SyringeSigynate + components: + - type: SolutionContainerManager + solutions: + injector: + maxVol: 15 + reagents: + - ReagentId: Sigynate + Quantity: 15 + +- type: entity + name: ethylredoxrazine syringe + parent: BaseSyringe + id: SyringeEthylredoxrazine + components: + - type: SolutionContainerManager + solutions: + injector: + maxVol: 15 + reagents: + - ReagentId: Ethylredoxrazine + Quantity: 15 + +- type: entity + name: phalanximine syringe + parent: BaseSyringe + id: SyringePhalanximine + components: + - type: SolutionContainerManager + solutions: + injector: + maxVol: 15 + reagents: + - ReagentId: Phalanximine + Quantity: 15 + +- type: entity + name: saline syringe + parent: BaseSyringe + id: SyringeSaline + components: + - type: SolutionContainerManager + solutions: + injector: + maxVol: 15 + reagents: + - ReagentId: Saline + Quantity: 15 + #this is where all the syringes are so i didn't know where to put it - type: entity name: romerol syringe diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index fb234194f9..7227f6ae61 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -125,9 +125,9 @@ - type: entity - name: anti-poison medipen + name: poison auto-injector parent: ChemicalMedipen - id: AntiPoisonMedipen + id: PoisonAutoInjector description: A rapid dose of anti-poison. Contains ultravasculine and epinephrine. components: - type: Sprite @@ -199,6 +199,32 @@ - type: Tag tags: [] +- type: entity + name: rad auto-injector + parent: ChemicalMedipen + id: RadAutoInjector + description: A rapid dose of anti-radiation. Contains arithrazine and bicardine. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: arithpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: Hypospray + solutionName: pen + transferAmount: 20 + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: Arithrazine + Quantity: 15 + - ReagentId: Bicaridine + Quantity: 5 + - type: Tag + tags: [] + - type: entity name: space medipen parent: ChemicalMedipen diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json index a44077cbd6..b9de04b6b8 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json @@ -37,6 +37,9 @@ { "name": "pill20" }, + { + "name": "pill21" + }, { "name": "pill7" }, diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill21.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill21.png new file mode 100644 index 0000000000000000000000000000000000000000..92951d347696396cd6db87445a5e6fd6ef32baac GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ>7Fi*ArbCxryb;Sa1e35U(>*r zZ5kQ<>%V`1P_}0FvKj{4uXYDiH}A~<|7?z>ke^V$_Ze}n4Gi316tf`r)n&VsyC#R9 zJ9KlcciQnYb>hhj{Y_prVgVJ?oz$&s%G^b8DV1X@L zv%I0x_UnI-v+~UPqWj~My^!9AsVuA!4XhCgm5tn!Mf4O|*Bt2sI+4NC)z4*}Q$iC1 F0{{|@P455z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen.png new file mode 100644 index 0000000000000000000000000000000000000000..53a96484b4a152b8c46fb36f8c800bb99c1c4188 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJgPtyqArbD$DG~_>EDn4#?y*WR zVR3VY5gcs?9{zp(|FG7YD&4mE8ZT^=G=7Wm?A^Y z!HLY$5)OPFJ!jK*%+TT8{-yX$2-^&)844b`dwlf{A5xwysZrLjZ=vXoJKfLw8)Y9n z7C%|A{)E6$#v4rxPa38@RpkjRWPQ@ka3bN021DoH_?rydCmYHfJoZeWOV;5v8}~sM pi&qU71tfSIp~Qkx4hDusK}$vT;N}BB&oFqp`njxgN@!wW005YtVr>8b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..f6f5cfb52216f0aff5d6958c3c71e22e038207b0 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ2c9mDArbD$DG~_>EDn4#?y*WR zVR3T?6AcL*b1XJJwO_Gg+lG&dE2hm!n!8}30{aW;D8m?=`X04Dg%=DH*8lqt1Wzum z<>{BVPnj@vYWj}ba?Ib?6g?H%Bd0D>6e0WI?OR^HvXTh`kBs3KW`yktbP#3d$yWo W;;MrSGJt+%@O1TaS?83{!~g&jUucy8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json index a421caa595..3bf15e0a2e 100644 --- a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json @@ -78,6 +78,12 @@ }, { "name": "atropen_empty" + }, + { + "name": "arithpen" + }, + { + "name": "arithpen_empty" }, { "name": "medipen-inhand-left" -- 2.51.2