Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

…to missing-icon
shiptest-ss13 · Mar 16, 2024 · c7a9c17 · c7a9c17
2 parents b6f4b5e + f25682f
commit c7a9c17
Show file tree

Hide file tree

Showing 276 changed files with 5,128 additions and 18,664 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -1525,8 +1525,8 @@
 	pixel_x = -7;
 	pixel_y = 2
 	},
-/obj/item/clothing/under/rank/command/minutemen,
-/obj/item/clothing/head/helmet/bulletproof/minutemen,
+/obj/item/clothing/under/clip/officer,
+/obj/item/clothing/head/helmet/bulletproof/x11/clip,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/wood,
 /area/ruin/beach/treasure_cove)

diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -923,7 +923,7 @@
 /obj/item/clothing/suit/space/hardsuit/syndi/ramzi,
 /obj/item/reagent_containers/food/drinks/bottle/rum,
 /obj/item/reagent_containers/food/drinks/bottle/rum,
-/obj/item/folder/syndicate/mining,
+/obj/item/folder/documents/syndicate/mining,
 /obj/item/paper/fluff/gateway,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/onehalf)

diff --git a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm
@@ -208,7 +208,7 @@
 /area/ruin/space/has_grav/syndicircle/halls)
 "gi" = (
 /obj/structure/table/reinforced,
-/obj/item/folder/syndicate/red,
+/obj/item/folder/documents/syndicate/red,
 /turf/open/floor/plasteel/tech,
 /area/ruin/space/has_grav/syndicircle/winter)
 "gp" = (

diff --git a/_maps/configs/independent_caravan.json b/_maps/configs/independent_caravan.json
diff --git a/_maps/configs/minutemen_asclepius.json b/_maps/configs/minutemen_asclepius.json
diff --git a/_maps/configs/minutemen_cepheus.json b/_maps/configs/minutemen_cepheus.json
diff --git a/_maps/configs/minutemen_vela.json b/_maps/configs/minutemen_vela.json
@@ -3,7 +3,7 @@
 	"map_name": "Vela-class Industrial Cruiser",
 	"prefix": "CMGSV",
 	"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.",
+	"description": "The Vela-Class is the designation for a series of semi-modular industrial cruisers created by the CLIP 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",
 		"Construction",
@@ -15,41 +15,38 @@
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/minutemen/captain",
+			"outfit": "/datum/outfit/job/clip/minutemen/captain",
 			"officer": true,
 			"slots": 1
 		},
 		"Foreman": {
-			"outfit": "/datum/outfit/job/minutemen/ce",
+			"outfit": "/datum/outfit/job/clip/ce",
 			"officer": true,
 			"slots": 1
 		},
-		"Bridge Officer": {
-			"outfit": "/datum/outfit/job/minutemen/head_of_personnel",
+		"First Officer": {
+			"outfit": "/datum/outfit/job/clip/first_officer",
+			"officer": true,
 			"slots": 1
 		},
 		"Mech Pilot": {
-			"outfit": "/datum/outfit/job/minutemen/miner",
+			"outfit": "/datum/outfit/job/clip/minutemen/vehicle_pilot",
 			"slots": 4
 		},
-		"Mech Technician": {
-			"outfit": "/datum/outfit/job/minutemen/roboticist",
+		"Minuteman": {
+			"outfit": "/datum/outfit/job/clip/minutemen/grunt",
 			"slots": 2
 		},
 		"Engineer": {
-			"outfit": "/datum/outfit/job/minutemen/engineer",
-			"slots": 2
-		},
-		"Minuteman": {
-			"outfit": "/datum/outfit/job/minutemen/security",
+			"outfit": "/datum/outfit/job/clip/mechanic",
 			"slots": 2
 		},
-		"Scientist": {
-			"outfit": "/datum/outfit/job/minutemen/scientist",
+		"Researcher": {
+			"outfit": "/datum/outfit/job/clip/scientist",
 			"slots": 2
 		},
-		"Cadet": {
-			"outfit": "/datum/outfit/job/minutemen/assistant",
+		"Deckhand": {
+			"outfit": "/datum/outfit/job/clip/minutemen/deckhand",
 			"slots": 1
 		}
 	},

diff --git a/_maps/configs/solgov_chronicle.json b/_maps/configs/solgov_chronicle.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Chronicle-class Sensor Frigate",
-	"prefix": "SGSV",
+	"prefix": "SCSV",
 	"namelists": [
 		"SOLGOV",
 		"SPACE",

diff --git a/_maps/configs/solgov_inkwell.json b/_maps/configs/solgov_inkwell.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Inkwell-class Supply Freighter",
-	"prefix": "SGSV",
+	"prefix": "SCSV",
 	"namelists": [
 		"SOLGOV",
 		"SPACE",

diff --git a/_maps/configs/solgov_paracelsus.json b/_maps/configs/solgov_paracelsus.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Paracelsus-class Medical Corvette",
-	"prefix": "SGSV",
+	"prefix": "SCSV",
 	"namelists": [
 		"SOLGOV",
 		"SPACE",