From 9ba19a023fbf6473b63d4b12fda8a1216c6e3f2e Mon Sep 17 00:00:00 2001
From: MD360 <74264906+MantasDab360@users.noreply.github.com>
Date: Tue, 9 Dec 2025 18:44:47 +0200
Subject: [PATCH] 100% Ion resistance on Ninja Suit and Visor NVG. (#4916)

* Add NVG to visor, Ion Immunity and no EMP armor ignore

* Comments..

* .ftl from up to _DV

* Rewrote visor description.

* Remove ftl newline, forgor desc comment.
---
 Content.Server/_DV/Silicons/SiliconEmpSystem.cs               | 2 +-
 Resources/Locale/en-US/_DV/armor/armor-examine.ftl            | 2 ++
 Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml       | 4 +++-
 .../Prototypes/Entities/Clothing/OuterClothing/suits.yml      | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Content.Server/_DV/Silicons/SiliconEmpSystem.cs b/Content.Server/_DV/Silicons/SiliconEmpSystem.cs
index 8e9768a7bd..4b5d4eda9e 100644
--- a/Content.Server/_DV/Silicons/SiliconEmpSystem.cs
+++ b/Content.Server/_DV/Silicons/SiliconEmpSystem.cs
@@ -19,6 +19,6 @@ public sealed class SiliconEmpSystem : EntitySystem
     {
         args.Cancel(); // Stop all the normal effects of the EMP
         if (args.Damage is not { } damage) return;
-        _damageable.TryChangeDamage(ent, damage / 2, true); // Damage is divided by 2 because the event is raised twice (once from entity itself, and another is relayed from it's power cell) and I'm too lazy for an actual fix
+        _damageable.TryChangeDamage(ent, damage / 2, false); // Damage is divided by 2 because the event is raised twice (once from entity itself, and another is relayed from it's power cell) and I'm too lazy for an actual fix - NoElka | Make EMP not ignore armor.
     }
 }
diff --git a/Resources/Locale/en-US/_DV/armor/armor-examine.ftl b/Resources/Locale/en-US/_DV/armor/armor-examine.ftl
index 4a21f509d4..17cc60d3a1 100644
--- a/Resources/Locale/en-US/_DV/armor/armor-examine.ftl
+++ b/Resources/Locale/en-US/_DV/armor/armor-examine.ftl
@@ -9,3 +9,5 @@ held-armor-whitelist-fail = You are not [color=yellow]{$reason}[/color].
 held-armor-blacklist-fail = You are [color=red]{$reason}[/color].
 
 held-armor-bible-user-fail = faithful
+
+armor-damage-type-ion = Ion
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index f7e27c0017..2d24ee332f 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -257,13 +257,15 @@
   parent: [ClothingEyesBase, BaseMajorContraband]
   id: ClothingEyesVisorNinja
   name: ninja visor
-  description: An advanced visor protecting a ninja's eyes from flashing lights.
+  description: An advanced visor protecting a ninja's eyes from flashing lights while having an ability to see in the dark. # DeltaV
   components:
   - type: Sprite
     sprite: Clothing/Eyes/Glasses/ninjavisor.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Glasses/ninjavisor.rsi
   - type: FlashImmunity
+  - type: NightVision # DeltaV
+    isEquipment: true
 
 - type: entity
   parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityContraband]
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 418ab6a21d..8cdfd2377f 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -166,6 +166,7 @@
         Slash: 0.8
         Piercing: 0.8
         Heat: 0.8
+        Ion: 0 # DeltaV - I love self gibbing as ninja IPC!!
   # phase cloak
   - type: ToggleClothing
     action: ActionTogglePhaseCloak