Merge branch 'master' into movphysics

_maps/configs/independent_shetland.json

@@ -7,18 +7,17 @@
 		"NATURAL"
 	],
 	"map_short_name": "Shetland-class",
-	"description": "The Shetland is Miskilamo Spacefaring’s flagship offer and one of their only truly original designs: A huge frigate offering a diverse array of facilities with ample room for expansion at a fraction of the price of the competition. Optimistic customers soon discover the haphazard workmanship and extreme cost-cutting measures common to Miskilamo ships. While Shetlands have plenty of room and a theoretically diverse array of facilities, they come with the minimal amount of equipment needed for those facilities, and a wide array of design deficiencies have given them a grim reputation for driving their crews to paranoid extremes. The waste disposal catapult is a frequent feature of such tales, and supposedly a great many Shetland crewmates have met their end by ejection.",
+	"description": "The Shetland is Miskilamo Spacefaring’s flagship offer and one of their only truly original designs: A huge frigate offering a diverse array of facilities with ample room for expansion at a fraction of the price of the competition. Optimistic customers soon discover the haphazard workmanship and extreme cost-cutting measures common to Miskilamo ships. While Shetlands have plenty of room and a theoretically diverse array of facilities, they come with the minimal amount of equipment needed for those facilities, and a wide array of design deficiencies have given them a grim reputation for driving their crews to paranoid extremes. The waste disposal chute is a frequent feature of such tales, and supposedly a great many Shetland crewmates have met their end by ejection.",
 	"tags": [
 		"Generalist",
-		"Service",
-		"Medical"
+		"Service"
 	],
 	"map_path": "_maps/shuttles/independent/independent_shetland.dmm",
 	"map_id": "independent_shetland",
 	"roundstart": true,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/independent/captain",
+			"outfit": "/datum/outfit/job/independent/captain/cheap",
 			"officer": true,
 			"slots": 1
 		},
@@ -31,37 +30,21 @@
 			"outfit": "/datum/outfit/job/independent/doctor",
 			"slots": 1
 		},
-		"Paramedic": {
-			"outfit": "/datum/outfit/job/independent/paramedic",
-			"slots": 1
-		},
 		"Ship's Engineer": {
 			"outfit": "/datum/outfit/job/independent/engineer",
-			"slots": 1
-		},
-		"Atmospheric Technician": {
-			"outfit": "/datum/outfit/job/independent/atmos",
-			"slots": 1
-		},
-		"Asteroid Miner": {
-			"outfit": "/datum/outfit/job/independent",
 			"slots": 2
 		},
-		"Security Detail": {
-			"outfit": "/datum/outfit/job/independent/security",
-			"slots": 1
-		},
-		"Detective": {
-			"outfit": "/datum/outfit/job/independent/detective",
+		"Asteroid Miner": {
+			"outfit": "/datum/outfit/job/independent/miner/hazard",
 			"slots": 1
 		},
-		"Janitor": {
-			"outfit": "/datum/outfit/job/independent/janitor",
+		"Security Detail": {
+			"outfit": "/datum/outfit/job/independent/security/western",
 			"slots": 1
 		},
 		"Deckhand": {
 			"outfit": "/datum/outfit/job/independent/assistant",
-			"slots": 5
+			"slots": 3
 		}
 	},
 	"enabled": true