Merge branch 'shiptest-ss13:master' into master

goober3 · Jun 19, 2023 · 9adb81e · 9adb81e
2 parents a49a75b + eca694f
commit 9adb81e
Show file tree

Hide file tree

Showing 15 changed files with 1,215 additions and 4,298 deletions.
diff --git a/_maps/configs/independent_solar.json b/_maps/configs/independent_solar.json
diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json
@@ -17,6 +17,11 @@
 			"officer": true,
 			"slots": 1
 		},
+		"Master At Arms": {
+			"outfit": "/datum/outfit/job/warden/inteq",
+			"officer": true,
+			"slots": 1
+		},
 		"Artificer": {
 			"outfit": "/datum/outfit/job/engineer/inteq",
 			"slots": 1

diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json
@@ -33,15 +33,15 @@
 		},
 		"Corpsman": {
 			"outfit": "/datum/outfit/job/paramedic/inteq",
-			"slots": 1
+			"slots": 2
 		},
 		"Enforcer": {
 			"outfit": "/datum/outfit/job/security/inteq",
 			"slots": 1
 		},
 		"Recruit": {
 			"outfit": "/datum/outfit/job/assistant/inteq",
-			"slots": 7
+			"slots": 4
 		}
 	},
 	"enabled": true