From f0a9dd3902ca7957978c458bf28000e3be8640fd Mon Sep 17 00:00:00 2001
From: Vigers Ray <vigersray@gmail.com>
Date: Wed, 12 Feb 2025 18:49:48 +0300
Subject: [PATCH] =?UTF-8?q?=D1=85=D0=B2=D0=B0=D1=82=D0=B8=D1=82=20=D1=83?=
 =?UTF-8?q?=D0=B1=D0=B8=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B3=D0=B8=D0=BF=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Content.Shared/Chemistry/Components/HyposprayComponent.cs | 7 -------
 Resources/Changelog/ChangelogSunrise.yml                  | 8 ++++++++
 .../Entities/Objects/Specific/Medical/hypospray.yml       | 3 ---
 .../Entities/Objects/Specific/Medical/hypospray.yml       | 4 +---
 .../Entities/Objects/Specific/Robotics/borg_tools.yml     | 3 ---
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Content.Shared/Chemistry/Components/HyposprayComponent.cs b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
index 7f2e1efd575..17d52f0ad93 100644
--- a/Content.Shared/Chemistry/Components/HyposprayComponent.cs
+++ b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
@@ -32,11 +32,4 @@ public sealed partial class HyposprayComponent : Component
     /// </summary>
     [DataField]
     public bool InjectOnly = false;
-    
-    /// <summary>
-    ///     Whether the hypospray uses a needle (i.e. medipens)
-    ///     or sci fi bullshit that sprays into the bloodstream directly (i.e. hypos)
-    /// </summary>
-    [DataField]
-    public bool PierceArmor = false;
 }
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
index 10569ace96e..554c94e1c35 100644
--- a/Resources/Changelog/ChangelogSunrise.yml
+++ b/Resources/Changelog/ChangelogSunrise.yml
@@ -12332,3 +12332,11 @@
   id: 851
   time: '2025-02-12T09:23:34.0000000+00:00'
   url: https://github.com/space-sunrise/space-station-14/pull/1350
+- author: VigersRay
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432\u0441\u0435 \u0433\u0438\
+      \u043F\u043E\u0441\u043F\u0440\u0435\u0438 \u043F\u0440\u043E\u0431\u0438\u0432\
+      \u0430\u044E\u0442 \u0431\u0440\u043E\u043D\u044E."
+    type: Tweak
+  id: 852
+  time: '2025-02-12T15:49:35.310326+00:00'
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index bd396d5d9aa..46e5ddb55d9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -50,7 +50,6 @@
     solution: hypospray
   - type: Hypospray
     onlyAffectsMobs: false
-    pierceArmor: true
   - type: UseDelay
     delay: 0.5
 
@@ -91,7 +90,6 @@
           maxVol: 3000
     - type: Hypospray
       onlyAffectsMobs: false
-      pierceArmor: true
     - type: UseDelay
       delay: 0.0
 
@@ -120,7 +118,6 @@
     transferAmount: 15
     onlyAffectsMobs: false
     injectOnly: true
-    pierceArmor: true
   - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 1
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
index 68d06412133..5d918c4a9e2 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
@@ -32,7 +32,6 @@
     transferAmount: 25
     onlyAffectsMobs: false
     injectOnly: true
-    pierceArmor: true
   - type: UseDelay
     delay: 45
   - type: Appearance
@@ -69,7 +68,6 @@
     solution: hypospray
   - type: Hypospray
     onlyAffectsMobs: false
-    pierceArmor: true
   - type: UseDelay
     delay: 0.5
   - type: StaticPrice
@@ -78,4 +76,4 @@
     tags:
     - HighRiskItem
   - type: StealTarget
-    stealGroup: Hypospray
\ No newline at end of file
+    stealGroup: Hypospray
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml
index 9659ea91b6e..27a144ad87e 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml
@@ -239,8 +239,6 @@
       Quantity: 2
     - ReagentId: DexalinPlus
       Quantity: 2
-  - type: Hypospray
-    pierceArmor: true
 
 - type: entity
   parent: Holoprojector
@@ -577,7 +575,6 @@
     solution: hypospray
   - type: Hypospray
     onlyAffectsMobs: false
-    pierceArmor: true
 
 - type: entity
   name: the saboteur's communications jammer