Merge branch 'master' of https://github.com/PorktoberRevolution/ReStocked

2024-09-01 17:34:42 +00:00 · 2019-02-28 16:34:44 -08:00
parent 0b70659c8b 33fcf5442e
commit a5944d8193
32 changed files with 12 additions and 8 deletions
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-GCMS-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-accelerometer.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-accelerometer.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-625-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-625-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-radial-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-radial-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-gravimeter.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-gravimeter.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments-N.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments-N.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments-N.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments-N.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-instruments.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-125-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-125-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-radial.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-sciencebox-radial.mu