From 62232e308ce69f416783b64496eb79cefdabe997 Mon Sep 17 00:00:00 2001
From: KaiserMaus <kaiser.ratte@gmail.com>
Date: Sat, 18 Jan 2025 20:09:29 +0000
Subject: [PATCH] =?UTF-8?q?=D0=A8=D0=BF=D1=80=D0=B8=D1=86=D0=B5=D0=BC?=
 =?UTF-8?q?=D1=91=D1=82=20=D0=9C=D0=B5=D0=B4=D0=B8=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml |   2 +-
 .../Entities/Mobs/Player/ghost_roles.yml        |   8 ++++----
 .../Objects/Specific/Medical/hypospray.yml      |   6 ++++--
 .../syringe_rapidgun.rsi/inhand-left.png        | Bin 337 -> 383 bytes
 .../syringe_rapidgun.rsi/inhand-right.png       | Bin 341 -> 386 bytes
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml
index 616dd0c9a16..0ecd84759ec 100644
--- 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
index 8d8c11a43b9..b1a1afe5d8c 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml
@@ -284,7 +284,7 @@
     head: ClothingHeadEVAHelmetERTMedic
     neck: HandheldCamera
     eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesNitrile
+    gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterArmorAmberMed
     id: ERTMedicPDA
     ears: ClothingHeadsetAltCentCom
@@ -292,7 +292,7 @@
     pocket1: HyposprayERT
     pocket2: MedipenCombatInjector
   inhand:
-  - WeaponEnergyGun
+  - LauncherSyringeRapidFilled
   - DefibrillatorCompact
   storage:
     back:
@@ -311,7 +311,7 @@
     neck: HandheldCamera
     mask: ClothingMaskGasERT
     eyes: ClothingEyesNVDSec
-    gloves: ClothingHandsGlovesNitrile
+    gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTMedical
     id: ERTMedicPDA
     ears: ClothingHeadsetAltCentCom
@@ -319,7 +319,7 @@
     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
index b3a269809ad..1b06e5b3987 100644
--- 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/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-left.png
index b59a4d52682c1a0f290c8751b524b1eb04fa2f04..760bbf686e6020848a1d1ad53a6f103464aaa11c 100644
GIT binary patch
delta 356
zcmV-q0h|8O0{;S#B!2;OQb$4nuFf3k0003wNkl<Zc%1FpJ#NB45QgC)g<Ed$iOQ{S
zU>V6RS0GK!kVE7QJ^+16xCAAxFgHj`GpURS;?L^^8RdOSTeG`kkKFh(0{{R3004+g
zk}vYyyVNZ5+$D9Y8Kk!Pjr-jVN%D<*=Z6;R?a>=l$=J-ymVZrSx0+hyxi6dMPu)u^
z%b82^vYh!nW8F?nTX%Zz5oe4(0mlbjt-eQTnps`1txCpL6w`~1Nb;hXT9u5guGf~P
z+2LMU&R*+#aIQ&7F3IQf_p@)ey?&|ok>`D?YZLJ7vj6}900000005wmkUT($!Da}$
z<^e(+X9)W46J7o9aF;wlh}ao|QSTK_Nb)qz>|_69pWChNcDty1Nb;}A<nSB4@A}av
z;NCnyh+7$gL46ah<pDz1d&vwz><Ngq761UizxNC8=B8}!8GRc70000<MNUMnLSTYR
CDXiT9

delta 310
zcmey*bdhO-N<C+RM`SSr1Gg{;GcwGYBf-GH$n5Fj7*a9k?JYyTCI<nBiw6%~lNQj5
zTHnAqt%}RKn*X8Xp4O!?ho*7uXk6Qy*5x}TqouSg`Aog)nGL%)J8V{FVgP{z9pB5*
zXZCDVQ<PuVeIxzmi=#XCNHmE#$SyOs-1_!`QpTKP+4XTej@%QT7q5K1IcIvd<R`Tq
zbFWvNeSM$X(ET%$jo+44eVy7(?=k{)?&-O#e_h*qx#Dc`sUp#*^$E|eDjlz3+P4#I
z6^L+fG3?){bIizI=IcxL4-aowUr3K@*!Y*hPN$kfsQIVO#gi{DetT9mG4`^@_0na@
zJLZ-je{o;m?*1QMiCg>+9tZOu^p{=S{*NW8kDY;`p}vIOe{&Z9uL#X_kl~)LelF{r
G5}E)x5r$L%

diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-right.png
index 6a8268d27e3bb32a86c8eaaf47497dc763816212..2d14cffa582edfa91d1e7b8d2c4bed33a6919460 100644
GIT binary patch
delta 359
zcmV-t0hs>P0)hjOB!2;OQb$4nuFf3k0003zNkl<Zc%1Fpv2nsc5QX7~0#Z8IAyP^Q
z8Zo1k7I5MkT!d>-0pt#$2|^Shb>P&=Iyw)dK?1~K1OC7Gw7Ms4wkrVu00000NLpo?
zo0<RhJz_93UuD_(S<K9L?*1$vVU=aRbMMTOv=6WAT9Q<bCx5?iz1s^p)^)9uoe<ik
zC>CyJUKERm>wxy34mr9yIypR;=W~_giK=QVN!n~aMqP#P+2LK&bf&7>svJ+0=kwz^
z%*>a|7dNw`U+Iy;OULgUvW1*yJ@kzJOHKd)00000004maE}p*+beH4$5Wa8z9_u|}
zXCZd&<n)n#7huib2e|dl!szsoerD!rI@9adr{4B^HBEDM&366w>GWr8AG`j=9nfB!
zIBWhsP<v+~O=q!6UuV$#eZV{Vb{6hd><)-k3jhEBE#CyhrFJvr4AlSt002ovPDHLk
FV1jt9s(%0g

delta 314
zcmV-A0mc4;1JweMB!3BTNLh0L01FcU01FcV0GgZ_00038Nkl<Zc%1FpF%rQ*6vpw5
zLhA+@Ra#eICQ44B(>sJSxP?+Kp;eI^Xf@1dWF|ta$YzE4|LV=|``)H|YYYGY0002M
zO&EsfZ`a_0Ek~#9qh-JU7frC`cxZqYZw?2u>h_wg%oF8Mo`13?+%+J(`T2NicDt>K
zqJf_(9V!M@4&^EP6FT`1hr`jeWBN#vWF3@k+-CV&b&1NOT*_z7@od2_g_nQG00000
z000000D#u<IdW>^tf%h--sSThL3WmFwHhF{`MV2EzF7$DOI}lP8bQxaN3+=PO`4{)
z_bl$Oo6pAft~2+q{0FF@IG%hyf3J8}{>?&b9&GrYzcbqh004k{7e)kW8GY!|3IG5A
M07*qoM6N<$f^!><ivR!s