adds bespoke minuteman faction and moves all minuteman outfits over t…

…o it.
shiptest-ss13 · Nov 6, 2023 · eb79e1f · eb79e1f
1 parent 17c432f
commit eb79e1f
Show file tree

Hide file tree

Showing 22 changed files with 294 additions and 227 deletions.
diff --git a/_maps/configs/independent_nemo.json b/_maps/configs/independent_nemo.json
@@ -34,7 +34,7 @@
 			"slots": 1
 		},
 		"Mech Pilot": {
-			"outfit": "/datum/outfit/job/roboticist/technician",
+			"outfit": "/datum/outfit/job/roboticist",
 			"slots": 1
 		},
 		"Ship Engineer": {

diff --git a/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json
@@ -43,7 +43,7 @@
 			"slots": 2
 		},
 		"Mech Technician": {
-			"outfit": "/datum/outfit/job/roboticist/technician",
+			"outfit": "/datum/outfit/job/roboticist",
 			"slots": 1
 		},
 		"Security Detail": {

diff --git a/_maps/configs/minutemen_asclepius.json b/_maps/configs/minutemen_asclepius.json
@@ -17,32 +17,32 @@
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/captain",
 			"officer": true,
 			"slots": 1
 		},
 		"Mechanic": {
-			"outfit": "/datum/outfit/job/engineer/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/engineer",
 			"slots": 1
 		},
 		"Minuteman": {
-			"outfit": "/datum/outfit/job/security/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/security",
 			"slots": 1
 		},
 		"Cadet": {
-			"outfit": "/datum/outfit/job/assistant/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/assistant",
 			"slots": 3
 		},
 		"Field Medic": {
-			"outfit": "/datum/outfit/job/doctor/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/doctor",
 			"slots": 3
 		},
 		"Paramedic":{
-		"outfit": "/datum/outfit/job/paramedic/minutemen",
+		"outfit": "/datum/outfit/job/minuteman/paramedic",
 		"slots": 2
 		},
 		"Chemist":{
-		"outfit": "/datum/outfit/job/chemist/minutemen",
+		"outfit": "/datum/outfit/job/minuteman/chemist",
 		"slots": 1
 		}
 	},

diff --git a/_maps/configs/minutemen_cepheus.json b/_maps/configs/minutemen_cepheus.json
@@ -15,28 +15,28 @@
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/captain",
 			"officer": true,
 			"slots": 1
 		},
 		"Mechanic": {
-			"outfit": "/datum/outfit/job/engineer/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/engineer",
 			"slots": 1
 		},
 		"Minuteman": {
-			"outfit": "/datum/outfit/job/security/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/security",
 			"slots": 2
 		},
 		"Mech Pilot" :{
-			"outfit": "/datum/outfit/job/security/minutemen/mechpilot",
+			"outfit": "/datum/outfit/job/minuteman/security/mech_pilot",
 			"slots": 2
 		},
 		"Roboticist": {
-			"outfit": "/datum/outfit/job/roboticist/technician/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/roboticist",
 			"slots": 1
 		},
 		"Cadet": {
-			"outfit": "/datum/outfit/job/assistant/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/assistant",
 			"slots": 3
 		}
 	},

diff --git a/_maps/configs/minutemen_corvus.json b/_maps/configs/minutemen_corvus.json
@@ -16,20 +16,20 @@
 	"limit": 2,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/captain",
 			"officer": true,
 			"slots": 1
 		},
 		"Mechanic": {
-			"outfit": "/datum/outfit/job/engineer/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/engineer",
 			"slots": 1
 		},
 		"Minuteman": {
-			"outfit": "/datum/outfit/job/security/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/security",
 			"slots": 2
 		},
 		"Cadet": {
-			"outfit": "/datum/outfit/job/assistant/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/assistant",
 			"slots": 2
 		}
 	},

diff --git a/_maps/configs/minutemen_vela.json b/_maps/configs/minutemen_vela.json
@@ -2,7 +2,11 @@
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Vela-class Industrial Cruiser",
 	"prefix": "CMGSV",
-	"namelists": ["GENERAL", "MYTHOLOGICAL", "BEASTS"],
+	"namelists": [
+		"GENERAL",
+		"MYTHOLOGICAL",
+		"BEASTS"
+	],
 	"description": "The Vela-Class is the designation for a series of semi-modular industrial cruisers created by the Colonial Minutemen in the early 440s. While the original design was created almost exclusively for extracting minerals from asteroid belts, modern examples tend to take on a multi-mission role, with the most common configuration being a mech hanger, and research pod. The ship itself often sees long deployments that encourage modification, leading to Velas taking on a personality as their crews leave their mark.",
 	"tags": [
 		"Robotics",
@@ -15,41 +19,41 @@
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/captain",
 			"officer": true,
 			"slots": 1
 		},
 		"Foreman": {
-			"outfit": "/datum/outfit/job/ce/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/ce",
 			"officer": true,
 			"slots": 1
 		},
 		"Bridge Officer": {
-			"outfit": "/datum/outfit/job/head_of_personnel/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/head_of_personnel",
 			"slots": 1
 		},
 		"Mech Pilot": {
-			"outfit": "/datum/outfit/job/miner/hazard/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/miner",
 			"slots": 4
 		},
 		"Mech Technician": {
-			"outfit": "/datum/outfit/job/roboticist/technician/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/roboticist",
 			"slots": 2
 		},
 		"Engineer": {
-			"outfit": "/datum/outfit/job/engineer/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/engineer",
 			"slots": 2
 		},
 		"Minuteman": {
-			"outfit": "/datum/outfit/job/security/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/security",
 			"slots": 2
 		},
 		"Scientist": {
-			"outfit": "/datum/outfit/job/scientist/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/scientist",
 			"slots": 2
 		},
 		"Cadet": {
-			"outfit": "/datum/outfit/job/assistant/minutemen",
+			"outfit": "/datum/outfit/job/minuteman/assistant",
 			"slots": 1
 		}
 	},

diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
@@ -132,7 +132,7 @@
 	item_state = "securitypack"
 
 /obj/item/storage/backpack/security/cmm
-	name = "cmm backpack"
+	name = "CMM backpack"
 	desc = "It's a very blue backpack."
 	icon_state = "cmmpack"
 
@@ -286,7 +286,7 @@
 	item_state = "satchel-sec"
 
 /obj/item/storage/backpack/satchel/sec/cmm
-	name = "cmm satchel"
+	name = "CMM satchel"
 	desc = "A robust satchel for anti-piracy related needs."
 	icon_state = "satchel-cmm"