diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1-n.dds new file mode 100644 index 00000000..7f4fa87c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1-n.tga deleted file mode 100644 index e9a31e6c..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1-n.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.dds new file mode 100644 index 00000000..61642483 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.mu index abf74b44..10b099ee 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.tga deleted file mode 100644 index d258773b..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-accelerometer.mu b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-accelerometer.mu index ac0d299a..bb39f651 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-accelerometer.mu and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-accelerometer.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-625-1.mu index 3c41e58a..7c35a4d0 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-625-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-radial-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-radial-1.mu index e72bed0b..6823a909 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-radial-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-radial-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-gravimeter.mu b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-gravimeter.mu index 863d39d0..49042de1 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-gravimeter.mu and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-gravimeter.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments-N.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments-N.dds new file mode 100644 index 00000000..f2ac48a4 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments-N.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments-N.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments-N.tga deleted file mode 100644 index 233b297e..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments-N.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments.dds new file mode 100644 index 00000000..270ed41c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments.tga deleted file mode 100644 index 42aec2e0..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-125-1.mu index c2b9d977..8007d4f7 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-125-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.dds new file mode 100644 index 00000000..901a461e Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.tga deleted file mode 100644 index 1d772964..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.dds new file mode 100644 index 00000000..64837d39 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.tga deleted file mode 100644 index 32e8185c..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.dds new file mode 100644 index 00000000..92aa440c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.tga deleted file mode 100644 index c82dfe04..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.dds new file mode 100644 index 00000000..008a0a8f Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.tga deleted file mode 100644 index acd27297..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.dds new file mode 100644 index 00000000..d3aa8e29 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.tga deleted file mode 100644 index 3001c587..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.dds new file mode 100644 index 00000000..e01e5663 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.tga deleted file mode 100644 index be31321e..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1-e.dds new file mode 100644 index 00000000..b7276340 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1-n.dds new file mode 100644 index 00000000..ae2da3fb Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1.dds new file mode 100644 index 00000000..212363a0 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-radial.mu b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-radial.mu new file mode 100644 index 00000000..e8bfb2c1 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-radial.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg b/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg index 6fd18b28..b6c6ef24 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg @@ -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 + } } \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index 4d80ae03..2edd29aa 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -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/