Merge branch 'ir-camera' into develop

This commit is contained in:
Andrew Cassidy 2019-09-04 20:41:08 -07:00
commit f8e70a457f
No known key found for this signature in database
GPG Key ID: 963017B38FD477A1
7 changed files with 56 additions and 4 deletions

@ -1 +1 @@
Subproject commit 46dced1f4462aacea5bb00540d3e28d5e162d815
Subproject commit 4691b8f2e0b1e266bb917ae402c874bdc150d16e

View File

@ -46,6 +46,9 @@ Localization
#LOC_Restock_variant-antenna_axial = Axial
#LOC_Restock_variant-antenna_axial_reverse = Axial (Reversed)
#LOC_Restock_variant-telescope_shielded = Shielded
#LOC_Restock_variant-telescope_bare = Bare
#LOC_Restock_variant-surface_metal = Metal
#LOC_Restock_variant-surface_basic = Basic
#LOC_Restock_variant-surface_truss = Truss

View File

@ -8,6 +8,8 @@
// - SC-9001 Science Jr. (science_module)
// - Atmospheric Fluid Spectro-Variometer (sensorAtmosphere)
// - Experiment Storage Unit (ScienceBox)
// - SENTINEL Infrared Telescope (InfraredTelescope)
// Thermometer
@PART[sensorThermometer]
@ -132,4 +134,53 @@
{
model = ReStock/Assets/Science/restock-sciencebox-radial-1
}
}
// SENTINEL Infrared Telescope
@PART[InfraredTelescope]
{
@author = Andrew Cassidy
!MODEL {}
MODEL
{
model = ReStock/Assets/Science/restock-sentinel-1
}
@MODULE[FlagDecal]
{
textureQuadName = FlagTransform
}
MODULE
{
name = ModulePartVariants
baseVariant = Shielded
VARIANT
{
name = Shielded
displayName = #LOC_Restock_variant-telescope_shielded
themeName = White
primaryColor = #ffffff
secondaryColor = #202020
GAMEOBJECTS
{
Telescope_Bare = false
Telescope_Shielded = true
}
}
VARIANT
{
name = Bare
displayName = #LOC_Restock_variant-telescope_bare
themeName = White
primaryColor = #707070
secondaryColor = #202020
GAMEOBJECTS
{
Telescope_Bare = true
Telescope_Shielded = false
}
}
}
}

View File

@ -77,8 +77,7 @@ Squad/Parts/FuelTank/Size3Tanks/
Squad/Parts/FuelTank/xenonTank/
Squad/Parts/FuelTank/xenonTankLarge/
Squad/Parts/FuelTank/xenonTankRadial/
Squad/Parts/Misc/AsteroidDay/HECS2.mu
Squad/Parts/Misc/AsteroidDay/hecs*.dds
Squad/Parts/Misc/AsteroidDay/
Squad/Parts/Science/
Squad/Parts/Structural/FLAdapters/
Squad/Parts/Structural/Size3To2Adapter_v2/
@ -90,7 +89,6 @@ Squad/Parts/Utility/DirectAntennas/
Squad/Parts/Utility/commDish88-88/
Squad/Parts/Utility/commsAntennaDTS-M1/
Squad/Parts/Utility/commsDish16/
Squad/Parts/Misc/AsteroidDay/HighGainAntenna.mu
Squad/Parts/Utility/dockingPort/
Squad/Parts/Utility/dockingPortInline/
Squad/Parts/Utility/dockingPortJr/