Merge branch 'master' into develop

This commit is contained in:
Chris Adderley
2020-08-02 08:04:56 -07:00
committed by GitHub
106 changed files with 622 additions and 278 deletions

View File

@ -3,7 +3,7 @@
// - IX-6315 "Dawn" Electric Propulsion System (ionEngine)
// IX-6315 "Dawn" Electric Propulsion System
@PART[ionEngine]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[ionEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE

View File

@ -3,7 +3,7 @@
// - CR-7 R.A.P.I.E.R. Engine (RAPIER)
// CR-7 R.A.P.I.E.R. Engine
@PART[RAPIER]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[RAPIER]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE

View File

@ -7,7 +7,7 @@
// - O-10 "Puff" MonoPropellant Fuel Engine (omsEngine)
// LV-1 "Ant" Liquid Fuel Engine
@PART[microEngine_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[microEngine_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -197,7 +197,7 @@
}
// LV-1R "Spider" Liquid Fuel Engine
@PART[radialEngineMini_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[radialEngineMini_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -374,7 +374,7 @@
}
// 48-7S "Spark" Liquid Fuel Engine
@PART[liquidEngineMini_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[liquidEngineMini_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -830,7 +830,7 @@
}
// 24-77 "Twitch" Liquid Fuel Engine
@PART[smallRadialEngine_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[smallRadialEngine_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -1188,7 +1188,7 @@
}
// O-10 "Puff" MonoPropellant Fuel Engine
@PART[omsEngine]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[omsEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE

View File

@ -9,7 +9,7 @@
// - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike) - FX only
// LV-N "Nerv" Atomic Rocket Motor
@PART[nuclearEngine]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[nuclearEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -236,7 +236,7 @@
}
// S3 KS-25 "Vector" Liquid Fuel Engine
@PART[SSME]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[SSME]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -573,7 +573,7 @@
}
// LV-909 "Terrier" Liquid Fuel Engine
@PART[liquidEngine3_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[liquidEngine3_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Porkjet and Chris Adderley (Nertea)
!mesh = DELETE
@ -904,7 +904,7 @@
}
// LV-T30 "Reliant" Liquid Fuel Engine
@PART[liquidEngine]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[liquidEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Porkjet and Chris Adderley (Nertea)
!mesh = DELETE
@ -1245,7 +1245,7 @@
}
// LV-T45 "Swivel" Liquid Fuel Engine
@PART[liquidEngine2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[liquidEngine2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Porkjet and Chris Adderley (Nertea)
!mesh = DELETE
@ -1659,7 +1659,7 @@
}
// Mk-55 "Thud" Liquid Fuel Engine (FX only)
@PART[radialLiquidEngine1-2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[radialLiquidEngine1-2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
!fx_exhaustFlame_blue_small = DELETE
!fx_exhaustLight_blue = DELETE
@ -1739,7 +1739,7 @@
}
// T-1 Toroidal "Aerospike" Liquid Fuel Engine (FX only)
@PART[toroidalAerospike]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[toroidalAerospike]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
!fx_exhaustFlame_blue = DELETE
!fx_exhaustLight_blue = DELETE

View File

@ -6,7 +6,7 @@
// - RE-I5 "Skipper" Liquid Fuel Engine (engineLargeSkipper_v2)
// RE-L10 "Poodle" Liquid Fuel Engine
@PART[liquidEngine2-2_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[liquidEngine2-2_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea) and riocrokite
%node_attach = 0.0, 0, 0.0, 0.0, 1.0, 0.0, 2
@ -562,7 +562,7 @@
}
// LFB KR-1x2 "Twin-Boar" Liquid Fuel Engine
@PART[Size2LFB]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Size2LFB]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -808,7 +808,7 @@
}
// RE-M3 "Mainsail" Liquid Fuel Engine [1.9]
@PART[liquidEngineMainsail_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[liquidEngineMainsail_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea) and riocrokite
%node_attach = 0.0, 1.01359, 0.0, 0.0, 1.0, 0.0, 2
@ -1307,7 +1307,7 @@
}
// RE-I5 "Skipper" Liquid Fuel Engine [1.9]
@PART[engineLargeSkipper_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[engineLargeSkipper_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea) and riocrokite
%node_attach = 0.0, 1.013, 0.0, 0.0, 1.0, 0.0, 2

View File

@ -4,7 +4,7 @@
// - S3 KS-25x4 "Mammoth" Liquid Fuel Engine (Size3EngineCluster)
// Kerbodyne KR-2L+ "Rhino" Liquid Fuel Engine
@PART[Size3AdvancedEngine]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Size3AdvancedEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -268,7 +268,7 @@
}
// S3 KS-25x4 "Mammoth" Liquid Fuel Engine
@PART[Size3EngineCluster]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Size3EngineCluster]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE

View File

@ -4,7 +4,7 @@
// - F3S0 'Shrimp' SRB ()
// FM1 'Mite' SRB
@PART[Mite]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Mite]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -177,7 +177,7 @@
}
// F3S0 'Shrimp' SRB
@PART[Shrimp]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Shrimp]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE

View File

@ -8,7 +8,7 @@
// - Launch Escape System (LaunchEscapeSystem)
// S1 SRB-KD25k "Kickback" Solid Fuel Booster
@PART[MassiveBooster]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[MassiveBooster]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -219,7 +219,7 @@
}
// BACC "Thumper" Solid Fuel Booster
@PART[solidBooster1-1]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[solidBooster1-1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -363,7 +363,7 @@
}
// RT-10 "Hammer" Solid Fuel Booster
@PART[solidBooster_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[solidBooster_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -524,7 +524,7 @@
}
// RT-5 "Flea" Solid Fuel Booster
@PART[solidBooster_sm_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[solidBooster_sm_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -684,7 +684,7 @@
}
// Separatron I
@PART[sepMotor1]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[sepMotor1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE

View File

@ -4,7 +4,7 @@
// - S2-33 'Clydesdale' SRB (Clydesdale)
// S2-17 'Thoroughbred' SRB
@PART[Thoroughbred]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Thoroughbred]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -200,7 +200,7 @@
}
// S2-33 'Clydesdale' SRB
@PART[Clydesdale]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@PART[Clydesdale]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE