Merge pull request #1020 from PorktoberRevolution/develop

Merge current work to staging

.gitignore

@@ -13,3 +13,5 @@ Distribution/Restock/GameData/ReStock/Spaces/**/*.png
 Distribution/Restock/GameData/ReStock/Props/**/*.png
 Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png
 Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png
+Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg
+Source/Restock/dlls

Distribution/Restock/.mod_data.yml

@@ -13,8 +13,9 @@ package:
     - RestockRigidLegs
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.4
-    location: s3
+    location: url
+    url: https://ksp.sarbian.com/jenkins/job/ModuleManager/163/artifact/ModuleManager.4.2.3.dll
+    zip: false
 deploy:
   SpaceDock:
     enabled: true  # activate/deactivate this deployment script

Distribution/Restock/GameData/ReStock/Localization/en-us.cfg

@@ -42,6 +42,8 @@ Localization
     #LOC_Restock_variant-engine_boattail_size1p5_white = Boattail (1.875m, White)
     #LOC_Restock_variant-engine_boattail_size1_grey-orange = Boattail (1.25m, Orange/Grey)
     #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Boattail (1.875m, Orange/Grey)
+	#LOC_Restock_variant-engine_tankbutt = Tankbutt
+	#LOC_Restock_variant-engine_tankbutt_white = Tankbutt (White)
     #LOC_Restock_variant-engine_tankbutt_size2_white = Tankbutt (2.5m, White)
     #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Tankbutt (2.5m, Orange/Grey)
     #LOC_Restock_variant-engine_singlebell_compact = Single Compact

Distribution/Restock/GameData/ReStock/Localization/ru.cfg

@@ -1,8 +1,8 @@
 // Предлагаемый формат:
 // #LOC_Restock_partconfigname_fieldname
 // например.
-// # LOC_Restock_restock-engine-375-3_title = ...
-// # LOC_Restock_restock-engine-375-3_description = ...
+// #LOC_Restock_restock-engine-375-3_title = ...
+// #LOC_Restock_restock-engine-375-3_description = ...
 
 Localization
 {
@@ -13,149 +13,149 @@ Localization
     #LOC_Restock_scanner_screen_off = Выключить дисплей
     #LOC_Restock_scanner_screen_toggle = Вкл./выкл. дисплей
 
-    # LOC_Restock_variant-engine_size0 = 0,625 м
-    # LOC_Restock_variant-engine_size0_white = 0,625 м (Белый кожух)
-    # LOC_Restock_variant-engine_size0_grey-orange = 0,625 м (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_size1 = 1,25 м
-    # LOC_Restock_variant-engine_size1_white = 1,25 м (Белый кожух)
-    # LOC_Restock_variant-engine_size1_grey-orange = 1,25 м (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_size1p5 = 1,875 м
-    # LOC_Restock_variant-engine_size1p5_white = 1,875 м (Белый кожух)
-    # LOC_Restock_variant-engine_size1p5_grey-orange = 1,875 м (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_size2 = 2,5 м
-    # LOC_Restock_variant-engine_size2_white = 2,5 м (Белый кожух)
-    # LOC_Restock_variant-engine_size2_grey-orange = 2,5 м (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_size3 = 3,75 м
-    # LOC_Restock_variant-engine_compact = Компактный
-    # LOC_Restock_variant-engine_compact_white = Компактный (Белый кожух)
-    # LOC_Restock_variant-engine_compact_grey-orange = Компактный (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_radial = Радиальный
-    # LOC_Restock_variant-engine_boattail = Хвостовая часть
-    # LOC_Restock_variant-engine_boattail_white = Хвостовая часть (Белая)
-    # LOC_Restock_variant-engine_boattail_grey-orange = Хвостовая часть (Оранжевая/серая)
-    # LOC_Restock_variant-engine_boattail_orange = Хвостовая часть (Оранжевая)
-    # LOC_Restock_variant-engine_boattail_metal = Хвостовая часть (Металлик)
-    # LOC_Restock_variant-engine_boattail_dark = Хвостовая часть (Темная)
-    # LOC_Restock_variant-engine_boattail_size1 = Хвостовая часть (1,25 м)
-    # LOC_Restock_variant-engine_boattail_size1p5 = Хвостовая часть (1,875 м)
-    # LOC_Restock_variant-engine_boattail_size1_white = Хвостовая часть (1,25 м, белая)
-    # LOC_Restock_variant-engine_boattail_size1p5_white = Хвостовая часть (1,875 м, белая)
-    # LOC_Restock_variant-engine_boattail_size1_grey-orange = Хвостовая часть (1,25 м, оранжевая/серая)
-    # LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Хвостовая часть (1,875 м, оранжевая/серая)
-    # LOC_Restock_variant-engine_tankbutt_size2_white = Крепление к баку (2,5 м, белый)
-    # LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Крепление к баку (2,5 м, оранжевый/серый)
-    # LOC_Restock_variant-engine_singlebell_compact = Одно сопло, Компактный
-    # LOC_Restock_variant-engine_singlebell_compact_white = Одно сопло, компактный вариант (Белый кожух)
-    # LOC_Restock_variant-engine_singlebell_compact_grey-orange = Одно сопло, компактный вариант (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_singlebell = Одно сопло
-    # LOC_Restock_variant-engine_singlebell_white = Одно сопло (белый кожух)
-    # LOC_Restock_variant-engine_singlebell_grey-orange = Одно сопло (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_quadbell = Четыре сопла
-    # LOC_Restock_variant-engine_quadbell_white = Четыре сопла (Белый кожух)
-    # LOC_Restock_variant-engine_quadbell_grey-orange = Четыре сопла (Оранжевый/серый кожух)
-    # LOC_Restock_variant-engine_quadbell_compact = Четыре сопла, Компактный
-    # LOC_Restock_variant-engine_quadbell_compact_white = Четыре сопла, Компактный (Белый кожух)
-    # LOC_Restock_variant-engine_quadbell_compact_grey-orange = Четыре сопла, Компактный (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_size0 = 0,625 м
+    #LOC_Restock_variant-engine_size0_white = 0,625 м (Белый кожух)
+    #LOC_Restock_variant-engine_size0_grey-orange = 0,625 м (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_size1 = 1,25 м
+    #LOC_Restock_variant-engine_size1_white = 1,25 м (Белый кожух)
+    #LOC_Restock_variant-engine_size1_grey-orange = 1,25 м (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_size1p5 = 1,875 м
+    #LOC_Restock_variant-engine_size1p5_white = 1,875 м (Белый кожух)
+    #LOC_Restock_variant-engine_size1p5_grey-orange = 1,875 м (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_size2 = 2,5 м
+    #LOC_Restock_variant-engine_size2_white = 2,5 м (Белый кожух)
+    #LOC_Restock_variant-engine_size2_grey-orange = 2,5 м (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_size3 = 3,75 м
+    #LOC_Restock_variant-engine_compact = Компактный
+    #LOC_Restock_variant-engine_compact_white = Компактный (Белый кожух)
+    #LOC_Restock_variant-engine_compact_grey-orange = Компактный (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_radial = Радиальный
+    #LOC_Restock_variant-engine_boattail = Хвостовая часть
+    #LOC_Restock_variant-engine_boattail_white = Хвостовая часть (Белая)
+    #LOC_Restock_variant-engine_boattail_grey-orange = Хвостовая часть (Оранжевая/серая)
+    #LOC_Restock_variant-engine_boattail_orange = Хвостовая часть (Оранжевая)
+    #LOC_Restock_variant-engine_boattail_metal = Хвостовая часть (Металлик)
+    #LOC_Restock_variant-engine_boattail_dark = Хвостовая часть (Темная)
+    #LOC_Restock_variant-engine_boattail_size1 = Хвостовая часть (1,25 м)
+    #LOC_Restock_variant-engine_boattail_size1p5 = Хвостовая часть (1,875 м)
+    #LOC_Restock_variant-engine_boattail_size1_white = Хвостовая часть (1,25 м, белая)
+    #LOC_Restock_variant-engine_boattail_size1p5_white = Хвостовая часть (1,875 м, белая)
+    #LOC_Restock_variant-engine_boattail_size1_grey-orange = Хвостовая часть (1,25 м, оранжевая/серая)
+    #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Хвостовая часть (1,875 м, оранжевая/серая)
+    #LOC_Restock_variant-engine_tankbutt_size2_white = Крепление к баку (2,5 м, белый)
+    #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Крепление к баку (2,5 м, оранжевый/серый)
+    #LOC_Restock_variant-engine_singlebell_compact = Одно сопло, Компактный
+    #LOC_Restock_variant-engine_singlebell_compact_white = Одно сопло, компактный вариант (Белый кожух)
+    #LOC_Restock_variant-engine_singlebell_compact_grey-orange = Одно сопло, компактный вариант (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_singlebell = Одно сопло
+    #LOC_Restock_variant-engine_singlebell_white = Одно сопло (белый кожух)
+    #LOC_Restock_variant-engine_singlebell_grey-orange = Одно сопло (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_quadbell = Четыре сопла
+    #LOC_Restock_variant-engine_quadbell_white = Четыре сопла (Белый кожух)
+    #LOC_Restock_variant-engine_quadbell_grey-orange = Четыре сопла (Оранжевый/серый кожух)
+    #LOC_Restock_variant-engine_quadbell_compact = Четыре сопла, Компактный
+    #LOC_Restock_variant-engine_quadbell_compact_white = Четыре сопла, Компактный (Белый кожух)
+    #LOC_Restock_variant-engine_quadbell_compact_grey-orange = Четыре сопла, Компактный (Оранжевый/серый кожух)
 
-    # LOC_Restock_variant-engine_boattail_size2_white = Хвостовая часть (2,5 м, белая)
-    # LOC_Restock_variant-engine_boattail_size2_grey-orange = Хвостовая часть (2,5 м, оранжевая/серая)
-    # LOC_Restock_variant-engine_boattail_size3_white = Хвостовая часть (3,75 м, белая)
-    # LOC_Restock_variant-engine_boattail_size3_grey-orange = Хвостовая часть (3,75 м, оранжевая/серая)
+    #LOC_Restock_variant-engine_boattail_size2_white = Хвостовая часть (2,5 м, белая)
+    #LOC_Restock_variant-engine_boattail_size2_grey-orange = Хвостовая часть (2,5 м, оранжевая/серая)
+    #LOC_Restock_variant-engine_boattail_size3_white = Хвостовая часть (3,75 м, белая)
+    #LOC_Restock_variant-engine_boattail_size3_grey-orange = Хвостовая часть (3,75 м, оранжевая/серая)
 
-    # LOC_Restock_variant-engine_shroud_white = Белый кожух
-    # LOC_Restock_variant-engine_shroud_grey-orange = Металлический кожух
+    #LOC_Restock_variant-engine_shroud_white = Белый кожух
+    #LOC_Restock_variant-engine_shroud_grey-orange = Металлический кожух
 
-    # LOC_Restock_variant-engine_shroud = Кожух
-    # LOC_Restock_variant-engine_shroud_wide = Широкий кожух
-    # LOC_Restock_variant-engine_docking = Стыковочный порт
+    #LOC_Restock_variant-engine_shroud = Кожух
+    #LOC_Restock_variant-engine_shroud_wide = Широкий кожух
+    #LOC_Restock_variant-engine_docking = Стыковочный порт
 
-    # LOC_Restock_variant-mount_classic = Классический
-    # LOC_Restock_variant-mount_classic_white = Классический (Белый кожух)
-    # LOC_Restock_variant-mount_classic_grey-orange = Классический (Оранжевый/серый кожух)
-    # LOC_Restock_variant-mount_truss = Каркас
-    # LOC_Restock_variant-mount_compact = Компактный
-    # LOC_Restock_variant-mount_mounted = С креплением
+    #LOC_Restock_variant-mount_classic = Классический
+    #LOC_Restock_variant-mount_classic_white = Классический (Белый кожух)
+    #LOC_Restock_variant-mount_classic_grey-orange = Классический (Оранжевый/серый кожух)
+    #LOC_Restock_variant-mount_truss = Каркас
+    #LOC_Restock_variant-mount_compact = Компактный
+    #LOC_Restock_variant-mount_mounted = С креплением
 
-    # LOC_Restock_variant-gold-truss = Золотой (Каркас)
-    # LOC_Restock_variant-silver-truss = Серебряный (Каркас)
+    #LOC_Restock_variant-gold-truss = Золотой (Каркас)
+    #LOC_Restock_variant-silver-truss = Серебряный (Каркас)
 
-    # LOC_Restock_variant-engine_pod-orange = Корпус (оранжевый)
-    # LOC_Restock_variant-engine_pod-gray = Корпус (серый)
+    #LOC_Restock_variant-engine_pod-orange = Корпус (оранжевый)
+    #LOC_Restock_variant-engine_pod-gray = Корпус (серый)
 
-    # LOC_Restock_variant-antenna_size0 = 0,625 м
-    # LOC_Restock_variant-antenna_size1 = 1,25 м
-    # LOC_Restock_variant-antenna_truss = Каркас
-    # LOC_Restock_variant-antenna_compact = Компактная
-    # LOC_Restock_variant-antenna_radial = Радиальная
-    # LOC_Restock_variant-antenna_radial_reverse = Радиальная (в противоположную сторону)
-    # LOC_Restock_variant-antenna_axial = Осевая
-    # LOC_Restock_variant-antenna_axial_reverse = Осевая (в противоположную сторону)
+    #LOC_Restock_variant-antenna_size0 = 0,625 м
+    #LOC_Restock_variant-antenna_size1 = 1,25 м
+    #LOC_Restock_variant-antenna_truss = Каркас
+    #LOC_Restock_variant-antenna_compact = Компактная
+    #LOC_Restock_variant-antenna_radial = Радиальная
+    #LOC_Restock_variant-antenna_radial_reverse = Радиальная (в противоположную сторону)
+    #LOC_Restock_variant-antenna_axial = Осевая
+    #LOC_Restock_variant-antenna_axial_reverse = Осевая (в противоположную сторону)
 
-    # LOC_Restock_variant-telescope_shielded = Экранированный
-    # LOC_Restock_variant-telescope_bare = Без экрана
+    #LOC_Restock_variant-telescope_shielded = Экранированный
+    #LOC_Restock_variant-telescope_bare = Без экрана
 
-    # LOC_Restock_variant-pod_bare = Без покрытия
-    # LOC_Restock_variant-pod_fabric_green = Зеленое покрытие
-    # LOC_Restock_variant-pod_fabric_beige = Бежевое покрытие
-    # LOC_Restock_variant-pod_fabric_white = Белое покрытие
+    #LOC_Restock_variant-pod_bare = Без покрытия
+    #LOC_Restock_variant-pod_fabric_green = Зеленое покрытие
+    #LOC_Restock_variant-pod_fabric_beige = Бежевое покрытие
+    #LOC_Restock_variant-pod_fabric_white = Белое покрытие
 
-    # LOC_Restock_variant-wheel_broken = Поврежденное
-    # LOC_Restock_variant-wheel_bare = Без крыла
+    #LOC_Restock_variant-wheel_broken = Поврежденное
+    #LOC_Restock_variant-wheel_bare = Без крыла
 
-    # LOC_Restock_variant-surface_metal = Металлик
-    # LOC_Restock_variant-surface_basic = Базовый
-    # LOC_Restock_variant-surface_truss = Балка
-    # LOC_Restock_variant-surface_warningStripes = Сигнальные полосы
-    # LOC_Restock_variant-surface_thermalblankets = Теплоизоляция
-    # LOC_Restock_variant-surface_yellow = Желтый
-    # LOC_Restock_variant-surface_black = Черный
-    # LOC_Restock_variant-surface_white = Белый
-    # LOC_Restock_variant-surface_blue = Синий
+    #LOC_Restock_variant-surface_metal = Металлик
+    #LOC_Restock_variant-surface_basic = Базовый
+    #LOC_Restock_variant-surface_truss = Балка
+    #LOC_Restock_variant-surface_warningStripes = Сигнальные полосы
+    #LOC_Restock_variant-surface_thermalblankets = Теплоизоляция
+    #LOC_Restock_variant-surface_yellow = Желтый
+    #LOC_Restock_variant-surface_black = Черный
+    #LOC_Restock_variant-surface_white = Белый
+    #LOC_Restock_variant-surface_blue = Синий
 
-    # LOC_Restock_variant-strut_classic_metal = Металлик
-    # LOC_Restock_variant-strut_classic_white = Белый
-    # LOC_Restock_variant-strut_compact_metal = Металлик (компактный)
-    # LOC_Restock_variant-strut_compact_white = Белый (компактный)
+    #LOC_Restock_variant-strut_classic_metal = Металлик
+    #LOC_Restock_variant-strut_classic_white = Белый
+    #LOC_Restock_variant-strut_compact_metal = Металлик (компактный)
+    #LOC_Restock_variant-strut_compact_white = Белый (компактный)
     
-    # LOC_Restock_variant-decoupler_metal = Металлик
-    # LOC_Restock_variant-decoupler_grey-orange = Оранжевый/серый
+    #LOC_Restock_variant-decoupler_metal = Металлик
+    #LOC_Restock_variant-decoupler_grey-orange = Оранжевый/серый
 
-    # LOC_Restock_variant-service-bay-opaque = Сплошная перегородка
-    # LOC_Restock_variant-service-bay-transparent = Каркасная перегородка
-    # LOC_Restock_variant-service-bay-hollow = Без перегородки
-    # LOC_Restock_variant-service-bay-open = Открыть
-    # LOC_Restock_variant-service-bay-tunnel = Стыковочный туннель
-    # LOC_Restock_variant-service-bay-shelves = Полки
+    #LOC_Restock_variant-service-bay-opaque = Сплошная перегородка
+    #LOC_Restock_variant-service-bay-transparent = Каркасная перегородка
+    #LOC_Restock_variant-service-bay-hollow = Без перегородки
+    #LOC_Restock_variant-service-bay-open = Открыть
+    #LOC_Restock_variant-service-bay-tunnel = Стыковочный туннель
+    #LOC_Restock_variant-service-bay-shelves = Полки
 
-    # LOC_Restock_variant-heat-shield-black = Черный
-    # LOC_Restock_variant-heat-shield-brown = Классический
-    # LOC_Restock_variant-heat-shield-red = Неокрашенный
+    #LOC_Restock_variant-heat-shield-black = Черный
+    #LOC_Restock_variant-heat-shield-brown = Классический
+    #LOC_Restock_variant-heat-shield-red = Неокрашенный
 
-    # LOC_Restock_variant-linear-rcs-pod = С корпусом
-    # LOC_Restock_variant-linear-rcs-bare = Без корпуса
+    #LOC_Restock_variant-linear-rcs-pod = С корпусом
+    #LOC_Restock_variant-linear-rcs-bare = Без корпуса
 
-    # LOC_Restock_variant-stayputnik-pod = С креплением
-    # LOC_Restock_variant-stayputnik-bare = Без крепления
-    # LOC_Restock_variant-probe-gold = Золотой
-    # LOC_Restock_variant-probe-silver = Серебряный
-    # LOC_Restock_variant-probe-bare = Базовый
+    #LOC_Restock_variant-stayputnik-pod = С креплением
+    #LOC_Restock_variant-stayputnik-bare = Без крепления
+    #LOC_Restock_variant-probe-gold = Золотой
+    #LOC_Restock_variant-probe-silver = Серебряный
+    #LOC_Restock_variant-probe-bare = Базовый
 
-    # LOC_Restock_variant-radiator_basic = Базовый
-    # LOC_Restock_variant-radiator_flat = Плоский
-    # LOC_Restock_variant-radiator_compact = Компактный
+    #LOC_Restock_variant-radiator_basic = Базовый
+    #LOC_Restock_variant-radiator_flat = Плоский
+    #LOC_Restock_variant-radiator_compact = Компактный
 
-    # LOC_Restock_variant-tube-length-short = Короткая
-    # LOC_Restock_variant-tube-length-med-short = Средне-короткая
-    # LOC_Restock_variant-tube-length-med = Средняя
-    # LOC_Restock_variant-tube-length-med-long = Средне-длинная
-    # LOC_Restock_variant-tube-length-long = Длинная
+    #LOC_Restock_variant-tube-length-short = Короткая
+    #LOC_Restock_variant-tube-length-med-short = Средне-короткая
+    #LOC_Restock_variant-tube-length-med = Средняя
+    #LOC_Restock_variant-tube-length-med-long = Средне-длинная
+    #LOC_Restock_variant-tube-length-long = Длинная
 
-    # LOC_Restock_variant-tube-length-short-alt = Короткая (альтернативный вариант)
-    # LOC_Restock_variant-tube-length-med-short-alt = Средне-короткая (альтернативный вариант)
-    # LOC_Restock_variant-tube-length-med-alt = Средняя (альтернативный вариант)
-    # LOC_Restock_variant-tube-length-med-long-alt = Средне-длинная (альтернативный вариант)
-    # LOC_Restock_variant-tube-length-long-alt = Длинная (альтернативный вариант)
+    #LOC_Restock_variant-tube-length-short-alt = Короткая (альтернативный вариант)
+    #LOC_Restock_variant-tube-length-med-short-alt = Средне-короткая (альтернативный вариант)
+    #LOC_Restock_variant-tube-length-med-alt = Средняя (альтернативный вариант)
+    #LOC_Restock_variant-tube-length-med-long-alt = Средне-длинная (альтернативный вариант)
+    #LOC_Restock_variant-tube-length-long-alt = Длинная (альтернативный вариант)
 
-    # LOC_Restock_description-FuelCellArray = Зачем использовать только один маленький топливный элемент, когда можно установить три больших? Сборка из трех топливных элементов идеально подходит для ситуаций, когда вам нужен большой источник бесперебойного питания. Как и меньший топливный элемент, эта сборка работает путем преобразования топлива и окислителя в электрическую энергию.
+    #LOC_Restock_description-FuelCellArray = Зачем использовать только один маленький топливный элемент, когда можно установить три больших? Сборка из трех топливных элементов идеально подходит для ситуаций, когда вам нужен большой источник бесперебойного питания. Как и меньший топливный элемент, эта сборка работает путем преобразования топлива и окислителя в электрическую энергию.
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg

@@ -1,6 +1,7 @@
 // Patches applying art changes to 2.5m aerodynamic parts
 // Contents:
 // - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v2)
+// - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v3)
 
 // Protective Rocket Nose Cone Mk7
 @PART[rocketNoseCone_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -62,3 +63,64 @@
     }
   }
 }
+
+// Protective Rocket Nose Cone Mk7 [1.12]
+@PART[rocketNoseCone_v3]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Structural/restock-nosecone-25-2
+  }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = White
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = false
+        25mNoseconeWhite = true
+        25mNoseconeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = true
+        25mNoseconeWhite = false
+        25mNoseconeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007121
+      themeName = Orange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = false
+        25mNoseconeWhite = false
+        25mNoseconeOrange = true
+      }
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-intakes-depthmasks.cfg

@@ -9,7 +9,7 @@
 // - Mk1 Diverterless Supersonic Intake (MK1IntakeFuselage)
 
 // Circular Intake
-@PART[CircularIntake]
+@PART[CircularIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   !mesh = DELETE
   MODEL
@@ -28,7 +28,7 @@
 }
 
 // Small Circular Intake
-@PART[miniIntake]
+@PART[miniIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   !mesh = DELETE
   MODEL
@@ -47,7 +47,7 @@
 }
 
 // Shock Cone Intake
-@PART[shockConeIntake]
+@PART[shockConeIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {
@@ -61,7 +61,7 @@
 }
 
 // Adjustable Ramp Intake 
-@PART[ramAirIntake]
+@PART[ramAirIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   !mesh = DELETE
   MODEL
@@ -80,7 +80,7 @@
 }
 
 // Adjustable Ramp Intake Radial
-@PART[IntakeRadialLong]
+@PART[IntakeRadialLong]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   !mesh = DELETE
   MODEL
@@ -99,7 +99,7 @@
 }
 
 // XM-G50 Radial Air Intake
-@PART[airScoop]
+@PART[airScoop]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   !mesh = DELETE
   MODEL
@@ -119,7 +119,7 @@
 }
 
 // Mk1 Diverterless Supersonic Intake
-@PART[MK1IntakeFuselage]
+@PART[MK1IntakeFuselage]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {

Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg

@@ -1,14 +1,14 @@
 // Patches applying art changes to probe parts
 // Contents:
+// - Probodobodyne QBE (probeCoreCube)
+// - Probodobodyne Stayputnik (probeCoreSphere_v2)
 // - Probodobodyne HECS (probeCoreHex_v2)
 // - Probodobodyne OKTO (probeCoreOcto_v2)
 // - Probodobodyne OKTO2 (probeCoreOcto2_v2)
-// - Probodobodyne Stayputnik (probeCoreSphere_v2)
-// - Probodobodyne QBE (probeCoreCube)
 // - Probodobodyne HECS2 (HECS2_ProbeCore)
 // - Probodobodyne RoveMate (roverBody_v2)
-// - RC-L01 Remote Guidance Unit (probeStackLarge)
 // - RC-001S Remote Guidance Unit (probeStackSmall)
+// - RC-L01 Remote Guidance Unit (probeStackLarge)
 
 // QBE
 @PART[probeCoreCube]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -20,6 +20,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-qube-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2859,0.9363,0.135, 0.2859,0.9365,0.135, 0.2378,0.936,0.1355, 0.2378,0.9361,0.1355, 0.2859,0.9415,0.135, 0.2859,0.9415,0.135, 0,-1.49E-08,1.776E-15, 0.4885,0.5855,0.4885
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -89,6 +94,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-sphere-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.7138,0.7224,0.555, 0.7138,0.7223,0.555, 0.6414,0.4475,0.5448, 0.6414,0.5677,0.6443, 0.7138,0.7218,0.555, 0.7138,0.722,0.555, 0,0.1422,0, 0.9058,1.008,0.9058
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -131,6 +141,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-hecs-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2532,0.8507,0.3093, 0.2532,0.8504,0.3093, 0.4086,0.997,0.09923, 0.4086,0.997,0.09923, 0.2846,0.7473,0.4278, 0.2846,0.7489,0.4278, 0,0.0006218,0, 0.7738,0.3751,0.6869
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -200,6 +215,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-okto-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2648,0.7948,0.3164, 0.2648,0.7922,0.3164, 0.3945,0.9742,0.1582, 0.3945,0.9742,0.1582, 0.2648,0.7908,0.3164, 0.2648,0.7893,0.3164, 1.788E-07,0,4.172E-07, 0.6866,0.3848,0.6866
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -269,6 +289,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-okto2-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.06879,0.7797,0.2855, 0.06879,0.7815,0.2855, 0.2805,0.9745,0.1119, 0.2805,0.9744,0.1119, 0.06879,0.7758,0.2855, 0.06879,0.7706,0.2855, 1.252E-06,-3.725E-09,-3.01E-06, 0.5828,0.1206,0.5828
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -338,6 +363,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-hecs2-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 1.433,0.8207,0.8363, 1.433,0.8226,0.8363, 1.832,0.9705,0.221, 1.832,0.9705,0.221, 1.56,0.7408,0.7851, 1.56,0.7396,0.7851, -1.329E-05,0,2.283E-05, 1.638,0.9988,1.455
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -490,7 +520,7 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 0.3123,0.71,0.7274, 0.3123,0.7034,0.7331, 1.402,0.9681,0.1515, 1.402,0.9704,0.1515, 0.3077,0.701,0.7337, 0.3077,0.7054,0.7279, -0.005277,-9.855E-05,0.0009629, 1.261,0.2428,1.273
+    cube = Default, 0.2933,0.7015,0.758, 0.2933,0.7015,0.758, 1.398,0.9704,0.1499, 1.398,0.9739,0.1499, 0.2852,0.6621,0.7765, 0.2852,0.6625,0.7765, 0,0,0, 1.334,0.22,1.359
   }
 }
 
@@ -507,6 +537,6 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 1.028,0.7385,1.39, 1.028,0.7359,1.38, 5.274,0.9786,0.1842, 5.274,0.9776,0.1842, 1.072,0.7048,1.374, 1.072,0.7024,1.385, -0.0003395,0.0003387,-0.00157, 2.57,0.4079,2.58
+    cube = Default, 0.9721,0.7331,1.4, 0.9721,0.7336,1.4, 5.261,0.9806,0.1842, 5.261,0.9795,0.1842, 0.9997,0.7319,1.375, 0.9997,0.7309,1.42, -1.748E-09,2.384E-09,-0.02, 2.611,0.38,2.651
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg

@@ -112,4 +112,9 @@
     @animationName = Deploy
     @pivotName = Dish
   }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = DepthMask
+  }
 }

Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg

@@ -4,7 +4,7 @@
 // - Advanced Grabbing Unit Jr. (smallClaw)
 
 // Advanced Grabbing Unit
-@PART[GrapplingDevice]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[GrapplingDevice]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE
@@ -189,7 +189,7 @@
 }
 
 // Advanced Grabbing Unit Jr.
-@PART[smallClaw]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[smallClaw]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE

Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg

@@ -1,6 +1,7 @@
 // Patches applying art changes to crewed utility/science parts
 // Contents:
 // - Inline Clamp-O-Tron (dockingPortLateral)
+// - Mk2 Clamp-O-Tron (mk2DockingPort)
 // - Clamp-O-Tron Jr. Docking Port (dockingPort3)
 // - Clamp-O-Tron Docking Port (dockingPort2)
 // - Clamp-O-Tron Sr. Docking Port (dockingPortLarge)
@@ -8,16 +9,39 @@
 
 // Inline Clamp-O-Tron
 @PART[dockingPortLateral]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
-{
-  @author = Passinglurker
+{ 
+  @author = Passinglurker and Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1
+    model = ReStock/Assets/Coupling/restock-docking-inline-125-1
   }
   %rescaleFactor = 1
   %manufacturer = #autoLOC_501624
+
+  @MODULE[ModuleAnimateGeneric]
+  {
+    @animationName = DockingPortExtend
+  }
+}
+
+// Mk2 Clamp-O-Tron
+@PART[mk2DockingPort]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Porkjet and Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Coupling/restock-docking-inline-mk2-1
+  }
+  %rescaleFactor = 1
+
+  @MODULE[ModuleAnimateGeneric]
+  {
+    @animationName = DockingPortExtend
+  }
 }
 
 // Clamp-O-Tron Jr. Docking Port
@@ -28,7 +52,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-0625
+    model = ReStock/Assets/Coupling/restock-docking-0625-2
   }
   %rescaleFactor = 1
   MODULE
@@ -76,7 +100,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-125-1
+    model = ReStock/Assets/Coupling/restock-docking-125-2
   }
   MODEL
   {
@@ -86,41 +110,7 @@
     rotation = 180, 0, 0
   }
   %rescaleFactor = 1
-  MODULE
-  {
-    name = ModuleColorChanger
-    shaderProperty = _EmissiveColor
-    animRate = 0.8
-    animState = false
-    useRate = true
-    toggleInEditor = true
-    toggleInFlight = true
-    unfocusedRange = 5
-    toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
-    eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
-    eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
-    toggleAction = True
-    defaultActionGroup = Light
-    redCurve
-    {
-      key = 0 0 0 3
-      key = 1 1 0 0
-    }
-    greenCurve
-    {
-      key = 0 0 0 1
-      key = 1 1 1 0
-    }
-    blueCurve
-    {
-      key = 0 0 0 0
-      key = 1 0.7 1.5 0
-    }
-    alphaCurve
-    {
-      key = 0 1
-    }
-  }
+ 
 }
 
 // Clamp-O-Tron Sr. Docking Port
@@ -131,7 +121,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-25-1
+    model = ReStock/Assets/Coupling/restock-docking-25-3
   }
   MODEL
   {
@@ -141,40 +131,39 @@
     rotation = 180, 0, 0
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
-    name = ModuleColorChanger
-    shaderProperty = _EmissiveColor
-    animRate = 0.8
-    animState = false
-    useRate = true
-    toggleInEditor = true
-    toggleInFlight = true
-    unfocusedRange = 5
-    toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
-    eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
-    eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
-    toggleAction = True
-    defaultActionGroup = Light
-    redCurve
+    name = ModulePartVariants
+    baseVariant = Gray with Stripes
+    useMultipleDragCubes = false
+    VARIANT
     {
-      key = 0 0 0 3
-      key = 1 1 0 0
+      name = Gray with Stripes
+      displayName = #autoLOC_8320084
+      themeName = Gray
+      primaryColor = #999999
+      themeName = Gray with Stripes
+      secondaryColor = #b08b39
+      GAMEOBJECTS
+      {
+        Docking25Base = true
+        Docking25Grey = false
+      }
     }
-    greenCurve
+    VARIANT
     {
-      key = 0 0 0 1
-      key = 1 1 1 0
-    }
-    blueCurve
-    {
-      key = 0 0 0 0
-      key = 1 0.7 1.5 0
-    }
-    alphaCurve
-    {
-      key = 0 1
-    }
+      name = Gray
+      displayName = #autoLOC_8007101
+      themeName = Gray
+      primaryColor = #999999
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        Docking25Base = false
+        Docking25Grey = true
+      }
+    }   
   }
 }
 
@@ -186,7 +175,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Coupling/restock-docking-shielded-125-1
+    model = ReStock/Assets/Coupling/restock-docking-shielded-125-2
   }
   MODEL
   {
@@ -200,41 +189,7 @@
   {
     @animationName = PortExtend
   }
-  MODULE
-  {
-    name = ModuleColorChanger
-    shaderProperty = _EmissiveColor
-    animRate = 0.8
-    animState = false
-    useRate = true
-    toggleInEditor = true
-    toggleInFlight = true
-    unfocusedRange = 5
-    toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights
-    eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On
-    eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off
-    toggleAction = True
-    defaultActionGroup = Light
-    redCurve
-    {
-      key = 0 0 0 3
-      key = 1 1 0 0
-    }
-    greenCurve
-    {
-      key = 0 0 0 1
-      key = 1 1 1 0
-    }
-    blueCurve
-    {
-      key = 0 0 0 0
-      key = 1 0.7 1.5 0
-    }
-    alphaCurve
-    {
-      key = 0 1
-    }
-  }
+  
   MODULE
   {
     name = FXModuleLookAtConstraint

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg

@@ -42,7 +42,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -90,7 +90,6 @@
     canPitch = true
     pitchAxisName = X
     pitchMin = 0
-    pitchMin = 0
     pitchMax = 180
   }
   MODULE
@@ -102,7 +101,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -162,7 +161,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -210,7 +209,6 @@
     canPitch = true
     pitchAxisName = X
     pitchMin = 0
-    pitchMin = 0
     pitchMax = 180
   }
   !MODULE[ModulePartVariants] {}
@@ -223,7 +221,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -278,7 +276,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -348,7 +346,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -417,7 +415,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000
@@ -486,7 +484,7 @@
     VARIANT
     {
       name = Dark
-      displayName #autoLOC_8007117
+      displayName = #autoLOC_8007117
       themeName = Dark
       primaryColor = #000000
       secondaryColor = #000000

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg

@@ -7,6 +7,11 @@
 // - Gigantor XL Solar Array (largeSolarPanel)
 // - OX-STAT Photovoltaic Panels (solarPanels5)
 // - OX-STAT-XL Photovoltaic Panels (LgRadialSolarPanel)
+// - OX-10C Photovoltaic Panels (solarPanelOX10C)
+// - SP-10C Photovoltaic Panels (solarPanelSP10C)
+// - OX-10L Photovoltaic Panels (solarPanelOX10L)
+// - SP-10L Photovoltaic Panels (solarPanelSP10C)
+
 
 // OX-4L 1x6 Photovoltaic Panels
 @PART[solarPanels4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -111,7 +116,7 @@
   !MODEL,* {}
   MODEL
   {
-    model = ReStock/Assets/Electrical/restock-solarpanel-gigantor
+    model = ReStock/Assets/Electrical/restock-solarpanel-gigantor-2
     position = 0.0, 0.0, 0.0
     scale = 1,1,1
     rotation = 0, 0, 0
@@ -141,6 +146,11 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.01025,0.7987,0.2722, 0.01025,0.7975,0.2722, 0.00603,0.774,0.3413, 0.00603,0.7971,0.3281, 0.1637,1,0.09954, 0.1637,0.9751,0.1524, 7.587E-09,0,0.03411, 0.3466,0.4747,0.06439
+  }
 }
 
 // OX-STAT-XL Photovoltaic Panels
@@ -156,4 +166,103 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.04594,0.04438,0.3137, 0.04594,0.1383,0.3137, 0.02723,0.7552,0.8965, 0.02723,0.7537,0.8965, 1.28,1,0.09967, 1.28,0.01395,0.252, -2.98E-08,0,0.08014, 0.8,1.6,0.1631
+  }
+}
+
+// OX-10C Photovoltaic Panels
+@PART[solarPanelOX10C]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-solarpanel-round-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleDeployableSolarPanel]
+    { 
+    @animationName = PanelsExtend
+    @secondaryTransformName = sunCatcher
+    %pivotName = B_PanelSunPivot
+    @breakName = B_PanelPitch
+  }
+  MODULE
+  {
+    name =  ModuleRestockDeployableMeshHider
+    transformName = Panels
+  }
+}
+
+// SP-10C Photovoltaic Panels
+@PART[solarPanelSP10C]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-solarpanel-round-shrouded-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleDeployableSolarPanel]
+  {
+    @animationName = PanelsExtend
+    @secondaryTransformName = sunCatcher
+    %pivotName = B_PanelSunPivot
+    @breakName = B_PanelPitch
+  }
+  MODULE
+  {
+    name =  ModuleRestockDeployableMeshHider
+    transformName = Panels
+  }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = DepthMask
+  }
+}
+
+// OX-10L Photovoltaic Panels
+@PART[solarPanelOX10L]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Beale
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-ox-10l
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+}
+
+// SP-10L Photovoltaic Panels
+@PART[solarPanelSP10L]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Beale
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-sp-10l
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = mask
+  }
 }

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet-depthmasks.cfg

@@ -6,7 +6,7 @@
 // J-20 "Juno" Basic Jet Engine (miniJetEngine)
 
 // J-33 "Wheesley" Turbofan Engine
-@PART[JetEngine]
+@PART[JetEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {
@@ -20,7 +20,7 @@
 }
 
 // J-404 "Panther" Afterburning Turbofan
-@PART[turboJet]
+@PART[turboJet]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {
@@ -34,7 +34,7 @@
 }
 
 // J-X4 "Whiplash" Turbo Ramjet Engine
-@PART[turboFanEngine]
+@PART[turboFanEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {
@@ -48,7 +48,7 @@
 }
 
 // J-20 "Juno" Basic Jet Engine
-@PART[miniJetEngine]
+@PART[miniJetEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg

@@ -3,10 +3,10 @@
 // - LV-N "Nerv" Atomic Rocket Motor (nuclearEngine)
 // - S3 KS-25 "Vector" Liquid Fuel Engine (SSME)
 // - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3_v2)
-// - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine)
-// - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2)
+// - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine_v2)
+// - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2_v2)
 // - Mk-55 "Thud" Liquid Fuel Engine (radialLiquidEngine1-2) - FX only
-// - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike) - FX only
+// - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike)
 
 // LV-N "Nerv" Atomic Rocket Motor
 @PART[nuclearEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -904,14 +904,14 @@
 }
 
 // LV-T30 "Reliant" Liquid Fuel Engine
-@PART[liquidEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+@PART[liquidEngine_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Porkjet and Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Engine/restock-engine-reliant-1
+    model = ReStock/Assets/Engine/restock-engine-reliant-2
   }
   %rescaleFactor = 1
   @scale = 1
@@ -1021,16 +1021,17 @@
     }
   }
   @bulkheadProfiles = srf, size1
-  %node_attach = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0, 1
-  @node_stack_top = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0
-  @node_stack_bottom = 0.0, -0.90925375, 0.0, 0.0, -1.0, 0.0
+
+  %node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1
+ 
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
-    baseVariant = Size1
+    baseVariant = TrussMount
     VARIANT
     {
-      name = Size1
+      name = TrussMount
       displayName = #LOC_Restock_variant-engine_size1_white
       primaryColor = #999999
       secondaryColor = #ffffff
@@ -1051,7 +1052,7 @@
     }
     VARIANT
     {
-      name = Boattail
+      name = Shroud
       displayName = #LOC_Restock_variant-engine_boattail_white
       primaryColor = #ffffff
       secondaryColor = #ffffff
@@ -1072,7 +1073,7 @@
     }
     VARIANT
     {
-      name = Compact
+      name = Bare
       displayName = #LOC_Restock_variant-engine_compact_white
       primaryColor = #666666
       secondaryColor = #ffffff
@@ -1155,6 +1156,10 @@
       }
     }
   }
+  @MODULE[ModuleSurfaceFX]
+  {
+    @thrustProviderModuleIndex= 0
+  }
   @MODULE[ModuleEngines]
   {
     @name = ModuleEnginesFX
@@ -1245,20 +1250,18 @@
 }
 
 // LV-T45 "Swivel" Liquid Fuel Engine
-@PART[liquidEngine2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+@PART[liquidEngine2_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Porkjet and Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Engine/restock-engine-swivel-1
+    model = ReStock/Assets/Engine/restock-engine-swivel-2
   }
   @bulkheadProfiles = srf, size1
-  rescaleFactor = 1.0
-  @node_stack_top = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0
-  @node_stack_bottom = 0.0, -7.179225, 0.0, 0.0, -1.0, 0.0
-  %node_attach = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0, 1
+  %rescaleFactor = 1.0
+  %node_attach = 0.0, 0, 0.0, 0.0, 1.0, 0.0, 1
   @attachRules = 1,1,1,0,0
   !DRAG_CUBE {}
   DRAG_CUBE
@@ -1275,6 +1278,8 @@
   !sound_rocket_hard = DELETE
   !sound_vent_soft = DELETE
   !sound_explosion_low = DELETE
+
+  !MODULE[ModulePartVariants] {}
   EFFECTS
   {
     engage
@@ -1351,18 +1356,23 @@
       }
     }
   }
+  @MODULE[ModuleSurfaceFX]
+  {
+    @thrustProviderModuleIndex= 0
+  }
   @MODULE[ModuleEngines]
   {
     @name = ModuleEnginesFX
     %runningEffectName = fx-swivel-running
   }
+
   MODULE
   {
     name = ModulePartVariants
-    baseVariant = Size1
+    baseVariant = TrussMount
     VARIANT
     {
-      name = Size1
+      name = TrussMount
       displayName = #LOC_Restock_variant-engine_size1_white
       primaryColor = #999999
       secondaryColor = #ffffff
@@ -1389,7 +1399,7 @@
     }
     VARIANT
     {
-      name = Boattail
+      name = Shroud
       displayName = #LOC_Restock_variant-engine_boattail_white
       primaryColor = #ffffff
       secondaryColor = #ffffff
@@ -1416,7 +1426,7 @@
     }
     VARIANT
     {
-      name = Compact
+      name = Bare
       displayName = #LOC_Restock_variant-engine_compact_white
       primaryColor = #666666
       secondaryColor = #ffffff
@@ -1534,6 +1544,7 @@
     gimbalResponseSpeed = 8
     useGimbalResponseSpeed = true
   }
+  !MODULE[FXModuleLookAtConstraint] {}
   MODULE
   {
     name = FXModuleLookAtConstraint
@@ -1738,9 +1749,23 @@
   }
 }
 
-// T-1 Toroidal "Aerospike" Liquid Fuel Engine (FX only)
+// T-1 Toroidal "Aerospike" Liquid Fuel Engine
 @PART[toroidalAerospike]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
+  @author = Kavaeric
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-dart-1
+  }
+  %node_attach = 0.0, 0, 0.0, 0.0, 1.0, 0.0, 1
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Fairing, 1.355,0.7569,0.7222, 1.355,0.7569,0.7222, 1.213,0.9305,0.254, 1.213,0.7276,0.9296, 1.355,0.7569,0.7222, 1.355,0.7568,0.7222, 0,-0.394,0, 1.25,1.095,1.25
+    cube = Clean, 0.6549,0.6778,0.691, 0.6549,0.6778,0.691, 1.095,0.9444,0.2547, 1.095,0.7086,0.8151, 0.6549,0.6767,0.691, 0.6549,0.6789,0.691, 0,-0.3368,0, 1.188,0.9809,1.188
+  }
   !fx_exhaustFlame_blue  = DELETE
   !fx_exhaustLight_blue = DELETE
   !fx_smokeTrail_light = DELETE
@@ -1782,7 +1807,7 @@
         volume = 0.0 0.0
         volume = 1.0 1.0
         pitch = 0.0 0.2
-        pitch = 1.0 1.0
+        pitch = 2.0 2.0
         loop = true
       }
       MODEL_MULTI_PARTICLE
@@ -1818,4 +1843,80 @@
     @name = ModuleEnginesFX
     %runningEffectName = fx-dart-running
   }
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = TrussMount
+    VARIANT
+    {
+	  name = TrussMount
+	  displayName = #LOC_Restock_variant-engine_size1
+	  primaryColor = #999999
+	  secondaryColor = #ffffff
+	  GAMEOBJECTS
+	  {
+	    Aerospike_Common = true
+        Aerospike_12_Mount = true
+        Aerospike_12_Boattail = false
+		Aerospike_Shroud_Empty = true
+	  }
+	}
+	VARIANT
+    {
+	  name = Shroud
+	  displayName = #LOC_Restock_variant-engine_boattail
+	  primaryColor = #ffffff
+	  secondaryColor = #ffffff
+	  GAMEOBJECTS
+	  {
+	    Aerospike_Common = true
+        Aerospike_12_Mount = false
+        Aerospike_12_Boattail = true
+		Aerospike_Shroud_Empty = false
+	  }
+	}
+  }
+  @MODULE[ModuleJettison]
+  {
+    @jettisonName = Aerospike_Shroud
+    %useMultipleDragCubes = true
+  }
+  !MODULE[FXModuleAnimateThrottle] {}
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.05
+    shaderProperty = _EmissiveColor
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
 }

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg

@@ -121,7 +121,7 @@
   {
     @name = ModuleEnginesFX
     %runningEffectName = fx-poodle-running
-  }s
+  }
   !MODULE[FXModuleLookAtConstraint] {}
   MODULE
   {

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-375.cfg

@@ -8,7 +8,7 @@
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL
   {
     model = ReStock/Assets/Engine/restock-engine-rhino-1
@@ -20,7 +20,6 @@
     cube = 0, 15.48,0.7679,2.678, 15.48,0.7679,2.743, 11.07,0.9882,0.3025, 11.06,0.7086,4, 15.48,0.7679,2.678, 15.48,0.7679,2.743, 0.002109,-0.5297,-0.002108, 5.308,4.086,5.308
     cube = 1, 11.59,0.7684,2.41, 11.59,0.7684,2.426, 11,0.5,3.35, 11,0.5,2.257, 11.59,0.7685,2.41, 11.59,0.7681,2.41, 0,-0.8842,0, 3.765,3.374,3.765
   }
-  #node_stack_bottom02 = 0.0, -2.536873, 0.0, 0.0, -1.0, 0.0, 3
   %node_attach = 0.0, 1.487975, 0.0, 0.0, 1.0, 0.0, 3
   @attachRules = 1,1,1,0,0
   !EFFECTS {}
@@ -272,7 +271,7 @@
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL
   {
     model = ReStock/Assets/Engine/restock-engine-mammoth-1

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg

@@ -779,7 +779,7 @@
 }
 
 // Launch Escape System
-@PART[LaunchEscapeSystem]
+@PART[LaunchEscapeSystem]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE

Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-radial.cfg

@@ -14,6 +14,11 @@
   {
     model = ReStock/Assets/FuelTank/restock-fueltank-foil-sphere-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.3158,0.6901,0.4184, 0.3158,0.6901,0.4184, 0.3018,0.6431,0.4109, 0.3018,0.6432,0.4109, 0.3158,0.6882,0.4184, 0.3158,0.6892,0.4184, -1.49E-08,0,0, 0.6402,0.625,0.6402
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -97,6 +102,11 @@
   {
     model = ReStock/Assets/FuelTank/restock-fueltank-foil-capsule-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.7116,0.7432,0.4178, 0.7116,0.7432,0.4178, 0.3194,0.6708,0.4037, 0.3194,0.671,0.4037, 0.7116,0.742,0.4178, 0.7116,0.742,0.4178, 0,0,0, 0.6388,1.25,0.6388
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -183,7 +193,7 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 0.3608,0.6239,0.7064, 0.3608,0.6124,0.7064, 1.21,0.96,0.2872447, 1.21,0.96,0.245615, 0.3608,0.616,0.7064, 0.3608,0.6181,0.7064, 0,0,0, 1.218,0.3161,1.218
+    cube = Default, 0.381,0.6261,0.7165, 0.381,0.6255,0.7165, 0.9252,0.7779,0.2652, 0.9252,0.7776,0.2652, 0.3681,0.6327,0.7308, 0.3681,0.6346,0.7308, 3.553E-17,-2.861E-08,-7.105E-17, 1.25,0.3325,1.267
   }
   !MODULE[ModulePartVariants] {}
   MODULE

Distribution/Restock/GameData/ReStock/Patches/Ground/restock-legs.cfg

@@ -141,21 +141,23 @@
   }
   @MODULE[ModuleWheelBase]
   {
-    @clipObject = leg3_piston_CAPSULECOLLIDER
+    @wheelColliderTransformName = wheelCollider
+    @clipObject = piston_collider
   }
   @MODULE[ModuleWheelSuspension]
   {
-    @suspensionTransformName = leg3_piston
-    @suspensionColliderName = leg3_piston_CAPSULECOLLIDER
+    @suspensionTransformName = piston
+    @suspensionColliderName = piston_collider
   }
   @MODULE[ModuleWheelDeployment]
   {
-    @animationTrfName = leg3
+    @deployTargetTransformName = deployTgt
+    @animationTrfName = leg
     @animationStateName = restock-leg-3-deploy
-    @retractTransformName = leg3_piston
+    @retractTransformName = piston
   }
   @MODULE[ModuleWheelBogey]
   {
-    @bogeyTransformName = leg3_foot
+    @bogeyTransformName = foot
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg

@@ -115,7 +115,7 @@
     @damagedTransformName = WheelBusted
     @undamagedTransformName = Wheel
   }
-  !MODULE[FXModuleLookAtConstraint]
+  !MODULE[FXModuleLookAtConstraint]{}
   MODULE
   {
     name = ModuleRestockConstraints

Distribution/Restock/GameData/ReStock/Patches/Resource/restock-fuelvent.cfg

@@ -3,7 +3,7 @@
 // - FTE-1 Drain Valve (ReleaseValve)
 
 // FTE-1 Drain Valve
-@PART[ReleaseValve]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[ReleaseValve]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE

Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg

@@ -188,7 +188,7 @@
 }
 
 // Magnetometer Boom
-@PART[Magnetometer]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[Magnetometer]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE

Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg

@@ -387,7 +387,6 @@
       displayName = #LOC_Restock_variant-surface_thermalblankets
       primaryColor = #ffffff
       GAMEOBJECTS
-      GAMEOBJECTS
       {
         PanelBasic =  false
         PanelHollow = false
@@ -503,7 +502,6 @@
       displayName = #LOC_Restock_variant-surface_thermalblankets
       primaryColor = #ffffff
       GAMEOBJECTS
-      GAMEOBJECTS
       {
         PanelXLBasic =  false
         PanelXLHollow = false

Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg

@@ -22,7 +22,7 @@
   DRAG_CUBE
   {
     cube = Fairing, 0.05634,0.7512,0.6665, 0.05634,0.7603,0.5694, 0.3044,0.9566,0.1698, 0.3044,0.932,0.1674, 0.05487,0.7518,0.4044, 0.05488,0.7514,0.4076, 0.001332,0.001115,-0.002111, 0.625,0.1071,0.625
-    cube = Clean, 0.06044,0.4659,0.4447, 0.06044,0.4659,0.4447, 0.3843,0.9488,0.1482, 0.3843,0.9396,0.1682, 0.06044,0.4645,0.4447, 0.06044,0.4673,0.4447, 0,0.003277,-3.906E-10, 0.7,0.1,0.7
+    cube = Clean, 0.05805,0.485,0.4482, 0.05805,0.485,0.4482, 0.3831,0.9519,0.1482, 0.3831,0.9428,0.1694, 0.05805,0.4835,0.4482, 0.05805,0.4866,0.4482, 0,0.003277,-3.906E-10, 0.7,0.1,0.7
   }
   MODULE
   {
@@ -294,7 +294,7 @@
 }
 
 // Heat Shield (10m)
-@PART[InflatableHeatShield]
+@PART[InflatableHeatShield]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE

Distribution/Restock/GameData/ReStock/PatchesLegacy/Control/restock-rcs.cfg

@@ -1,10 +1,9 @@
 // Patches applying art changes to Legacy RCS blocks
 // Contents:
 // - RV-105 RCS Thruster Block (RCSBlock)
-// - Vernor Engine (vernorEngine)
 
 // RV-105 RCS Thruster Block
-@PART[RCSBlock]
+@PART[RCSBlock]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
@@ -58,48 +57,3 @@
     }
   }
 }
-
-// Vernor Engine
-@PART[vernierEngine]
-{
-  @author = Chris Adderley (Nertea)
-  !mesh = DELETE
-  !MODEL {}
-  MODEL
-  {
-    model = ReStock/Assets/Control/restock-rcs-vernor-1
-    scale = 1,1,1
-  }
-  @scale = 1
-  @rescaleFactor = 1
-  !EFFECTS {}
-  EFFECTS
-  {
-    running
-    {
-      AUDIO
-      {
-        channel = Ship
-        clip = sound_rocket_mini
-        volume = 0.0 0.0
-        volume = 0.02 0.2
-        volume = 0.5 0.2
-        volume = 1.0 0.2
-        pitch = 1.0
-        loop = true
-      }
-      MODEL_MULTI_PARTICLE
-      {
-        name = fx1
-        modelName = ReStock/FX/restock-fx-vernor-1
-        transformName = RCSthruster
-        emission = 0.0 0.0
-        emission = 0.1 0.0
-        emission = 1.0 1.0
-        speed = 0.0 0.8
-        speed = 1.0 1.0
-        localRotation = -180, 0, 0
-      }
-    }
-  }
-}

Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-0625.cfg

@@ -5,7 +5,7 @@
 // - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine)
 
 // LV-1 "Ant" Liquid Fuel Engine
-@PART[microEngine]
+@PART[microEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
@@ -162,7 +162,7 @@
 }
 
 // LV-1R "Spider" Liquid Fuel Engine
-@PART[radialEngineMini]
+@PART[radialEngineMini]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
@@ -338,7 +338,7 @@
 }
 
 // 24-77 "Twitch" Liquid Fuel Engine
-@PART[smallRadialEngine]
+@PART[smallRadialEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE

Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-125.cfg

@@ -0,0 +1,759 @@
+// Patches applying art changes to old versions of 1.25m engines
+// Contents:
+// - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine)
+// - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2)
+
+// LV-T30 "Reliant" Liquid Fuel Engine
+@PART[liquidEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Porkjet and Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-reliant-1
+  }
+  %rescaleFactor = 1
+  @scale = 1
+  @attachRules = 1,1,1,0,0
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = 0, 1.323,0.7658,0.6937, 1.323,0.7658,0.6937, 1.2,0.71,1.99, 1.2,0.60,1.863, 1.342,0.7654,0.7222, 1.342,0.7655,0.7222, -4.768E-07,0.04716,-1.442E-05, 1.25,1.959,1.25
+    cube = 1, 1.626,0.7348,0.9771, 1.626,0.7485,0.7117, 1.199,0.9966,0.321, 1.199,0.4031,1.449, 1.682,0.7548,0.7173, 1.682,0.7527,0.7117, 0.0001327,0.07738,-1.454E-05, 1.24,1.899,1.24
+    cube = 2, 1.344,0.7648,0.6937, 1.344,0.7649,0.7165, 1.2,0.41,1.999, 1.2,0.40,1.914, 1.342,0.7641,0.7222, 1.342,0.7642,0.7222, -0.0001337,0.04716,-0.001876, 1.25,1.959,1.25
+  }
+  !fx_exhaustFlame_blue = DELETE
+  !fx_exhaustLight_blue = DELETE
+  !fx_smokeTrail_light = DELETE
+  !fx_exhaustSparks_flameout = DELETE
+  !sound_vent_medium = DELETE
+  !sound_rocket_hard = DELETE
+  !sound_vent_soft = DELETE
+  !sound_explosion_low = DELETE
+  !EFFECTS {}
+  EFFECTS
+  {
+    engage
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_vent_medium
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    flameout
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_explosion_low
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    fx-reliant-running
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_rocket_hard
+        volume = 0.0 0.0
+        volume = 0.01 0.4
+        volume = 1.0 1.0
+        pitch = 0.0 0.2
+        pitch = 0.01 0.6
+        pitch = 1.0 1.8
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = turbo
+        modelName = ReStock/FX/restock-fx-reliant-turbo-1
+        transformName = fxTransformTurbo
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = core
+        modelName = ReStock/FX/restock-fx-reliant-core-1
+        transformName = fxTransformCore
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = plume
+        modelName = ReStock/FX/restock-fx-reliant-plume-1
+        transformName = fxTransformPlume
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      PREFAB_PARTICLE
+      {
+        prefabName = fx_smokeTrail_light
+        transformName = smokePoint
+        emission = 0.0 0.0
+        emission = 0.05 0.0
+        emission = 0.075 0.25
+        emission = 1.0 1.25
+        speed = 0.0 0.25
+        speed = 1.0 1.0
+        localOffset = 0, 0, 0
+      }
+    }
+  }
+  @bulkheadProfiles = srf, size1
+  %node_attach = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0, 1
+  @node_stack_top = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0
+  @node_stack_bottom = 0.0, -0.90925375, 0.0, 0.0, -1.0, 0.0
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Size1
+    VARIANT
+    {
+      name = Size1
+      displayName = #LOC_Restock_variant-engine_size1_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = true
+        LV_T30_Compact = false
+        LV_T30_Boattail = false
+        fairing = true
+        ShroudT30_Compact = false
+        fairingWhite = true
+        ShroudT30_CompactWhite = true
+        LV_T30_Boat = true
+        fairingOrange = false
+        ShroudT30_CompactOrange = false
+        LV_T30_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = false
+        LV_T30_Compact = false
+        LV_T30_Boattail = true
+        fairing = false
+        ShroudT30_Compact = false
+        fairingWhite = true
+        ShroudT30_CompactWhite = true
+        LV_T30_Boat = true
+        fairingOrange = false
+        ShroudT30_CompactOrange = false
+        LV_T30_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Compact
+      displayName = #LOC_Restock_variant-engine_compact_white
+      primaryColor = #666666
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = false
+        LV_T30_Compact = true
+        LV_T30_Boattail = false
+        fairing = false
+        ShroudT30_Compact = true
+        fairingWhite = true
+        ShroudT30_CompactWhite = true
+        LV_T30_Boat = true
+        fairingOrange = false
+        ShroudT30_CompactOrange = false
+        LV_T30_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Size1_Alternate
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #999999
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = true
+        LV_T30_Compact = false
+        LV_T30_Boattail = false
+        fairing = true
+        ShroudT30_Compact = false
+        fairingWhite = false
+        ShroudT30_CompactWhite = false
+        LV_T30_Boat = false
+        fairingOrange = true
+        ShroudT30_CompactOrange = true
+        LV_T30_BoatOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Boattail_Alternate
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
+      secondaryColor = #666666
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = false
+        LV_T30_Compact = false
+        LV_T30_Boattail = true
+        fairing = false
+        ShroudT30_Compact = false
+        fairingWhite = false
+        ShroudT30_CompactWhite = false
+        LV_T30_Boat = false
+        fairingOrange = true
+        ShroudT30_CompactOrange = true
+        LV_T30_BoatOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Compact_Alternate
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        LV_T30_Basic = false
+        LV_T30_Compact = true
+        LV_T30_Boattail = false
+        fairing = false
+        ShroudT30_Compact = true
+        fairingWhite = false
+        ShroudT30_CompactWhite = false
+        LV_T30_Boat = false
+        fairingOrange = true
+        ShroudT30_CompactOrange = true
+        LV_T30_BoatOrange = true
+      }
+    }
+  }
+  @MODULE[ModuleEngines]
+  {
+    @name = ModuleEnginesFX
+    %runningEffectName = fx-reliant-running
+  }
+  @MODULE[ModuleJettison]
+  {
+    @jettisonName = fairing,ShroudT30_Compact
+    useMultipleDragCubes = false
+  }
+  !MODULE[FXModuleAnimateThrottle] {}
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = throttleColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.025
+    shaderProperty = _EmissiveColor
+    excludedRenderer = EngineCoreT30Glow
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = throttleColor
+    animRate = 1
+    shaderProperty = _TintColor
+    includedRenderer = EngineCoreT30Glow
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    greenCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    blueCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+  }
+}
+
+// LV-T45 "Swivel" Liquid Fuel Engine
+@PART[liquidEngine2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Porkjet and Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-swivel-1
+  }
+  @bulkheadProfiles = srf, size1
+  rescaleFactor = 1.0
+  @node_stack_top = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0
+  @node_stack_bottom = 0.0, -7.179225, 0.0, 0.0, -1.0, 0.0
+  %node_attach = 0.0, 9.0182625, 0.0, 0.0, 1.0, 0.0, 1
+  @attachRules = 1,1,1,0,0
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = 0, 1.068,0.7677,0.8473, 1.068,0.7677,0.6994, 1.2,0.71,1.582, 1.2,0.63,1.716, 1.061,0.7673,0.6994, 1.061,0.7674,0.6994, 0,0.1126,0, 1.25,1.703,1.25
+    cube = 1, 1.498,0.7444,0.8578, 1.498,0.721,0.9836, 1.234,0.9966,0.2519, 1.234,0.4147,1.423, 1.535,0.7475,0.7262, 1.535,0.7471,0.7205, 0,0.1194,1.788E-07, 1.258,1.689,1.258
+    cube = 2, 1.075,0.768,0.7165, 1.075,0.7679,0.6994, 1.2,0.42,1.582, 1.2,0.40,1.657, 1.069,0.7671,0.6994, 1.069,0.7672,0.6994, 0,0.1126,0, 1.25,1.703,1.25
+  }
+  !fx_exhaustFlame_blue = DELETE
+  !fx_exhaustLight_blue = DELETE
+  !fx_smokeTrail_light = DELETE
+  !fx_exhaustSparks_flameout = DELETE
+  !sound_vent_medium = DELETE
+  !sound_rocket_hard = DELETE
+  !sound_vent_soft = DELETE
+  !sound_explosion_low = DELETE
+  EFFECTS
+  {
+    engage
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_vent_medium
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    flameout
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_explosion_low
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    fx-swivel-running
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_rocket_hard
+        volume = 0.0 0.0
+        volume = 0.01 0.4
+        volume = 1.0 1.0
+        pitch = 0.0 0.2
+        pitch = 0.01 0.6
+        pitch = 1.0 1.8
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = core
+        modelName = ReStock/FX/restock-fx-swivel-core-1
+        transformName = fxTransformCore
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = plume
+        modelName = ReStock/FX/restock-fx-swivel-plume-1
+        transformName = fxTransformPlume
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.35
+        speed = 1.0 1.0
+      }
+      PREFAB_PARTICLE
+      {
+        prefabName = fx_smokeTrail_light
+        transformName = smokePoint
+        emission = 0.0 0.0
+        emission = 0.05 0.0
+        emission = 0.075 0.25
+        emission = 1.0 1.25
+        speed = 0.0 0.25
+        speed = 1.0 1.0
+        localOffset = 0, 0, 0
+      }
+    }
+  }
+  @MODULE[ModuleEngines]
+  {
+    @name = ModuleEnginesFX
+    %runningEffectName = fx-swivel-running
+  }
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Size1
+    VARIANT
+    {
+      name = Size1
+      displayName = #LOC_Restock_variant-engine_size1_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = false
+        LV_T45_Basic = true
+        LV_T45_Compact = false
+        T45_Piston001 = true
+        T45_Piston002 = true
+        T45_Piston003 = false
+        T45_Piston004 = false
+        Engine = true
+        EngineBoattail = false
+        fairing = true
+        ShroudT45_Compact = false
+        fairingWhite = true
+        ShroudT45_CompactWhite = true
+        Frame_Boat = true
+        fairingOrange = false
+        ShroudT45_CompactOrange = false
+        Frame_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = true
+        LV_T45_Basic = false
+        LV_T45_Compact = false
+        T45_Piston001 = false
+        T45_Piston002 = false
+        T45_Piston003 = false
+        T45_Piston004 = false
+        Engine = false
+        EngineBoattail = true
+        fairing = false
+        ShroudT45_Compact = false
+        fairingWhite = true
+        ShroudT45_CompactWhite = true
+        Frame_Boat = true
+        fairingOrange = false
+        ShroudT45_CompactOrange = false
+        Frame_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Compact
+      displayName = #LOC_Restock_variant-engine_compact_white
+      primaryColor = #666666
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = false
+        LV_T45_Basic = false
+        LV_T45_Compact = true
+        T45_Piston001 = false
+        T45_Piston002 = false
+        T45_Piston003 = true
+        T45_Piston004 = true
+        Engine = true
+        EngineBoattail = false
+        fairing = false
+        ShroudT45_Compact = true
+        fairingWhite = true
+        ShroudT45_CompactWhite = true
+        Frame_Boat = true
+        fairingOrange = false
+        ShroudT45_CompactOrange = false
+        Frame_BoatOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Size1_Alternate
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #999999
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = false
+        LV_T45_Basic = true
+        LV_T45_Compact = false
+        T45_Piston001 = true
+        T45_Piston002 = true
+        T45_Piston003 = false
+        T45_Piston004 = false
+        Engine = true
+        EngineBoattail = false
+        fairing = true
+        ShroudT45_Compact = false
+        fairingWhite = false
+        ShroudT45_CompactWhite = false
+        Frame_Boat = false
+        fairingOrange = true
+        ShroudT45_CompactOrange = true
+        Frame_BoatOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Boattail_Alternate
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
+      secondaryColor = #666666
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = true
+        LV_T45_Basic = false
+        LV_T45_Compact = false
+        T45_Piston001 = false
+        T45_Piston002 = false
+        T45_Piston003 = false
+        T45_Piston004 = false
+        Engine = false
+        EngineBoattail = true
+        fairing = false
+        ShroudT45_Compact = false
+        fairingWhite = false
+        ShroudT45_CompactWhite = false
+        Frame_Boat = false
+        fairingOrange = true
+        ShroudT45_CompactOrange = true
+        Frame_BoatOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Compact_Alternate
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        LV_T45_Boattail = false
+        LV_T45_Basic = false
+        LV_T45_Compact = true
+        T45_Piston001 = false
+        T45_Piston002 = false
+        T45_Piston003 = true
+        T45_Piston004 = true
+        Engine = true
+        EngineBoattail = false
+        fairing = false
+        ShroudT45_Compact = true
+        fairingWhite = false
+        ShroudT45_CompactWhite = false
+        Frame_Boat = false
+        fairingOrange = true
+        ShroudT45_CompactOrange = true
+        Frame_BoatOrange = true
+      }
+    }
+  }
+  @MODULE[ModuleJettison]
+  {
+    @jettisonName = fairing,ShroudT45_Compact
+    useMultipleDragCubes = false
+  }
+  @MODULE[ModuleGimbal]
+  {
+    @gimbalTransformName = Gimbal
+    gimbalResponseSpeed = 8
+    useGimbalResponseSpeed = true
+  }
+  MODULE
+  {
+    name = FXModuleLookAtConstraint
+    // Basic
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_PistonTop001
+      rotatorsName = T45_Piston001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_PistonTop002
+      rotatorsName = T45_Piston002
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_Piston001
+      rotatorsName = T45_PistonTop001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_Piston002
+      rotatorsName = T45_PistonTop002
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_PistonTop004
+      rotatorsName = T45_Piston003
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_PistonTop003
+      rotatorsName = T45_Piston004
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_Piston001
+      rotatorsName = T45_PistonTop004
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = T45_Piston002
+      rotatorsName = T45_PistonTop003
+    }
+  }
+  !MODULE[FXModuleAnimateThrottle] {}
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = throttleColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.025
+    shaderProperty = _EmissiveColor
+    excludedRenderer = EngineCoreT45Glow
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = throttleColor
+    animRate = 1
+    shaderProperty = _TintColor
+    includedRenderer = EngineCoreT45Glow
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 1
+      key = 1 1
+    }
+    greenCurve
+    {
+      key = 0 1
+      key = 1 1
+    }
+    blueCurve
+    {
+      key = 0 1
+      key = 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg

@@ -6,7 +6,7 @@
 // - Mk2 Command Pod (Mk2Pod)
 
 //  KV-1
-@PART[kv1Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[kv1Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Well
   !mesh = DELETE
@@ -60,7 +60,7 @@
 }
 
 //  KV-2
-@PART[kv2Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[kv2Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Well
   !mesh = DELETE
@@ -114,7 +114,7 @@
 }
 
 //  KV-3
-@PART[kv3Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[kv3Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Well
   !mesh = DELETE
@@ -168,7 +168,7 @@
 }
 
 // MK-2
-@PART[Mk2Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[Mk2Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE