Merge remote-tracking branch 'upstream/master' into the-shipgraveyard

shiptest-ss13 · Oct 21, 2023 · 7d60473 · 7d60473
2 parents 9264fda + 5a2c786
commit 7d60473
Show file tree

Hide file tree

Showing 13 changed files with 8,026 additions and 9 deletions.
diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt
@@ -129,6 +129,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		Size = (x = 100)(y = 75)(z = 1)
 		Tags = "Medium Combat Challenge", "Major Loot", "Hazardous", "Liveable"
 
+		File Name "_maps\RandomRuins\JungleRuins\jungle_cavecrew
+		Size = (x = 43)(y = 63)(z = 1)
+		Tags = "Medium Combat Challenge", "Hazardous", "Liveable", "Major Loot"
+
 		File Name "_maps\RandomRuins\JungleRuins\jungle_abandoned_library
 		Size = (x = 36)(y = 35)(z = 1)
 		Tags = "Medium Combat Challenge", "Medium Loot", "Antag Gear", "Necropolis Loot", "Liveable"

diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
@@ -3,6 +3,11 @@ Size = "1x3"
 Purpose = "Showing people how to fill this document in"
 File Path = "_maps\shuttles\subshuttles\example.dmm"
 
+Name = "Gut Combat Freighter"
+Size = "7x15"
+Purpose = "Transporting goods, while fending for itself"
+File Path = "_maps\shuttles\subshuttles\frontiersmen_gut"
+
 Name = "Kunai Dropship"
 Size = "12x7"
 Purpose = "A multi-role dropship used by almost every group faring space. Its ease of manufacture and high mobility makes it ideal for transport."