independents, ert, some other stuff

atomization? no, not quite
shiptest-ss13 · Jan 12, 2024 · ab8b185 · ab8b185
1 parent 904df4e
commit ab8b185
Show file tree

Hide file tree

Showing 80 changed files with 1,431 additions and 1,467 deletions.
diff --git a/_maps/configs/independent_beluga.json b/_maps/configs/independent_beluga.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Beluga-class Transport",
-	"prefix": "ISV",
+	"prefix": "SV",
 	"namelists": ["CRUISE", "NATURAL"],
 	"map_short_name": "Beluga-class",
 	"map_path": "_maps/shuttles/independent/independent_beluga.dmm",
@@ -16,37 +16,37 @@
 	"roundstart": true,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain",
+			"outfit": "/datum/outfit/job/independent/captain",
 			"officer": true,
 			"slots": 1
 		},
 		"First Officer": {
-			"outfit": "/datum/outfit/job/head_of_personnel/beluga",
+			"outfit": "/datum/outfit/job/independent/hop",
 			"officer": true,
 			"slots": 1
 		},
 		"Mechanic": {
-			"outfit": "/datum/outfit/job/engineer",
+			"outfit": "/datum/outfit/job/independent/engineer",
 			"slots": 1
 		},
 		"Private Security Officer": {
 			"outfit": "/datum/outfit/job/inteq/security/beluga",
 			"slots": 2
 		},
 		"High-Class Passenger": {
-			"outfit": "/datum/outfit/job/lawyer/passenger",
+			"outfit": "/datum/outfit/job/independent/lawyer",
 			"slots": 4
 		},
 		"Bartender": {
-			"outfit": "/datum/outfit/job/bartender",
+			"outfit": "/datum/outfit/job/independent/bartender",
 			"slots": 1
 		},
 		"Janitor": {
-			"outfit": "/datum/outfit/job/janitor",
+			"outfit": "/datum/outfit/job/independent/janitor",
 			"slots": 1
 		},
 		"Assistant": {
-			"outfit": "/datum/outfit/job/assistant",
+			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 2
 		}
 	},

diff --git a/_maps/configs/independent_box.json b/_maps/configs/independent_box.json
@@ -12,22 +12,22 @@
 		"SPACE",
 		"NATURAL"
 	],
-	"prefix": "ISV",
+	"prefix": "IMV",
 	"job_slots": {
 		"Chief Medical Officer": {
-			"outfit": "/datum/outfit/job/cmo",
+			"outfit": "/datum/outfit/job/independent/cmo",
 			"slots": 1
 		},
 		"Medical Doctor": {
-			"outfit": "/datum/outfit/job/doctor",
+			"outfit": "/datum/outfit/job/independent/doctor",
 			"slots": 3
 		},
 		"Paramedic": {
-			"outfit": "/datum/outfit/job/paramedic",
+			"outfit": "/datum/outfit/job/independent/paramedic",
 			"slots": 2
 		},
 		"Assistant": {
-			"outfit": "/datum/outfit/job/assistant",
+			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 3
 		}
 	},

diff --git a/_maps/configs/independent_boyardee.json b/_maps/configs/independent_boyardee.json
@@ -18,23 +18,23 @@
 	"map_path": "_maps/shuttles/independent/independent_boyardee.dmm",
 	"job_slots": {
 		"Bartender": {
-			"outfit": "/datum/outfit/job/bartender",
+			"outfit": "/datum/outfit/job/independent/bartender",
 			"slots": 1
 		},
 		"Cook": {
-			"outfit": "/datum/outfit/job/cook",
+			"outfit": "/datum/outfit/job/independent/cook",
 			"slots": 3
 		},
 		"Botanist": {
-			"outfit": "/datum/outfit/job/botanist",
+			"outfit": "/datum/outfit/job/independent/botanist",
 			"slots": 2
 		},
 		"Janitor": {
-			"outfit": "/datum/outfit/job/janitor",
+			"outfit": "/datum/outfit/job/independent/janitor",
 			"slots": 1
 		},
 		"Waiter": {
-			"outfit": "/datum/outfit/job/assistant/waiter",
+			"outfit": "/datum/outfit/job/independent/assistant/waiter",
 			"slots": 2
 		}
 	},

diff --git a/_maps/configs/independent_bubble.json b/_maps/configs/independent_bubble.json
@@ -16,23 +16,23 @@
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain",
+			"outfit": "/datum/outfit/job/independent/captain",
 			"slots": 1
 		},
 		"Scientist": {
-			"outfit": "/datum/outfit/job/scientist",
+			"outfit": "/datum/outfit/job/independent/scientist",
 			"slots": 1
 		},
 		"Station Engineer": {
-			"outfit": "/datum/outfit/job/engineer",
+			"outfit": "/datum/outfit/job/independent/engineer",
 			"slots": 1
 		},
 		"Shaft Miner": {
-			"outfit": "/datum/outfit/job/miner",
+			"outfit": "/datum/outfit/job/independent/miner",
 			"slots": 1
 		},
 		"Assistant": {
-			"outfit": "/datum/outfit/job/assistant",
+			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 3
 		}
 	},

diff --git a/_maps/configs/independent_byo.json b/_maps/configs/independent_byo.json
@@ -15,11 +15,11 @@
 	"prefix": "ISV",
 	"job_slots": {
 		"Architect": {
-			"outfit": "/datum/outfit/job/engineer/hazard",
+			"outfit": "/datum/outfit/job/independent/ce",
 			"slots": 1
 		},
 		"Maso-Mechanic": {
-			"outfit": "/datum/outfit/job/engineer/hazard",
+			"outfit": "/datum/outfit/job/independent/engineer",
 			"slots": 4
 		}
 	},

diff --git a/_maps/configs/independent_caravan.json b/_maps/configs/independent_caravan.json
@@ -18,28 +18,28 @@
 	"roundstart": true,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/western",
+			"outfit": "/datum/outfit/job/independent/captain/western",
 			"officer": true,
 			"slots": 1
 		},
 		"Ship's Doctor": {
-			"outfit": "/datum/outfit/job/doctor",
+			"outfit": "/datum/outfit/job/independent/doctor",
 			"slots": 1
 		},
 		"Engine Technician": {
-			"outfit": "/datum/outfit/job/atmos",
+			"outfit": "/datum/outfit/job/independent/atmos",
 			"slots": 1
 		},
 		"Asteroid Miner": {
-			"outfit": "/datum/outfit/job/miner/hazard",
+			"outfit": "/datum/outfit/job/independent/miner",
 			"slots": 1
 		},
 		"Fauna Researcher": {
-			"outfit": "/datum/outfit/job/scientist",
+			"outfit": "/datum/outfit/job/independent/scientist",
 			"slots": 1
 		},
 		"Assistant": {
-			"outfit": "/datum/outfit/job/assistant",
+			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 1
 		}
 	},

diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json
@@ -19,28 +19,28 @@
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/western",
+			"outfit": "/datum/outfit/job/independent/captain/western",
 			"officer": true,
 			"slots": 1
 		},
 		"Foreman": {
-			"outfit": "/datum/outfit/job/quartermaster/western",
+			"outfit": "/datum/outfit/job/independent/quartermaster/western",
 			"slots": 1
 		},
 		"Ship's Doctor": {
-			"outfit": "/datum/outfit/job/doctor",
+			"outfit": "/datum/outfit/job/independent/doctor",
 			"slots": 1
 		},
 		"Ship's Engineer": {
-			"outfit": "/datum/outfit/job/engineer/hazard",
+			"outfit": "/datum/outfit/job/independent/engineer",
 			"slots": 1
 		},
 		"Asteroid Miner": {
-			"outfit": "/datum/outfit/job/miner/hazard",
+			"outfit": "/datum/outfit/job/independent/miner/hazard",
 			"slots": 2
 		},
 		"Deckhand": {
-			"outfit": "/datum/outfit/job/assistant",
+			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 3
 		}
 	},

diff --git a/_maps/configs/independent_halftrack.json b/_maps/configs/independent_halftrack.json
@@ -15,7 +15,7 @@
 	"map_path": "_maps/shuttles/independent/independent_halftrack.dmm",
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain",
+			"outfit": "/datum/outfit/job/independent/captain",
 			"slots": 1
 		},
 		"IRMG Vanguard": {

diff --git a/_maps/configs/independent_junker.json b/_maps/configs/independent_junker.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Junker-class Salvaged Ship",
-	"prefix": "ISV",
+	"prefix": "SV",
 	"namelists": [
 		"GENERAL",
 		"SPACE"

diff --git a/_maps/configs/independent_kilo.json b/_maps/configs/independent_kilo.json
@@ -16,24 +16,24 @@
 	"map_path": "_maps/shuttles/independent/independent_kilo.dmm",
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/western",
+			"outfit": "/datum/outfit/job/independent/captain/western",
 			"officer": true,
 			"slots": 1
 		},
 		"Ship's Doctor": {
-			"outfit": "/datum/outfit/job/doctor",
+			"outfit": "/datum/outfit/job/independent/doctor",
 			"slots": 1
 		},
 		"Ship's Engineer": {
-			"outfit": "/datum/outfit/job/engineer/hazard",
+			"outfit": "/datum/outfit/job/independent/engineer",
 			"slots": 1
 		},
 		"Asteroid Miner": {
-			"outfit": "/datum/outfit/job/miner/hazard",
+			"outfit": "/datum/outfit/job/independent/miner",
 			"slots": 1
 		},
 		"Deckhand": {
-			"outfit": "/datum/outfit/job/assistant",
+			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 1
 		}
 	},

diff --git a/_maps/configs/independent_lagoon.json b/_maps/configs/independent_lagoon.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Lagoon-class Cruise Ship",
-	"prefix": "ISV",
+	"prefix": "SV",
 	"description": "An unusual sight in the relatively impoverished Frontier, the Lagoon-class is a large pleasure vessel dedicated to transporting its passengers to any number of exotic locales. Lagoons found on the Frontier tend to contain crews and passengers of a particularly daring – or foolhardy – character, willing to pay out the nose for a tour of some of the most dangerous regions in known space. Accordingly, Lagoons in these regions typically include a small but respectably equipped security contingent to protect (and, when necessary, rein in) the passengers, and come with a surprisingly powerful thermo-electric generator to move the ship’s prodigious bulk across vast expanses of space.",
 	"tags": [
 		"RP Focus",
@@ -16,51 +16,51 @@
 	"starting_funds": 3000,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain",
+			"outfit": "/datum/outfit/job/independent/captain",
 			"slots": 1
 		},
 		"Cruise Director": {
-			"outfit": "/datum/outfit/job/head_of_personnel",
+			"outfit": "/datum/outfit/job/independent/hop",
 			"slots": 1
 		},
 		"Security Officer": {
-			"outfit": "/datum/outfit/job/security",
+			"outfit": "/datum/outfit/job/independent/security",
 			"slots": 2
 		},
 		"Medical Doctor": {
-			"outfit": "/datum/outfit/job/doctor",
+			"outfit": "/datum/outfit/job/independent/doctor",
 			"slots": 1
 		},
 		"Ship Engineer": {
-			"outfit": "/datum/outfit/job/atmos",
+			"outfit": "/datum/outfit/job/independent/atmos",
 			"slots": 1
 		},
 		"Bartender": {
-			"outfit": "/datum/outfit/job/bartender",
+			"outfit": "/datum/outfit/job/independent/bartender",
 			"slots": 1
 		},
 		"Cook": {
-			"outfit": "/datum/outfit/job/cook",
+			"outfit": "/datum/outfit/job/independent/cook",
 			"slots": 1
 		},
 		"Botanist": {
-			"outfit": "/datum/outfit/job/botanist",
+			"outfit": "/datum/outfit/job/independent/botanist",
 			"slots": 1
 		},
 		"Curator": {
-			"outfit": "/datum/outfit/job/curator",
+			"outfit": "/datum/outfit/job/independent/curator",
 			"slots": 1
 		},
 		"Chaplain": {
-			"outfit": "/datum/outfit/job/chaplain",
+			"outfit": "/datum/outfit/job/independent/chaplain",
 			"slots": 1
 		},
 		"Janitor": {
-			"outfit": "/datum/outfit/job/janitor",
+			"outfit": "/datum/outfit/job/independent/janitor",
 			"slots": 1
 		},
 		"Passenger": {
-			"outfit": "/datum/outfit/job/assistant/corporate",
+			"outfit": "/datum/outfit/job/independent/assistant/fancy",
 			"slots": 10
 		}
 	},

diff --git a/_maps/configs/independent_masinyane.json b/_maps/configs/independent_masinyane.json
@@ -6,24 +6,24 @@
 	"tags": [
 		"Generalist"
 	],
-	"prefix": "ISV",
+	"prefix": "SV",
 	"namelists": [
 		"MYTHOLOGICAL",
 		"NATURAL"
 	],
 	"map_path": "_maps/shuttles/independent/independent_masinyane.dmm",
 	"job_slots": {
 		"Private Ship Owner": {
-			"outfit": "/datum/outfit/job/captain/independent/owner",
+			"outfit": "/datum/outfit/job/independent/captain/masinyane",
 			"officer": true,
 			"slots": 1
 		},
 		"Ship Engineer": {
-			"outfit": "/datum/outfit/job/engineer/independent/ship_engineer",
+			"outfit": "/datum/outfit/job/independent/engineer",
 			"slots": 1
 		},
 		"Crewmate": {
-			"outfit": "/datum/outfit/job/assistant/independent/crewmatefancy",
+			"outfit": "/datum/outfit/job/independent/assistant/fancy",
 			"slots": 1
 		}
 	}