Starfly-13 · lectronyx · Jan 18, 2025 · Jan 18, 2025 · Jan 18, 2025 · Jan 18, 2025
diff --git a/_maps/configs/independent_atoll.json b/_maps/configs/independent_atoll.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Atoll-Class Hospital Ship",
 	"map_short_name": "Atoll-class",
 	"description": "The Atoll-class is a large Ihejirika-built medical ship known for its unusually spacious and comfortable facilities and very respectable assortment of equipment and supplies. Atolls are favored by small medical companies and charity organizations dedicated to rendering welcome medical aid in an often harsh and unforgiving Frontier, making them a very welcome sight indeed.",

diff --git a/_maps/configs/independent_bubble.json b/_maps/configs/independent_bubble.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Bubble-class Colonial Ship",
 	"map_short_name": "Bubble-class",
 	"map_path": "_maps/shuttles/independent/independent_bubble.dmm",

diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Mark.II Dwayne-class Long Range Mining Transport",
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",

diff --git a/_maps/configs/independent_junker.json b/_maps/configs/independent_junker.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Junker-class Salvaged Ship",
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",

diff --git a/_maps/configs/independent_kilo.json b/_maps/configs/independent_kilo.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Kilo-class Mining Ship",
 	"description": "The Kilo-class is a very old and miniscule pattern of mining ship, produced in vast numbers over the centuries and commonly found in scrapyards or forgotten in storage. Most examples on the Frontier have been restored by Miskilamo Spacefaring using parts from other nonfunctional Kilos, producing a ship that is as inexpensive as it is cramped and unreliable. The low cost and ease of repair or replacement nevertheless make the Kilo very popular among budget-minded captains.",
 	"tags": [

diff --git a/_maps/configs/independent_mudskipper.json b/_maps/configs/independent_mudskipper.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Mudskipper-class Salvage Clipper",
 	"map_short_name": "Mudskipper-class",
 	"faction": "/datum/faction/independent",

diff --git a/_maps/configs/independent_raleigh.json b/_maps/configs/independent_raleigh.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Raleigh-class Corvette",
 	"faction": "/datum/faction/independent",
 	"prefix": "ISV",

diff --git a/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Riggs-class Sloop",
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",

diff --git a/_maps/configs/independent_scarab.json b/_maps/configs/independent_scarab.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Scarab-class Heavy Mining Ship",
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",

diff --git a/_maps/configs/independent_shetland.json b/_maps/configs/independent_shetland.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Shetland-class Multipurpose Frigate",
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",

diff --git a/_maps/configs/independent_sunskipper.json b/_maps/configs/independent_sunskipper.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Sunskipper-class Culinary Vessel",
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",

diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Colossus-class Armored Frigate",
 	"faction": "/datum/faction/inteq",
 	"prefix": "IRMV",

diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Talos-class Command Clipper",
 	"faction": "/datum/faction/inteq",
 	"prefix": "IRMV",

diff --git a/_maps/configs/inteq_valor.json b/_maps/configs/inteq_valor.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Valor-Class Field Care Cruiser",
 	"faction": "/datum/faction/inteq",
 	"prefix": "IRMV",

diff --git a/_maps/configs/inteq_vaquero.json b/_maps/configs/inteq_vaquero.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Vaquero-class Light Frigate",
 	"faction": "/datum/faction/inteq",
 	"prefix": "IRMV",

diff --git a/_maps/configs/minutemen_atlas.json b/_maps/configs/minutemen_atlas.json
@@ -1,5 +1,5 @@
 	{
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Atlas-class Light Armored Crusier",
 	"prefix": "CMSV",
 	"namelists": ["GENERAL", "CLIP MINUTEMEN", "NATURAL_AGGRESSIVE"],

diff --git a/_maps/configs/nanotrasen_delta.json b/_maps/configs/nanotrasen_delta.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Delta-class Frigate",
 	"faction": "/datum/faction/nt/ns_logi",
 	"prefix": "NSSV",

diff --git a/_maps/configs/nanotrasen_harrier.json b/_maps/configs/nanotrasen_harrier.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Harrier-class Exploration Cruiser",
 	"prefix": "NTSV",
 	"faction": "/datum/faction/nt",

diff --git a/_maps/configs/nanotrasen_meta.json b/_maps/configs/nanotrasen_meta.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Meta-class Freighter",
 	"faction": "/datum/faction/nt",
 	"prefix": "NTSV",

diff --git a/_maps/configs/nanotrasen_ranger.json b/_maps/configs/nanotrasen_ranger.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"prefix": "VISV",
 	"map_name": "Ranger-class Aid Vessel",
 	"faction": "/datum/faction/nt/vigilitas",

diff --git a/_maps/configs/nanotrasen_tegu.json b/_maps/configs/nanotrasen_tegu.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Tegu-class Communications Freighter",
 	"faction": "/datum/faction/nt",
 	"prefix": "NTSV",

diff --git a/_maps/configs/pgf_crying_sun.json b/_maps/configs/pgf_crying_sun.json
@@ -1,7 +1,7 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"faction": "/datum/faction/pgf",
-	"prefix": "PGFN",
+	"prefix": "ESV",
 	"map_name": "Crying Sun-class Light Frigate",
 	"namelists": [
 		"PGF"

diff --git a/_maps/configs/pgf_elated_bolide.json b/_maps/configs/pgf_elated_bolide.json
@@ -1,7 +1,7 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"faction": "/datum/faction/pgf",
-	"prefix": "PGFN",
+	"prefix": "ESV",
 	"map_name": "Elated Bolide-Class Assault Lander",
 	"namelists": [
 		"PGF"

diff --git a/_maps/configs/pgf_woeful_cthonian.json b/_maps/configs/pgf_woeful_cthonian.json
@@ -1,7 +1,7 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"faction": "/datum/faction/pgf",
-	"prefix": "PGFN",
+	"prefix": "ESV",
 	"map_name": "Woeful Cthonian-class Patrol Cutter",
 	"namelists": [
 		"PGF"

diff --git a/_maps/configs/pirate_libertatia.json b/_maps/configs/pirate_libertatia.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Libertatia-class Hauler",
 	"map_short_name": "Libertatia-class",
 	"map_path": "_maps/shuttles/pirate/pirate_libertatia.dmm",

diff --git a/_maps/configs/pirate_tortuga.json b/_maps/configs/pirate_tortuga.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Tortuga-class Converted Cargo Freighter",
 	"faction": "/datum/faction/frontier",
 	"prefix": "ISV",

diff --git a/_maps/configs/solgov_inkwell.json b/_maps/configs/solgov_inkwell.json
@@ -1,8 +1,8 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Inkwell-class Supply Freighter",
 	"faction": "/datum/faction/solgov",
-	"prefix": "SCSV",
+	"prefix": "SGSV",
 	"namelists": [
 		"SOLGOV",
 		"SPACE",
@@ -11,7 +11,7 @@
 	],
 	"map_short_name": "Inkwell-class",
 	"map_path": "_maps/shuttles/solgov/solgov_inkwell.dmm",
-	"description": "One of the few Sol-designed hulls used outside of official contexts by non-Confederation parties, the Inkwell is a freighter respected for its engineering and loved for its lavish crew accommodations. \n The Inkwell-class seen in numerous contexts, perhaps most notably among the Verwaltungskompanien, where they are essential in solving the logistic concerns of any proper military-administration-for-hire. Additionally, they are often commissioned and sold to non-Solarian parties for use in interstellar shipping. \n The usage of the Inkwell-class to move illicit or untracked cargo is known by any seasoned (or even half-cooked) port authority; \"...such regrettable actions by an outlier minority are mere part-and-parcel of the realities of interstellar shipping,\" goes the official reply.",
+	"description": "One of the few Sol-designed hulls used outside of official contexts by non-federation parties, the Inkwell is a freighter respected for its engineering and loved for its lavish crew accommodations. \n The Inkwell-class seen in numerous contexts, perhaps most notably among the Department of Resources, where they are essential in solving the logistic concerns of any proper military-administration-for-hire. Additionally, they are often commissioned and sold to non-Solarian parties for use in interstellar shipping. \n The usage of the Inkwell-class to move illicit or untracked cargo is known by any seasoned (or even half-cooked) port authority; \"...such regrettable actions by an outlier minority are mere part-and-parcel of the realities of interstellar shipping,\" goes the official reply.",
 	"tags": ["RP Focus", "Combat", "Cargo", "Mining"],
 	"limit": 1,
 	"job_slots": {

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

diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json
@@ -1,8 +1,9 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
+	"faction": "/datum/faction/syndicate/roseus",
 	"prefix": "RGSV",
 	"namelists": [
-		"CYBERSUN",
+		"ROSEUS",
 		"SPACE",
 		"NATURAL_AGGRESSIVE"
 	],

diff --git a/_maps/configs/syndicate_cybersun_litieguai.json b/_maps/configs/syndicate_cybersun_litieguai.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"map_name": "Li Tieguai-class Rescue Ship",
 	"faction": "/datum/faction/syndicate/cybersun",
 	"prefix": "CSSV",

diff --git a/_maps/configs/syndicate_gorlex_komodo.json b/_maps/configs/syndicate_gorlex_komodo.json
@@ -1,4 +1,6 @@
 {
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
+	"faction": "/datum/faction/syndicate/hardliners",
 	"prefix": "SSV",
 	"namelists": [
 		"GORLEX",
@@ -50,5 +52,5 @@
 			"slots": 2
 		}
 	},
-	"enabled": false
+	"enabled": true
 }
diff --git a/_maps/configs/syndicate_ngr_derecho.json b/_maps/configs/syndicate_ngr_derecho.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"faction": "/datum/faction/syndicate/ngr",
 	"prefix": "NGRV",
 	"namelists": [

diff --git a/_maps/configs/syndicate_ngr_kaliandhi.json b/_maps/configs/syndicate_ngr_kaliandhi.json
@@ -1,4 +1,5 @@
 {
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"faction": "/datum/faction/syndicate/ngr",
 	"prefix": "NGRV",
 	"namelists": [

diff --git a/_maps/configs/syndicate_panacea.json b/_maps/configs/syndicate_panacea.json
@@ -1,10 +1,11 @@
 {
-	"prefix": "SUNS",
-	"map_name": "Panacea-class Infirm Vessel",
-	"map_short_name": "Panacea-class",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
+	"prefix": "CSSV",
+	"map_name": "Seiiki-class Infirm Vessel",
+	"map_short_name": "Seiiki-class",
 	"map_path": "_maps/shuttles/syndicate/syndicate_panacea.dmm",
-	"faction": "/datum/faction/syndicate/suns",
-	"description": "Shortly after Solcon breached the Oort Cloud, SUNS joined into the Syndicate Coalition. Holding close ties to both the ACLF and GEC, students jumped at the opportunity to see the rest of the galaxy. The Panacea-class was the first of its kind out of Sol, moving typically planetside inpatient care to a space vessel and jumping system to system. The Panacea class is a moderately well supplied ship, allowing for emergency pharmaceutical compounding, mental and physical therapy, and general medical work, while doubling as a student run vessel.",
+	"faction": "/datum/faction/syndicate/cybersun",
+	"description": "Approximately a third of the way through the ICW, it became apparent that the Syndicate could not muster the sheer throwaway manpower that Nanotrasen could with its swaths of mercenaries and disposable personnel. Instead, the Syndicate began to adopt a much more conservative approach to maintaining personnel, by establishing an initiative to create a host of medical vessels designed to rescue and rehabilitate the fallen. The Seiiki-class takes the formerly planetside role of inpatient care and moves it among the stars, providing a mobile means of providing physical and mental therapy alongside pharmaceuticals and general medicine. Having such elaborate, yet mobile, hospitals provided a major tactical advantage in the ICW as the Syndicate was able to better conceal and protect wounded soldiers. Nowadays, Cybersun offers these services to the general public in a move both highly profitable and beneficial to their PR.",
 	"tags": [
 		"Generalist",
 		"Medical",
@@ -14,7 +15,7 @@
 	"map_id": "syndicate_panacea",
 	"limit": 1,
 	"namelists": [
-		"SUNS",
+		"CYBERSUN",
 		"SPACE",
 		"GENERAL"
 	],

diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json
@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"$schema": "https://raw.githubusercontent.com/Starfly-13/STARFLY-13/8efaba456290f1c934d3b40e78e764a27dae113f/_maps/ship_config_schema.json",
 	"faction": "/datum/faction/syndicate",
 	"prefix": "SSV",
 	"namelists": [

diff --git a/code/__DEFINES/factions.dm b/code/__DEFINES/factions.dm
@@ -11,12 +11,15 @@
 #define FACTION_PLAYER_SOLCON "playerSolcon"
 #define FACTION_PLAYER_INTEQ "playerInteq"
 #define FACTION_PLAYER_ROUMAIN "playerRoumain"
+#define FACTION_PLAYER_HEPHAESTUS "playerHephaestus"
+#define FACTION_PLAYER_HEPHAESTUS "playerArknet"
 #define FACTION_PLAYER_GEZENA "playerGezena"
 
 #define FACTION_SYNDICATE "Syndicate"
 	#define FACTION_NGR "New Gorlex Republic"
 	#define FACTION_CYBERSUN "CyberSun"
-	#define FACTION_HARDLINERS "Hardliners"
+	#define FACTION_HARDLINERS "Syndicate Hardline"
+	#define FACTION_ROSEUS "Roseus Galactic"
 	#define FACTION_SUNS "Student-Union of Naturalistic Sciences"
 #define FACTION_SOLGOV "SolGov"
 #define FACTION_SRM "Saint-Roumain Militia"
@@ -25,14 +28,17 @@
 #define FACTION_NT "Nanotrasen"
 	#define FACTION_NS_LOGI "N+S Logistics"
 	#define FACTION_VIGILITAS "Vigilitas Interstellar"
+#define PREFIX_HEPHAESTUS list("HINV")
+#define FACTION_ARKNET "ArkNet"
 #define FACTION_FRONTIER "Frontiersmen Fleet"
-#define FACTION_PGF "Pan-Gezenan Federation"
+#define FACTION_PGF "Epsilon Eridani"
 #define FACTION_INDEPENDENT "Independent"
 
 #define PREFIX_SYNDICATE list("SEV", "SSV")
 	#define PREFIX_NGR list("NGRV")
 	#define PREFIX_CYBERSUN list("CSSV")
-	#define PREFIX_HARDLINERS list("ISV")
+	#define PREFIX_ROSEUS list("RGSV")
+	#define PREFIX_HARDLINERS list("SSV")
 	#define PREFIX_SUNS list("SUNS")
 #define PREFIX_SOLGOV list("SCSV")
 #define PREFIX_SRM list("SRSV")
@@ -41,6 +47,8 @@
 #define PREFIX_NT list("NTSV")
 	#define PREFIX_NS_LOGI list("NSSV")
 	#define PREFIX_VIGILITAS list("VISV")
+#define PREFIX_ARKNET list("ANSV")
+#define PREFIX_HEPHAESTUS list("HINV")
 #define PREFIX_FRONTIER list("FFV")
 #define PREFIX_PGF list("PGF", "PGFMC", "PGFN")
 #define PREFIX_INDEPENDENT list("SV", "IMV", "ISV")
diff --git a/code/__DEFINES/guns.dm b/code/__DEFINES/guns.dm
@@ -70,7 +70,7 @@
 #define MANUFACTURER_PGF "the Etherbor Industries emblem"
 #define MANUFACTURER_ROSEUS "the Roseus Galactic logo"
 #define MANUFACTURER_ADHOMAI "a Tajaran emblem"
-#define MANUFACTURER_LAKVAR "the letters LKV"
+#define MANUFACTURER_LAKVAR "an unrecognizable, heavily faded symbol"
 #define MANUFACTURER_HEPHAESTUS "the Hephaestus Industries logo"
 #define MANUFACTURER_IMPORT "Lanchester Import Co."
 #define MANUFACTURER_SERENE "the Serene Outdoors logo"

diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm
@@ -142,3 +142,7 @@ GLOBAL_VAR_INIT(cmp_field, "name")
 	if(A.dock_width == B.dock_width)
 		return A.dock_height - B.dock_height
 	return A.dock_width - B.dock_width
+
+
+/proc/cmp_factions_asc(datum/faction/a, datum/faction/b)
+	return initial(b.order) - initial(a.order) || sorttext(initial(b.name), initial(a.name))