Skip to content

Commit

Permalink
MORE separation from shiptest by linking things to our equivalents
Browse files Browse the repository at this point in the history
we really don't want more ugly surprises from upstream
  • Loading branch information
lectronyx committed Jan 28, 2025
1 parent c898af0 commit 348c777
Show file tree
Hide file tree
Showing 31 changed files with 38 additions and 35 deletions.
2 changes: 1 addition & 1 deletion _maps/configs/independent_atoll.json
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_bubble.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_dwayne.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_junker.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_kilo.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_raleigh.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_rigger.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_scarab.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_shetland.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_sunskipper.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/inteq_colossus.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/inteq_talos.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/inteq_valor.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/inteq_vaquero.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/minutemen_atlas.json
Original file line number Diff line number Diff line change
@@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/nanotrasen_delta.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/nanotrasen_harrier.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/nanotrasen_meta.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/nanotrasen_ranger.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/nanotrasen_tegu.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions _maps/configs/pgf_crying_sun.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions _maps/configs/pgf_elated_bolide.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions _maps/configs/pgf_woeful_cthonian.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/pirate_libertatia.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/pirate_tortuga.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions _maps/configs/solgov_inkwell.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions _maps/configs/solgov_paracelsus.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/syndicate_cybersun_litieguai.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/syndicate_ngr_derecho.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/syndicate_ngr_kaliandhi.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
3 changes: 2 additions & 1 deletion _maps/configs/syndicate_panacea.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"$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",
"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",
Expand Down

0 comments on commit 348c777

Please sign in to comment.