Merge branch 'master' into vostok-integration

This commit is contained in:
2020-05-05 02:14:26 -07:00
223 changed files with 11912 additions and 5937 deletions

View File

@ -27,7 +27,6 @@
themeName = Metal
primaryColor = #6f6e6d
secondaryColor = #6f6e6d
GAMEOBJECTS
{
Decoupler1875White = false
@ -66,7 +65,7 @@
}
}
// Truss Decoupler
// Size 1.5 Decoupler
@PART[Size1p5_Strut_Decoupler]:HAS[~RestockIgnore[*]]:FOR[ReStock]
{
@author = Chris Adderley (Nertea)
@ -77,12 +76,10 @@
model = ReStock/Assets/Coupling/restock-decoupler-1875-truss-1
}
%rescaleFactor = 1
!MODULE[ModulePartVariants] {}
MODULE
{
name = ModulePartVariants
useMultipleDragCubes = false
baseVariant = Gray
VARIANT
@ -114,7 +111,6 @@
}
}
// TD-50 Decoupler
@PART[Decoupler_4]:HAS[~RestockIgnore[*]]:FOR[ReStock]
{
@ -138,7 +134,6 @@
themeName = BlackAndWhite
primaryColor = #ffffff
secondaryColor = #000000
GAMEOBJECTS
{
5mDecoupler = true
@ -158,6 +153,5 @@
5mDecouplerOrange = true
}
}
}
}
}

View File

@ -1,7 +1,7 @@
// Patches applying art changes to Making History separators
// Contents:
- TS-18 Separator (Separator_1p5)
- TS-50 Separator (Separator_4)
// - TS-18 Separator (Separator_1p5)
// - TS-50 Separator (Separator_4)
// TS-18 Separator
@PART[Separator_1p5]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@ -26,7 +26,6 @@
themeName = Metal
primaryColor = #6f6e6d
secondaryColor = #6f6e6d
GAMEOBJECTS
{
Separator1875White = false
@ -65,7 +64,6 @@
}
}
// TS-50 Decoupler
@PART[Separator_4]:HAS[~RestockIgnore[*]]:FOR[ReStock]
{
@ -89,7 +87,6 @@
themeName = BlackAndWhite
primaryColor = #ffffff
secondaryColor = #000000
GAMEOBJECTS
{
5mSeparator = true
@ -109,6 +106,5 @@
5mSeparatorOrange = true
}
}
}
}
}