Merge pull request #1643 from Pivotbash/SecLink

Seclink purchases should now all fit in sec belts + Pribar tweak
impstation · Feb 11, 2025 · 91c8e50 · 91c8e50
2 parents c74c707 + c130847
commit 91c8e50
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 3 deletions.
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -485,6 +485,9 @@
         - CombatKnife
         - Truncheon
         - SecTicket
+        - Pribar #imp
+        - SpaceBladeSec #imp
+        - HandheldCriminalRecords #imp
       components:
         - Stunbaton
         - FlashOnTrigger

diff --git a/Resources/Prototypes/_Impstation/Catalog/seclink_catalog.yml b/Resources/Prototypes/_Impstation/Catalog/seclink_catalog.yml
@@ -90,6 +90,7 @@
   categories:
     - SeclinkDisabler
 
+#Utility Options
 - type: listing
   id: SeclinkSpaceBladeSec
   name: seclink-spaceblade-name
@@ -98,9 +99,8 @@
   cost:
     DisablerToken: 1
   categories:
-    - SeclinkDisabler
+    - SeclinkUtility
 
-#Utility Options
 - type: listing
   id: SeclinkCrowbar
   name: seclink-crowbar-name

diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/security.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/security.yml
@@ -12,6 +12,9 @@
       - state: portable_criminal
       - state: screen-criminal
         shader: unshaded
+  - type: Tag
+    tags:
+    - HandheldCriminalRecords
   - type: ActivatableUI
     key: enum.CriminalRecordsConsoleKey.Key
   - type: UserInterface

diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Tools/crowbars.yml
@@ -14,7 +14,10 @@
       sprite: _Impstation/Objects/Tools/pribar.rsi
       state: storage
   - type: Prying
-    speedModifier: 1.25
+    speedModifier: 1.35
+  - type: Tag
+    tags:
+    - Pribar
   - type: MeleeWeapon
     wideAnimationRotation: -135
     damage:

diff --git a/Resources/Prototypes/_Impstation/tags.yml b/Resources/Prototypes/_Impstation/tags.yml
@@ -94,3 +94,9 @@
 
 - type: Tag
   id: EvidenceMarker
+
+- type: Tag
+  id: Pribar
+
+- type: Tag
+  id: HandheldCriminalRecords
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/spaceblade.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/spaceblade.yml
@@ -142,6 +142,9 @@
     damage: 8
   - type: DisarmMalus
     malus: 0.225
+  - type: Tag # imp adding this so it fits in a sec belt
+    tags:
+    - SpaceBladeSec
   - type: ItemToggle # imp edit - it deserves to weewoo
     predictable: false
     onUse: false

diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
@@ -12,3 +12,6 @@
 
 - type: Tag
   id: MailCapsule
+
+- type: Tag #imp
+  id: SpaceBladeSec