From a292c7bf3e09f35b10cd896a27fae234f1fb8901 Mon Sep 17 00:00:00 2001
From: deltanedas <@deltanedas:kde.org>
Date: Fri, 14 Feb 2025 16:28:24 +0000
Subject: [PATCH] bring back doorjack, use emag for lockers

---
 .../Access/Systems/AccessReaderSystem.cs      |  2 +-
 Content.Shared/Lock/LockSystem.cs             |  2 +-
 .../Locale/en-US/_DV/store/uplink-catalog.ftl |  3 +++
 .../Prototypes/Catalog/uplink_catalog.yml     | 25 ++++++++++---------
 .../Prototypes/_DV/Catalog/uplink_catalog.yml | 13 ++++++++++
 .../_DV/Entities/Objects/Tools/emag.yml       | 12 +++++++++
 6 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Tools/emag.yml

diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index 84de549b66..3e8beb81a8 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -77,7 +77,7 @@ public sealed class AccessReaderSystem : EntitySystem
 
     private void OnEmagged(EntityUid uid, AccessReaderComponent reader, ref GotEmaggedEvent args)
     {
-        if (!_emag.CompareFlag(args.Type, EmagType.Access))
+        if (!_emag.CompareFlag(args.Type, EmagType.Interaction)) // DeltaV - emag for lockers etc instead of doorjack
             return;
 
         if (!reader.BreakOnAccessBreaker)
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 0b24bc6722..55ee89b695 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -296,7 +296,7 @@ public sealed class LockSystem : EntitySystem
 
     private void OnEmagged(EntityUid uid, LockComponent component, ref GotEmaggedEvent args)
     {
-        if (!_emag.CompareFlag(args.Type, EmagType.Access))
+        if (!_emag.CompareFlag(args.Type, EmagType.Interaction)) // DeltaV - emag for lockers instead of doorjack
             return;
 
         if (!component.Locked || !component.BreakOnAccessBreaker)
diff --git a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl
index 7fa683d968..5e7df424e3 100644
--- a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl
@@ -18,6 +18,9 @@ uplink-syndicate-radio-implanter-bundle-desc = Two implanters for the price of o
 uplink-syndicate-hostage-implanter-bundle-name = Hostage implant bundle
 uplink-syndicate-hostage-implanter-bundle-desc = These implants pacify when injected and also allow the hostages to enter your shuttle without being shot by turrets!
 
+uplink-doorjack-name = Airlock Access Override
+uplink-doorjack-desc = A specialized cryptographic sequencer, designed solely to doorjack NanoTrasen's updated airlocks. Does not tamper with anything else.
+
 uplink-home-run-bat-name = Home Run Bat
 uplink-home-run-bat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball practice. Launch your foes!
 
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 31c155ad8e..4680aa45ee 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -863,18 +863,19 @@
 
 # Disruption
 
-- type: listing
-  id: UplinkAccessBreaker
-  name: uplink-access-breaker-name
-  description: uplink-access-breaker-desc
-  productEntity: AccessBreaker
-  discountCategory: rareDiscounts # DeltaV - was veryRareDiscounts
-  discountDownTo:
-    Telecrystal: 2 # DeltaV - was 3
-  cost:
-    Telecrystal: 4 # DeltaV - was 5
-  categories:
-  - UplinkDisruption
+# DeltaV - replaced by doorjack
+#- type: listing
+#  id: UplinkAccessBreaker
+#  name: uplink-access-breaker-name
+#  description: uplink-access-breaker-desc
+#  productEntity: AccessBreaker
+#  discountCategory: rareDiscounts # DeltaV - was veryRareDiscounts
+#  discountDownTo:
+#    Telecrystal: 2 # DeltaV - was 3
+#  cost:
+#    Telecrystal: 4 # DeltaV - was 5
+#  categories:
+#  - UplinkDisruption
 
 - type: listing
   id: UplinkEmag
diff --git a/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml b/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml
index dce54381c1..80f8e177ec 100644
--- a/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml
@@ -119,6 +119,19 @@
   categories:
   - UplinkImplants
 
+- type: listing
+  id: UplinkDoorjack
+  name: uplink-doorjack-name
+  description: uplink-doorjack-desc
+  productEntity: Doorjack
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkDisruption
+
 - type: listing
   id: BaseBallBatHomeRun
   name: uplink-home-run-bat-name
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Tools/emag.yml b/Resources/Prototypes/_DV/Entities/Objects/Tools/emag.yml
new file mode 100644
index 0000000000..f76dffd76f
--- /dev/null
+++ b/Resources/Prototypes/_DV/Entities/Objects/Tools/emag.yml
@@ -0,0 +1,12 @@
+- type: entity
+  parent: Emag
+  id: Doorjack
+  name: airlock access override
+  description: A specialized cryptographic sequencer with a distinctive battery tray, specifically designed to override station airlock access codes.
+  components:
+  - type: Emag
+    emagType: Access # LockSystem has its type changed so this only affects airlocks
+  - type: Sprite
+    sprite: _DV/Objects/Tools/doorjack.rsi
+  - type: Item
+    sprite: _DV/Objects/Tools/doorjack.rsi