Adds fills to first aid kits (#6707)

2022-02-19 22:22:21 +00:00
parent 5c7fb8a4be
commit 21b4e4ca28
16 changed files with 253 additions and 7 deletions
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -7,9 +7,11 @@
  - type: StorageFill
    contents:
      - id: Brutepack
-        amount: 3
+        amount: 2
+      - id: Gauze
+        amount: 1
      - id: Ointment
-        amount: 3
+        amount: 2
      # todo 1 Health Analyzer once it exists. Remove brutepack and ointment for suture, gauze, mesh and medipen?
      # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents
      
@@ -21,7 +23,11 @@
  - type: StorageFill
    contents:
      - id: Ointment
-        amount: 5
+        amount: 2
+      - id: PillKelotane
+        amount: 3
+      - id: SyringeInaprovaline
+        amount: 1
        
 - type: entity
  id: MedkitBruteFilled
@@ -31,5 +37,80 @@
  - type: StorageFill
    contents:
      - id: Brutepack
-        amount: 5
-#todo TO DO - add first aid kits for rad, toxin, o2, advanced and combat.
+        amount: 2 # TO DO: Advanced brute pack
+      - id: PillIron
+        amount: 2
+      - id: Gauze
+        amount: 2
+        
+- type: entity
+  id: MedkitToxinFilled
+  suffix: Filled
+  parent: MedkitToxin
+  components:
+  - type: StorageFill
+    contents:
+      - id: SyringeSpaceacillin
+        amount: 1
+      - id: PillDylovene
+        amount: 3
+        
+- type: entity
+  id: MedkitOxygenFilled
+  suffix: Filled
+  parent: MedkitO2
+  components:
+  - type: StorageFill
+    contents:
+      - id: EpinephrineMedipen
+        amount: 1
+      - id: PillDexalin
+        amount: 3
+      - id: SyringeInaprovaline
+        amount: 1
+        
+- type: entity
+  id: MedkitRadiationFilled
+  suffix: Filled
+  parent: MedkitRadiation
+  components:
+  - type: StorageFill
+    contents:
+      - id: Ointment
+        amount: 2
+      - id: PillHyronalin
+        amount: 3
+      - id: EpinephrineMedipen
+        amount: 1
+        
+- type: entity
+  id: MedkitAdvancedFilled
+  suffix: Filled
+  parent: MedkitAdvanced
+  components:
+  - type: StorageFill
+    contents:
+      - id: Brutepack
+        amount: 3 # TO DO: Advanced fills
+      - id: SyringeTranexamicAcid
+        amount: 1
+      - id: PillTricordrazine
+        amount: 1
+      - id: AntiPoisonMedipen
+        amount: 1
+        
+- type: entity
+  id: MedkitCombatFilled
+  suffix: Filled
+  parent: MedkitCombat
+  components:
+  - type: StorageFill
+    contents:
+      - id: SyringeEphedrine
+        amount: 1 # TO DO: More combat meds
+      - id: SyringeTranexamicAcid
+        amount: 1
+      - id: PillTricordrazine
+        amount: 1
+      - id: AntiPoisonMedipen
+        amount: 1
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -20,6 +20,8 @@
        prob: 0.4
      - id: OxygenTankFilled
        prob: 0.2
+      - id: MedkitOxygenFilled
+        prob: 0.2
      - id: FlareGun
        prob: 0.05
        
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_solutioncontainerexample.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_solutioncontainerexample.yml
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -75,3 +75,148 @@
    sprite: Objects/Specific/Hydroponics/aloe.rsi
    state: cream

+# Pills     
+- type: entity
+  name: dexalin pill
+  parent: Pill
+  id: PillDexalin
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: Dexalin
+          Quantity: 15
+          
+- type: entity
+  name: dylovene pill
+  parent: Pill
+  id: PillDylovene
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: Dylovene
+          Quantity: 15
+
+- type: entity
+  name: hyronalin pill
+  parent: Pill
+  id: PillHyronalin
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: Hyronalin
+          Quantity: 15
+          
+- type: entity
+  name: iron pill
+  parent: Pill
+  id: PillIron
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: Iron
+          Quantity: 15
+
+- type: entity
+  name: kelotane pill
+  parent: Pill
+  id: PillKelotane
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: Kelotane
+          Quantity: 15
+       
+- type: entity
+  name: space drugs
+  parent: Pill
+  id: PillSpaceDrugs
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: SpaceDrugs
+          Quantity: 15
+          
+- type: entity
+  name: tricordrazine pill
+  parent: Pill
+  id: PillTricordrazine
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: Tricordrazine
+          Quantity: 15
+          
+# Syringes
+- type: entity
+  name: ephedrine syringe
+  parent: Syringe
+  id: SyringeEphedrine
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+        - ReagentId: Ephedrine
+          Quantity: 15
+
+- type: entity
+  name: inaprovaline syringe
+  parent: Syringe
+  id: SyringeInaprovaline
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+        - ReagentId: Inaprovaline
+          Quantity: 15
+
+- type: entity
+  name: spaceacillin syringe
+  parent: Syringe
+  id: SyringeSpaceacillin
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+        - ReagentId: Spaceacillin
+          Quantity: 15
+
+- type: entity
+  name: tranexamic acid syringe
+  parent: Syringe
+  id: SyringeTranexamicAcid
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+        - ReagentId: TranexamicAcid
+          Quantity: 15
+        
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -67,3 +67,21 @@
        reagents:
        - ReagentId: Epinephrine
          Quantity: 15
+
+- type: entity
+  name: epinephrine medipen
+  parent: ChemicalMedipen
+  id: AntiPoisonMedipen
+  description: A rapid dose of anti-poison. Contains ultravasculine, inaprovaline and epinephrine.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 15
+        reagents:
+        - ReagentId: Ultravasculine
+          Quantity: 5
+        - ReagentId: Inaprovaline
+          Quantity: 5
+        - ReagentId: Epinephrine
+          Quantity: 5
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -224,7 +224,7 @@
 - type: entity
  name: pill
  parent: BaseItem
-  id: pill
+  id: Pill
  description: It's not a suppository.
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/clusterbang.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/clusterbang.yml
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -59,7 +59,7 @@
  id: Arithrazine
  name: arithrazine
  group: Medicine
-  desc: A slightly unstable medication used for the most extreme any serious case of radiation poisoning. Lowers radiation level at over twice the rate Hyronalin does and will heal toxin damage at the same time. Deals very minor brute damage to the patient over time, but the patient's body will typically out-regenerate it easily.
+  desc: A slightly unstable medication used for the most extreme case of radiation poisoning. Lowers radiation level at over twice the rate Hyronalin does and will heal toxin damage at the same time. Deals very minor brute damage to the patient over time, but the patient's body will typically out-regenerate it easily.
  physicalDesc: cloudy
  color: "#bd5902"
  metabolisms: