diff --git a/Resources/Maps/_LuaM/Shuttles/PDV/Tier1/Scorpion.yml b/Resources/Maps/_LuaM/Shuttles/PDV/Scorpion.yml
similarity index 100%
rename from Resources/Maps/_LuaM/Shuttles/PDV/Tier1/Scorpion.yml
rename to Resources/Maps/_LuaM/Shuttles/PDV/Scorpion.yml
diff --git a/Resources/Prototypes/_LuaM/Catalog/pdv_uplink_catalog.yml b/Resources/Prototypes/_LuaM/Catalog/pdv_uplink_catalog.yml
index 34cc7d40e94..4d74dc9a693 100644
--- a/Resources/Prototypes/_LuaM/Catalog/pdv_uplink_catalog.yml
+++ b/Resources/Prototypes/_LuaM/Catalog/pdv_uplink_catalog.yml
@@ -8,24 +8,6 @@
   categories:
     - UplinkPirateExplosives
   conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - PirateUplink
-
-# Vouchers
-# T1
-
-- type: listing
-  id: UplinkSecurityT1VoucherScorpionLuaM
-  name:  uplink-pdv-t1-scorpion-voucher-name
-  description: uplink-pdv-t1-scorpion-voucher-desc
-  productEntity: ShipVoucherScorpionLuaM
-  cost:
-    Doubloon: 100
-  categories:
-  - UplinkPdvVouchers
-  conditions:
   - !type:StoreWhitelistCondition
     whitelist:
       tags:
diff --git a/Resources/Prototypes/_LuaM/Entities/Objects/Devices/ship_vouchers.yml b/Resources/Prototypes/_LuaM/Entities/Objects/Devices/ship_vouchers.yml
index 412019ad3a1..e69de29bb2d 100644
--- a/Resources/Prototypes/_LuaM/Entities/Objects/Devices/ship_vouchers.yml
+++ b/Resources/Prototypes/_LuaM/Entities/Objects/Devices/ship_vouchers.yml
@@ -1,24 +0,0 @@
-- type: entity
-  parent: BaseShipLPC
-  id: ShipVoucherScorpion
-  name: PDV Scorpion LPC [T1]
-  description: The voucher provides an opportunity to sit at the "Scorpion" consoles, one of the fastest fighters in the flagship's reserves. # LuaM An unusual variant from the same shipyards manufacturing Anacondas, using a mix of missile pods and 2 large-caliber cannons
-  components:
-  - type: Sprite
-    sprite: _Mono/Objects/Misc/lpcnew.rsi
-    layers:
-    - state: icon
-    - state: screen
-      color: "#1eff00"
-    - state: screen6
-      color: "#1eff00"
-      shader: unshaded
-  - type: ShipyardVoucher
-    destroyOnEmpty: false
-    cooldown: 7200 # one hour
-    consoleType: BlackMarket
-    companyName: PDV
-    vessels:
-    - ScorpionLuaM
-  - type: StaticPrice
-    vendPrice: 20000
diff --git a/Resources/Prototypes/_LuaM/shipyard/PDV/scorpion.yml b/Resources/Prototypes/_LuaM/shipyard/PDV/scorpion.yml
deleted file mode 100644
index f6148257f69..00000000000
--- a/Resources/Prototypes/_LuaM/shipyard/PDV/scorpion.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Автор: almaz3200(discord) 
-# Вдохновлён шаттлом "scorpion" от Starch
-
-- type: vessel
-  id: ScorpionLuaM
-  parent: BaseVesselAntag
-  name: PDV Scorpion
-  description: Широко распространенный вариант маневренного судна для групповой работы по крупной цели, благодаря хорошо защищенным двигателям, дает шанс успешно слинять от противника в любой момент боя.
-  price: 120000
-  purchasable: false # voucher only
-  category: Medium
-  group: BlackMarket
-  access: Pirate
-  shuttlePath: /Maps/_LuaM/Shuttles/PDV/Tier1/Scorpion.yml
-  class:
-  - Pirate
-  - Pursuit
-  - Corvette
-  engine:
-  - Bananium
-
-- type: gameMap
-  id: ScorpionLuaM
-  mapName: 'PDV Scorpion'
-  mapPath: /Maps/_LuaM/Shuttles/PDV/Tier1/Scorpion.yml
-  minPlayers: 0
-  stations:
-    ScorpionLuaM:
-      stationProto: StandardFrontierVessel
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: 'Scorpion PDV{1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: '14'
-        - type: StationJobs
-          availableJobs:
-            Pirate: [ 0, 0 ]
-            PdvBorg: [ 0, 0 ]
diff --git a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml
index a1b2c1c7941..817e0b06440 100644
--- a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml
+++ b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml
@@ -1345,20 +1345,20 @@
       tags:
       - PirateUplink # LuaM FactionStaticUplinkPdv > PirateUplink
 
-#- type: listing # Commented by LuaM
-#  id: UplinkSecurityT1VoucherScorpion
-#  name:  uplink-pdv-t1-scorpion-voucher-name
-#  description: uplink-pdv-t1-scorpion-voucher-desc
-#  productEntity: ShipVoucherScorpion
-#  cost:
-#    Doubloon: 120
-#  categories:
-#  - UplinkPdvVouchers
-#  conditions:
-#  - !type:StoreWhitelistCondition
-#    whitelist:
-#      tags:
-#      - PirateUplink # LuaM FactionStaticUplinkPdv > PirateUplink
+- type: listing
+  id: UplinkSecurityT1VoucherScorpion
+  name:  uplink-pdv-t1-scorpion-voucher-name
+  description: uplink-pdv-t1-scorpion-voucher-desc
+  productEntity: ShipVoucherScorpion
+  cost:
+    Doubloon: 100
+  categories:
+  - UplinkPdvVouchers
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - PirateUplink # LuaM FactionStaticUplinkPdv > PirateUplink
 
 - type: listing
   id: UplinkSecurityT1VoucherBastion
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/ship_vouchers.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/ship_vouchers.yml
index ff294f13291..bda86a41318 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/ship_vouchers.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/ship_vouchers.yml
@@ -439,30 +439,30 @@
   - type: StaticPrice
     vendPrice: 20000
 
-#- type: entity # Commented by LuaM
-#  parent: BaseShipLPC
-#  id: ShipVoucherScorpion
-#  name: PDV Scorpion LPC [T1]
-#  description: The voucher provides an opportunity to sit at the "Scorpion" consoles, one of the fastest fighters in the flagship's reserves. # LuaM An unusual variant from the same shipyards manufacturing Anacondas, using a mix of missile pods and 2 large-caliber cannons
-#  components:
-#  - type: Sprite
-#    sprite: _Mono/Objects/Misc/lpcnew.rsi
-#    layers:
-#    - state: icon
-#    - state: screen
-#      color: "#1eff00"
-#    - state: screen6
-#      color: "#1eff00"
-#      shader: unshaded
-#  - type: ShipyardVoucher
-#    destroyOnEmpty: false
-#    cooldown: 7200 # one hour
-#    consoleType: BlackMarket
-#    companyName: PDV
-#    vessels:
-#    - Scorpion
-#  - type: StaticPrice
-#    vendPrice: 20000
+- type: entity 
+  parent: BaseShipLPC
+  id: ShipVoucherScorpion
+  name: PDV Scorpion LPC [T1]
+  description: The voucher provides an opportunity to sit at the "Scorpion" consoles, one of the fastest fighters in the flagship's reserves. # LuaM An unusual variant from the same shipyards manufacturing Anacondas, using a mix of missile pods and 2 large-caliber cannons
+  components:
+  - type: Sprite
+    sprite: _Mono/Objects/Misc/lpcnew.rsi
+    layers:
+    - state: icon
+    - state: screen
+      color: "#1eff00"
+    - state: screen6
+      color: "#1eff00"
+      shader: unshaded
+  - type: ShipyardVoucher
+    destroyOnEmpty: false
+    cooldown: 7200 # one hour
+    consoleType: BlackMarket
+    companyName: PDV
+    vessels:
+    - Scorpion
+  - type: StaticPrice
+    vendPrice: 20000
 
 - type: entity
   parent: BaseShipLPC
diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml
index 5d8cddb079d..6c9f4bb702e 100644
--- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml
+++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml
@@ -1,40 +1,40 @@
-# Author: Starch(!) 
-# Commented by LuaM
-#
-#- type: vessel
-#  id: Scorpion
-#  parent: BaseVesselAntag
-#  name: PDV Scorpion
-#  description: An unusual variant from the same shipyards manufacturing Anacondas, using a mix of missile pods and 2 large-caliber cannons.
-#  price: 113200
-#  purchasable: false # voucher only
-#  category: Medium
-#  group: BlackMarket
-#  access: Pirate
-#  shuttlePath: /Maps/_LuaM/Shuttles/PDV/skorpionLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/skorpion.yml -> /Maps/_LuaM/Shuttles/PDV/skorpionLuaM.yml
-#  guidebookPage: Null
-#  class:
-#  - Pirate
-#  - Pursuit
-#  - Corvette
-#  engine:
-#  - Uranium
-#
-#- type: gameMap
-#  id: Scorpion
-#  mapName: 'PDV Scorpion'
-#  mapPath: /Maps/_Mono/Shuttles/BlackMarket/sсorpion.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/skorpion.yml -> /Maps/_LuaM/Shuttles/PDV/skorpionLuaM.yml
-#  minPlayers: 0
-#  stations:
-#    Scorpion:
-#      stationProto: StandardFrontierVessel
-#      components:
-#        - type: StationNameSetup
-#          mapNameTemplate: 'Scorpion PDV{1}'
-#          nameGenerator:
-#            !type:NanotrasenNameGenerator
-#            prefixCreator: '14'
-#        - type: StationJobs
-#          availableJobs:
-#            Pirate: [ 0, 0 ]
-#            PdvBorg: [ 0, 0 ]
+# Автор: almaz3200(discord) 
+# Вдохновлён шаттлом "scorpion" от Starch
+
+- type: vessel
+  id: Scorpion
+  parent: BaseVesselAntag
+  name: PDV Scorpion
+  description: Широко распространенный вариант маневренного судна для групповой работы по крупной цели, благодаря хорошо защищенным двигателям, дает шанс успешно слинять от противника в любой момент боя. # LuaM An unusual variant from the same shipyards manufacturing Anacondas, using a mix of missile pods and 2 large-caliber cannons. > Широко распространенный вариант маневренного судна для групповой работы по крупной цели, благодаря хорошо защищенным двигателям, дает шанс успешно слинять от противника в любой момент боя.
+  price: 120000
+  purchasable: false # voucher only
+  category: Medium
+  group: BlackMarket
+  access: Pirate
+  shuttlePath: /Maps/_LuaM/Shuttles/PDV/Scorpion.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/skorpion.yml -> /Maps/_LuaM/Shuttles/PDV/Scorpion.yml
+  guidebookPage: Null
+  class:
+  - Pirate
+  - Pursuit
+  - Corvette
+  engine:
+  - Bananium
+
+- type: gameMap
+  id: Scorpion
+  mapName: 'PDV Scorpion'
+  mapPath: /Maps/_LuaM/Shuttles/PDV/Scorpion.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/skorpion.yml -> /Maps/_LuaM/Shuttles/PDV/Scorpion.yml
+  minPlayers: 0
+  stations:
+    Scorpion:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Scorpion PDV{1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          availableJobs:
+            Pirate: [ 0, 0 ]
+            PdvBorg: [ 0, 0 ]