Merge branch 'master' into outpost

_maps/configs/cybersun_nimbus.json

@@ -0,0 +1,40 @@
+{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"map_name": "712-Y Nimbus-class Caravel",
+	"faction": "/datum/faction/syndicate/cybersun",
+	"prefix": "CSSV",
+	"manufacturer": "ISF Spacecraft",
+	"map_short_name": "Nimbus-Class",
+	"description": "An extremely compact vessel designed by Cybersun and manufactured by ISF Spacecraft for the civilian market. The Nimbus makes use of high quality components and professional craftsmanship to deliver an incomparably smooth flying experience. That is at the least, what advertisements claim. Most pilots praise the speed and manueverability, but have found the vessel's internal workings to require extensive work to access and modify, making the Nimbus an easy choice for people who don't have to modify their own craft.",
+	"tags": [
+		"Combat",
+		"Engineering",
+		"Specialist"
+	],
+	"map_path": "_maps/shuttles/cybersun/cybersun_nimbus.dmm",
+	"namelists": [
+		"SPACE",
+		"BEASTS"
+	],
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/syndicate/captain/cybersun",
+			"officer": true,
+			"slots": 1
+		},
+		"Troubleshooter": {
+			"outfit": "/datum/outfit/job/syndicate/miner/cybersun",
+			"officer": true,
+			"slots": 2
+		},
+		"Technician": {
+			"outfit": "/datum/outfit/job/syndicate/engineer/cybersun",
+			"slots": 1
+		},
+		"Ship's Aide": {
+			"outfit": "/datum/outfit/job/syndicate/assistant/cybersun",
+			"slots": 1
+		}
+	},
+	"enabled": true
+}

_maps/configs/syndicate_ngr_haboob.json

@@ -0,0 +1,50 @@
+{
+	"faction": "/datum/faction/syndicate/ngr",
+	"prefix": "NGRV",
+	"manufacturer": "Hardline Salvage and Mining",
+	"namelists": [
+		"GORLEX",
+		"NATURAL_AGGRESSIVE",
+		"BEASTS",
+		"WEAPONS"
+	],
+	"map_name": "Haboob-class Patrol Boat",
+	"map_short_name": "Haboob-class",
+	"description": "The Haboob-class is a Post ICW Ship commissioned by the NGR, made to patrol the fringes of NGR claimed space. Due to its quick response time and moderate armory, it has become relatively renowned for being able to pursue pirates and other nefarious ilk out of NGR territory near-flawlessly.",
+	"tags": [
+		"RP Focus",
+		"Combat"
+	],
+	"map_path": "_maps/shuttles/syndicate/syndicate_ngr_haboob.dmm",
+	"map_id": "syndicate_gorlex_haboob",
+	"limit": 1,
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/syndicate/captain/ngr",
+			"officer": true,
+			"slots": 1
+		},
+		"Lieutenant": {
+			"outfit": "/datum/outfit/job/syndicate/hos/ngr",
+			"officer": true,
+			"slots": 1
+		},
+		"Mechanic": {
+			"outfit": "/datum/outfit/job/syndicate/engineer/ngr",
+			"slots": 1
+		},
+		"Wrecker": {
+			"outfit": "/datum/outfit/job/syndicate/miner/ngr",
+			"slots":1
+		},
+		"Operative": {
+			"outfit": "/datum/outfit/job/syndicate/security/ngr",
+			"slots": 1
+		},
+		"Initiate": {
+			"outfit": "/datum/outfit/job/syndicate/assistant/ngr",
+			"slots": 1
+		}
+	},
+	"enabled": true
+}