Merge branch 'master' into probes

This commit is contained in:
Chris Adderley
2019-01-13 23:39:09 -08:00
187 changed files with 3762 additions and 975 deletions

View File

@ -1,10 +1,14 @@
// Patches applying art changes to crewed command parts
// Contents:
// - PPD-12 Cupola Module (cupola)
// - Mk1-3 Command Pod (mk1-3pod)
// - Mk1 Lander Can (landerCabinSmall)
// - Mk2 Lander Can (mk2LanderCabin_v2)
// Cupola
@PART[cupola]:FOR[zzzzStationParts]
@PART[cupola]
{
@author = Chris Adderley
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL,* {}
!MODULE[ModuleAnimateGeneric] {}
@ -22,4 +26,73 @@
scale = 1,-1,1
rotation = 0, 0, 0
}
}
}
@PART[mk1-3pod]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL,* {}
!MODULE[ModuleAnimateGeneric] {}
MODEL
{
model = ReStock/Assets/Command/restock-mk1-3-pod
position = 0.0, 0.0, 0.0
scale = 1,1,1
rotation = 0, 0, 0
}
}
@PART[landerCabinSmall]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL,* {}
!MODULE[ModuleAnimateGeneric] {}
MODEL
{
model = ReStock/Assets/Command/restock-mk1-lander
position = 0.0, 0.0, 0.0
scale = 1,1,1
rotation = 0, 0, 0
}
}
@PART[mk2LanderCabin_v2]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL,* {}
MODEL
{
model = ReStock/Assets/Command/restock-mk2-lander
position = 0.0, 0.0, 0.0
scale = 1,1,1
rotation = 0, 0, 0
}
@MODULE[ModulePartVariants]
{
@VARIANT[Rover]
{
!GAMEOBJECTS {}
GAMEOBJECTS
{
Mk2RoverMode = true
Mk2LanderMode = false
COLLIDERS_ROVER = true
COLLIDERS_LANDER = false
}
}
@VARIANT[Lander]
{
!GAMEOBJECTS {}
GAMEOBJECTS
{
Mk2RoverMode = false
Mk2LanderMode = true
COLLIDERS_ROVER = true
COLLIDERS_LANDER = true
}
}
}
}