diff --git a/Assets/CineboxAndrew b/Assets/CineboxAndrew index bae5256f..3b3177ef 160000 --- a/Assets/CineboxAndrew +++ b/Assets/CineboxAndrew @@ -1 +1 @@ -Subproject commit bae5256fe81980f36f213b1a8884629114d1f7b3 +Subproject commit 3b3177ef537039dd18458d0514571157573c41a1 diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1-n.dds index d3a61783..c25c8cec 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1-n.tga deleted file mode 100644 index 22e0baf7..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1-n.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1.dds index e40ed15e..252612d0 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1.tga deleted file mode 100644 index cdc2a077..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-1.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-125-125-x3.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-125-125-x3.mu index 51e3e233..cbd04e7a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-125-125-x3.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-125-125-x3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x2.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x2.mu index a2a67480..038dd896 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x3.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x3.mu index 9d22ce61..52192984 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x3.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x4.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x4.mu index 761d5168..669d8858 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x4.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-multicoupler-25-125-x4.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg index 975842ee..22484cf9 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg @@ -166,7 +166,7 @@ VARIANT { name = Orange - displayName = #autoLOC_8007121 + displayName = #autoLOC_8007123 themeName = Orange primaryColor = #f49841 secondaryColor = #4c4f47 @@ -246,7 +246,7 @@ VARIANT { name = Orange - displayName = #autoLOC_8007121 + displayName = #autoLOC_8007123 themeName = Orange primaryColor = #f49841 secondaryColor = #4c4f47 @@ -326,7 +326,7 @@ VARIANT { name = Orange - displayName = #autoLOC_8007121 + displayName = #autoLOC_8007123 themeName = Orange primaryColor = #f49841 secondaryColor = #4c4f47 diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index 1e0faae8..4d8289ce 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -85,6 +85,7 @@ Squad/Parts/Structural/stationHub/ Squad/Parts/Structural/structuralMicronode/ Squad/Parts/Structural/strutCubicOcto/ Squad/Parts/Structural/strutOcto/ +Squad/Parts/Structural/stackAdapters/ Squad/Parts/Utility/DirectAntennas/ Squad/Parts/Utility/commDish88-88/ Squad/Parts/Utility/commsAntennaDTS-M1/ @@ -111,6 +112,7 @@ Squad/Parts/Utility/ServiceBay/ Squad/Parts/Utility/spotLightMk1/ Squad/Parts/Utility/spotLightMk2/ Squad/Parts/Utility/launchEscapeSystem/ +Squad/Parts/Utility/stackCouplers/ Squad/Parts/Resources/RadialTank/ Squad/Parts/Resources/SmallTank/ Squad/Parts/Resources/LargeTank/ diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 0d865e1b..19d99f05 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -13,6 +13,12 @@ - M-Beam 200 I-Beam (Nertea): now has Basic, Truss, Insulated variants - M-Beam 200 I-Beam Pocket Edition (Nertea): now has Basic, Truss, Insulated variants - M-Beam 650 I-Beam (Nertea): now has Basic, Truss, Insulated variants + - TVR-200L Stack Bi-Adapter (Andrew) + - TVR-300L Stack Tri-Adapter (Andrew) + - TVR-400L Stack Quad-Adapter (Andrew) + - TVR-200 Stack Bi-Coupler (Andrew) + - TVR-300 Stack Tri-Coupler (Andrew) + - TVR-400 Stack Quad-Coupler (Andrew) - Resources - 'Drill-O-Matic' Mining Excavator (Andrew Cassidy) - 'Drill-O-Matic Junior' Mining Excavator (Andrew Cassidy)