Merge branch 'science'

This commit is contained in:
Andrew Cassidy 2019-02-28 13:01:17 -08:00
commit 33fcf5442e
No known key found for this signature in database
GPG Key ID: 963017B38FD477A1
32 changed files with 12 additions and 8 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 512 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 512 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 512 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 512 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 512 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

View File

@ -7,6 +7,7 @@
// - Mystery Goo™ Containment Unit (GooExperiment)
// - SC-9001 Science Jr. (science_module)
// - Atmospheric Fluid Spectro-Variometer (sensorAtmosphere)
// - Experiment Storage Unit (ScienceBox)
// Thermometer
@PART[sensorThermometer] {
@ -116,4 +117,14 @@
MODEL {
model = ReStock/Assets/Science/restock-GCMS-1
}
}
// Experiment Storage Unit
@PART[ScienceBox] {
@author = Andrew Cassidy
!MODEL {}
MODEL {
model = ReStock/Assets/Science/restock-sciencebox-radial
}
}

View File

@ -68,14 +68,7 @@ Squad/Parts/FuelTank/xenonTankLarge/
Squad/Parts/FuelTank/xenonTankRadial/
Squad/Parts/Misc/AsteroidDay/HECS2.mu
Squad/Parts/Misc/AsteroidDay/hecs*.dds
Squad/Parts/Science/AtmosphereSensor/
Squad/Parts/Science/GooExperiment/
Squad/Parts/Science/LargeCrewedLab/
Squad/Parts/Science/MaterialBay/
Squad/Parts/Science/sensorAccelerometer/
Squad/Parts/Science/sensorBarometer/
Squad/Parts/Science/sensorGravimeter/
Squad/Parts/Science/sensorThermometer/
Squad/Parts/Science/
Squad/Parts/Structural/FLAdapters/
Squad/Parts/Structural/Size3To2Adapter_v2/
Squad/Parts/Structural/structuralMicronode/