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

_maps/configs/nanotrasen_heron.json

@@ -0,0 +1,78 @@
+{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"prefix": "NTSV",
+	"namelists": ["WEAPONS"],
+	"map_name": "Heron-Class Dreadnaught",
+	"map_short_name": "Heron-class",
+	"map_path": "_maps/shuttles/shiptest/nanotrasen_heron.dmm",
+	"map_id": "nanotrasen_heron",
+	"description": "The Heron-Class is the biggest ship available to NanoTrasen's frontier forces. These vessels served as the flagship of many fleets during the war, serving as a carrier for an operative team, or a command vessel for corporate units. Captains of this vessel were known to retrofit bluespace artillery onto the hangar, and directly fire it during combat. Since the end of the war, it has been repurposed for peacekeeping missions on backline sectors. Though the age of the design is starting to show, it stands as one of the remnants of NanoTrasen's once powerful hold over the cosmos.",
+	"limit": 1,
+	"job_slots": {
+		"Fleet Captain": {
+			"outfit": "/datum/outfit/job/captain/nt/heron",
+			"officer": true,
+			"slots": 1
+		},
+		"First Officer": {
+			"outfit": "/datum/outfit/job/head_of_personnel/nt",
+			"officer": true,
+			"slots": 1
+		},
+		"Head of Security": {
+			"outfit": "/datum/outfit/job/hos/nanotrasen",
+			"officer": true,
+			"slots": 1
+		},
+		"Pilot": {
+			"outfit": "/datum/outfit/job/head_of_personnel/pilot/heron",
+			"officer": true,
+			"slots": 1
+		},
+		"Security Officer": {
+			"outfit": "/datum/outfit/job/security/nanotrasen",
+			"slots": 1
+		},
+		"ERT Officer":{
+			"outfit": "/datum/outfit/job/security/nanotrasen/ert",
+			"slots": 4
+		},
+		"ERT Medical Officer":{
+			"outfit": "/datum/outfit/job/security/nanotrasen/ert/med",
+			"slots": 1
+		},
+		"ERT Engineering Officer":{
+			"outfit": "/datum/outfit/job/security/nanotrasen/ert/engi",
+			"slots": 1
+		},
+		"Mech Pilot":{
+			"outfit": "/datum/outfit/job/security/nanotrasen/mech_pilot",
+			"slots": 1
+		},
+		"Engine Technician": {
+			"outfit": "/datum/outfit/job/engineer/nt",
+			"slots": 1
+		},
+		"Chief Engineer":{
+			"outfit": "/datum/outfit/job/ce/nt",
+			"officer": true,
+			"slots": 1
+		},
+		"Roboticist": {
+			"outfit":"/datum/outfit/job/roboticist/heron",
+			"slots": 1
+		},
+		"Medical Doctor":{
+			"outfit": "/datum/outfit/job/doctor",
+			"slots": 1
+		},
+
+		"Atmospheric Technician": 1,
+		"Quartermaster": 1,
+		"Cargo Technician": 1,
+		"Cook": 1,
+		"Janitor": 1,
+		"Assistant": 2
+	},
+	"enabled": false
+}

_maps/configs/nanotrasen_skipper.json

@@ -16,7 +16,7 @@
 	"Engineering",
 	"Mining"
 	],
-	"starting_funds": 4000,
+	"starting_funds": 4500,
 	"roundstart": true,
 	"job_slots": {
 		"Captain": {
@@ -36,13 +36,25 @@
 		"Medical Doctor": 1,
 		"Engineer": {
 			"outfit": "/datum/outfit/job/engineer/nt",
-			"slots": 3
+			"slots": 1
+		},
+		"Atmospheric Technician": {
+			"outfit": "/datum/outfit/job/atmos",
+			"slots": 1
 		},
 		"Shaft Miner": 2,
+		"Cargo Technician": {
+		"outfit": "/datum/outfit/job/cargo_tech",
+		"slots": 1
+		},
 		"Security Officer": {
 			"outfit": "/datum/outfit/job/security/nanotrasen",
 			"slots": 1
 		},
+		"Cook": {
+			"outfit": "/datum/outfit/job/cook",
+			"slots": 1
+		},
 		"Assistant": {
 			"outfit": "/datum/outfit/job/assistant",
 			"slots": 3

_maps/configs/syndicate_lugol.json

@@ -42,5 +42,5 @@
 			"slots": 2
 		}
 	},
-"enabled": true
+"enabled": false
 }

_maps/deprecated/Ruins/forgottenship.dmm

@@ -420,7 +420,7 @@
 /obj/structure/closet/crate/secure/gear{
 	req_one_access_txt = "150"
 	},
-/obj/item/clothing/suit/space/hardsuit/cybersun,
+,
 /turf/open/floor/pod/dark,
 /area/ruin/space/has_grav/powered/syndicate_forgotten_vault)
 "bB" = (

_maps/map_catalogue.txt

@@ -584,7 +584,7 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 
 		File name ="_maps\RandomRuins\wasteruins\wasteplanet_pandora.dmm"
 		Size = (x = 18)(y = 21)(z = 1)
-		Tags = "Boss Combat Challenge", "Minor Loot" "Megafauna", "hospitable"
+		Tags = "Boss Combat Challenge", "Medium Loot" "Megafauna", "hospitable"
 
 		File name ="_maps\RandomRuins\wasteruins\wasteplanet_pod.dmm"
 		Size = (x = 8)(y = 8)(z = 1)