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

.github/CODEOWNERS

@@ -9,12 +9,17 @@
 /code/modules/shuttle/ @MarkSuckerberg
 /code/modules/overmap/ @MarkSuckerberg
 
-# triplezeta
-/icons/ @triplezeta
-/whitesands/icons/ @triplezeta
+# Teams
+
+# Map Maintainers
+/_maps/ @shiptest-ss13/maptainers
+
+# Sprite Maintainers
+/icons/ @shiptest-ss13/spritetainers
+/whitesands/icons/ @shiptest-ss13/spritetainers
 
 # CI and tool chains
-/tools/ @MarkSuckerberg @ZephyrTFA
+/tools/ @shiptest-ss13/admins
 
 #SIC SEMPER TYRANNIS
 /_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MarkSuckerberg

_maps/configs/tranq.json

@@ -0,0 +1,36 @@
+{
+	"map_name": "Tranquility-class Flying Apartment Complex",
+	"prefix": "ISV",
+	"namelists": ["GENERAL", "SPACE", "NATURAL"],
+	"map_short_name": "Tranquility-class",
+	"map_path": "_maps/shuttles/shiptest/tranq.dmm",
+	"map_id": "tranq",
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/captain/western",
+			"officer": true,
+			"slots": 1
+		},
+		"Scholar": {
+			"outfit": "/datum/outfit/job/curator/librarian",
+			"slots": 1
+			},
+		"Medical Tenant": {
+			"outfit": "/datum/outfit/job/chemist/pharmacologist",
+			"slots": 1
+			},
+		"Engineering Tenant": {
+			"outfit": "/datum/outfit/job/engineer/electrician",
+			"slots": 1
+		},
+		"Tenant": {
+			"outfit": "/datum/outfit/job/curator/dungeonmaster",
+			"slots": 1
+		},
+		"Resident Artist": {
+			"outfit": "/datum/outfit/job/assistant/artist",
+			"slots": 1
+		}
+	},
+	"cost": 1000
+}