Шприцемёт Медику

space-sunrise · Jan 18, 2025 · 62232e3 · 62232e3
1 parent 11328bf
commit 62232e3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml
@@ -185,7 +185,7 @@
       - id: ShellShotgunFlare
       - id: Telebaton
       - id: PowerCellNanoTrasen
-      - id: Bloodpack
+      - id: DoubleEmergencyOxygenTankFilled
       - id: MedipenCombatInjector
       - id: FreedomImplant
       - id: Implanter

diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml
@@ -284,15 +284,15 @@
     head: ClothingHeadEVAHelmetERTMedic
     neck: HandheldCamera
     eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesNitrile
+    gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterArmorAmberMed
     id: ERTMedicPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltMedicalFilled
     pocket1: HyposprayERT
     pocket2: MedipenCombatInjector
   inhand:
-  - WeaponEnergyGun
+  - LauncherSyringeRapidFilled
   - DefibrillatorCompact
   storage:
     back:
@@ -311,15 +311,15 @@
     neck: HandheldCamera
     mask: ClothingMaskGasERT
     eyes: ClothingEyesNVDSec
-    gloves: ClothingHandsGlovesNitrile
+    gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTMedical
     id: ERTMedicPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltMedicalFilled
     pocket1: HyposprayERT
     pocket2: MedipenCombatInjector
   inhand:
-  - WeaponEnergyGunPistolSecurity
+  - LauncherSyringeSMG
   - AdvancedDefibrillator
   storage:
     back:

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
@@ -15,10 +15,12 @@
       pen:
         maxVol: 100
         reagents:
+        - ReagentId: Epinephrine
+          Quantity: 10
         - ReagentId: Omnizine
-          Quantity: 25
+          Quantity: 20
         - ReagentId: Saline
-          Quantity: 25
+          Quantity: 20
         - ReagentId: Puncturase
           Quantity: 25
         - ReagentId: Dermaline

diff --git a/...es/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-left.png b/...es/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-left.png
diff --git a/...s/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-right.png b/...s/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-right.png