bring back doorjack, use emag for lockers

DeltaV-Station · Feb 14, 2025 · 9332907 · 9332907
1 parent d8289cc
commit 9332907
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 13 deletions.
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
@@ -296,7 +296,7 @@ private void AddToggleLockVerb(EntityUid uid, LockComponent component, GetVerbsE
 
     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/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
@@ -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
@@ -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