Merge remote-tracking branch 'upstream/master' into ert

shiptest-ss13 · Oct 22, 2023 · 3945ca3 · 3945ca3
2 parents 1298258 + 498d1b3
commit 3945ca3
Show file tree

Hide file tree

Showing 84 changed files with 50,408 additions and 25,075 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"