Lua Shuttles Add + Akula Shuttle

Resources/Prototypes/_Lua/Entities/Structures/Machines/Computers/computers.yml

@@ -841,3 +841,36 @@
       disk_a: !type:ContainerSlot {}
       disk_b: !type:ContainerSlot {}
   - type: CoordinatesDiskMerger
+
+#region Luna shipyard
+
+- type: entity
+  id: ComputerShipyardBlackMarketScrapLuna
+  parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, ComputerShipyard]
+  name: консоль кораблей чёрной верфи обломков
+  description: Консоль покупки кораблей из обломков на чёрной верфи
+  suffix: Обломки ЧР
+  categories: [ Erp ]
+  components:
+  - type: ActivatableUI
+    key: enum.ShipyardConsoleUiKey.Custom
+  - type: UserInterface
+    interfaces:
+      enum.ShipyardConsoleUiKey.Custom:
+        type: ShipyardConsoleBoundUserInterface
+  - type: Sprite
+    sprite: _NF/Structures/Machines/computers.rsi
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer_blackmarket
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: shipyard_blackmarket
+    - map: ["computerLayerKeys"]
+      state: blackmarket_key
+  - type: ShipyardListing
+    shuttles:
+    - deathclaw
+    - Astraded
+    - Spearhead

Resources/Prototypes/_Lua/Shipyard/Blackscrap/astraded.yml

@@ -0,0 +1,32 @@
+- type: vessel
+  id: Astraded
+  parent: BaseVessel
+  name: Astraded
+  description: Старый прототип FlashPoint наёмников что был модифицированн и уничтожен, оснащён тяжёлым вооружением.
+  price: 285000 # 277735 original #Lua
+  category: Large
+  group: Custom
+  shuttlePath: /Maps/_Lua/Luna/Shuttles/Blackscrap/astraded.yml
+  guidebookPage: Null
+  whitelist:
+  - Luna
+  class:
+  - Expedition
+  - Capital
+  engine:
+  - AME
+
+- type: gameMap
+  id: Astraded
+  mapName: 'Astraded'
+  mapPath: /Maps/_Lua/Luna/Shuttles/Blackscrap/astraded.yml
+  minPlayers: 0
+  stations:
+    Astraded:
+      stationProto: StandardFrontierExpeditionVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Astraded {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'

Resources/Prototypes/_Lua/Shipyard/Blackscrap/deathclaw.yml

@@ -0,0 +1,29 @@
+- type: vessel
+  id: deathclaw
+  parent: BaseVessel
+  name: Scrap DeathClaw
+  description: Спизженный ДСБФ обломок шаттла подлежащий утилизации, но предоставлен вам для ремонта!
+  price: 133250 #103250 #Lua
+  limit: 2
+  category: Small
+  group: Custom
+  shuttlePath: /Maps/_Lua/Luna/Shuttles/Blackscrap/deathclaw.yml
+  whitelist:
+  - Luna
+  engine:
+  - Plasma
+
+- type: gameMap
+  id: deathclaw
+  mapName: 'SCRAP DeathClaw'
+  mapPath: /Maps/_Lua/Luna/Shuttles/Blackscrap/deathclaw.yml
+  minPlayers: 0
+  stations:
+    deathclaw:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'SCRAP DeathClaw {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'

Resources/Prototypes/_Lua/Shipyard/Blackscrap/spearhead.yml

@@ -0,0 +1,33 @@
+- type: vessel
+  id: Spearhead
+  parent: BaseVessel
+  name: Spearhead
+  description: Шаттл с глубин космоса который чудом смогли достать бравые утилизаторы, но не инженеры! Тяжёло оснащён но сложный в ремонте..
+  price: 140000 # 93910 original #Lua
+  category: Large
+  group: Custom
+  shuttlePath: /Maps/_Lua/Luna/Shuttles/Blackscrap/spearhead.yml
+  guidebookPage: Null
+  limit: 1
+  whitelist:
+  - Luna
+  class:
+  - Expedition
+  - Capital
+  engine:
+  - AME
+
+- type: gameMap
+  id: Spearhead
+  mapName: 'Spearhead'
+  mapPath: /Maps/_Lua/Luna/Shuttles/Blackscrap/spearhead.yml
+  minPlayers: 0
+  stations:
+    Spearhead:
+      stationProto: StandardFrontierAntagVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Spearhead {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'

Resources/Prototypes/_Lua/Shipyard/Civilian/shuttletinia.yml

@@ -12,7 +12,6 @@
   category: Large
   group: Shipyard # Lua ShipyardLarge<Shipyard
   whitelist:
-  - Luna
   - Frontier
   class:
   - Civilian
@@ -34,3 +33,35 @@
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
+
+- type: vessel
+  parent: BaseVessel
+  id: ShuttleTiniaLuna
+  name: Тиния
+  description: Корабль-станция Тиния, предпочтителен для большой команды, в наличии Бар, Кухня, Ботаника.
+  limit: 1
+  price: 175000
+  category: Large
+  group: Shipyard # Lua ShipyardLarge<Shipyard
+  whitelist:
+  - Luna
+  class:
+  - Civilian
+  engine:
+  - Plasma
+  shuttlePath: /Maps/_Lua/Luna/Shuttles/Civilian/shuttletinia.yml
+
+- type: gameMap
+  id: ShuttleTiniaLuna
+  mapName: 'Тиния'
+  mapPath: /Maps/_Lua/Luna/Shuttles/Civilian/shuttletinia.yml
+  minPlayers: 0
+  stations:
+    ShuttleTiniaLuna:
+      stationProto: StandardFrontierVesselCargo
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Тиния {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'

Resources/Prototypes/_Lua/Shipyard/Expedition/Wyvern.yml

@@ -13,7 +13,6 @@
   shuttlePath: /Maps/_Lua/Shuttles/Expedition/Wyvern.yml
   guidebookPage: ShipyardWyvern
   whitelist:
-  - Luna
   - Frontier
   class:
   - Civilian
@@ -35,3 +34,37 @@
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
+
+- type: vessel
+  id: WyvernLuna
+  parent: BaseVessel
+  name: Wyvern
+  description: Научно-исследовательское судно от LaFleur Industries. Один из немногих флагманов гражданской верфи.
+  price: 450000 #Nakrytka 100000, Base value 340000 x 1.15
+  category: Large
+  group: Expedition
+  limit: 2
+  shuttlePath: /Maps/_Lua/Shuttles/Expedition/Wyvern.yml
+  guidebookPage: ShipyardWyvern
+  whitelist:
+  - Luna
+  class:
+  - Civilian
+  - Expedition
+  engine:
+  - AME
+
+- type: gameMap
+  id: WyvernLuna
+  mapName: 'Wyvern'
+  mapPath: /Maps/_Lua/Shuttles/Expedition/Wyvern.yml
+  minPlayers: 0
+  stations:
+    WyvernLuna:
+      stationProto: StandardFrontierExpeditionVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Wyvern {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'

Resources/Prototypes/_Lua/Shipyard/Expedition/asket.yml

@@ -13,7 +13,6 @@
   group: Expedition
   shuttlePath: /Maps/_Lua/Shuttles/Expedition/asket.yml
   whitelist:
-  - Luna
   - Frontier
   class:
   - Expedition
@@ -35,3 +34,36 @@
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
+
+- type: vessel
+  parent: BaseVessel
+  id: GFAsketLuna
+  name: Asket
+  description: Большой корабль для исследования глубокого космоса и экспедиций.
+  price: 225000
+  category: Large
+  group: Expedition
+  limit: 2
+  shuttlePath: /Maps/_Lua/Shuttles/Expedition/asket.yml
+  whitelist:
+  - Luna
+  class:
+  - Expedition
+  - Civilian
+  engine:
+  - AME
+
+- type: gameMap
+  id: GFAsketLuna
+  mapName: 'Asket'
+  mapPath: /Maps/_Lua/Shuttles/Expedition/asket.yml
+  minPlayers: 0
+  stations:
+    GFAsketLuna:
+      stationProto: StandardFrontierExpeditionVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Asket {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'

Resources/Prototypes/_Lua/Shipyard/Expedition/ilmus.yml

@@ -13,7 +13,6 @@
   group: Expedition
   shuttlePath: /Maps/_Lua/Shuttles/Expedition/ilmus.yml
   whitelist:
-  - Luna
   - Frontier
   class:
   - Expedition
@@ -35,3 +34,36 @@
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
+
+- type: vessel
+  parent: BaseVessel
+  id: GFIlmusLuna
+  name: Ilmus
+  description: Средний шаттл для утилизации и экспедиций. Дополнительно оснащен кухней и медицинским отсеком
+  price: 65000
+  category: Medium
+  group: Expedition
+  limit: 3
+  shuttlePath: /Maps/_Lua/Shuttles/Expedition/ilmus.yml
+  whitelist:
+  - Luna
+  class:
+  - Expedition
+  - Civilian
+  engine:
+  - AME
+
+- type: gameMap
+  id: GFIlmusLuna
+  mapName: 'Ilmus'
+  mapPath: /Maps/_Lua/Shuttles/Expedition/ilmus.yml
+  minPlayers: 0
+  stations:
+    GFIlmusLuna:
+      stationProto: StandardFrontierExpeditionVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Ilmus {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'

Resources/Prototypes/_Lua/Shipyard/Expedition/novasprint.yml

@@ -0,0 +1,33 @@
+- type: vessel
+  id: novasprint
+  parent: BaseVessel
+  name: PZ Nova Sprint
+  description: Оснащён лёгким вооружением, просторным карго, малым баром тягой на двух капитальных ракетных двигателях, что удобно скрыты пластитановыми крылами по бокам.
+  price: 145000
+  category: Medium
+  group: Expedition
+  access: Mercenary
+  shuttlePath: /Maps/_Lua/Shuttles/Expedition/novasprint.yml
+  whitelist:
+  - Luna
+  - Frontier
+  class:
+  - Expedition
+  - Civilian
+  engine:
+  - Uranium
+
+- type: gameMap
+  id: novasprint
+  mapName: 'PZ Nova Sprint'
+  mapPath: /Maps/_Lua/Shuttles/Expedition/novasprint.yml
+  minPlayers: 0
+  stations:
+    novasprint:
+      stationProto: StandardFrontierExpeditionVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'PZ Nova Sprint {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'

Resources/Prototypes/_Lua/Shipyard/Expedition/olympus.yml

@@ -0,0 +1,33 @@
+- type: vessel
+  id: Olympus
+  parent: BaseVessel
+  name: DIS Olympus
+  description: A ultreaheavy-class cargo freighter, the pride and joy of DIS. Large cargo space and 20mm defence system. In sum all you need to run smooth, large scale transport operations.
+  price: 225500
+  category: Large
+  group: Expedition
+  shuttlePath: /Maps/_Lua/Shuttles/Expedition/olympus.yml
+  guidebookPage: Null
+  whitelist:
+  - Luna
+  class:
+  - Cargo
+  - Civilian
+  - Expedition
+  engine:
+  - AME
+
+- type: gameMap
+  id: Olympus
+  mapName: 'DIS Olympus'
+  mapPath: /Maps/_Lua/Shuttles/Expedition/olympus.yml
+  minPlayers: 0
+  stations:
+    Olympus:
+      stationProto: StandardFrontierExpeditionVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'olympus CIV{1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'