From dccca2529a1123387c522818d00d246382d63251 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 18:06:39 +1200 Subject: [PATCH 1/3] schema and json updates! no longer forced to follow shiptest schema! --- _maps/configs/independent_beluga.json | 2 +- _maps/configs/independent_box.json | 2 +- _maps/configs/independent_bubble.json | 2 +- _maps/configs/independent_dwayne.json | 2 +- _maps/configs/independent_junker.json | 2 +- _maps/configs/independent_kilo.json | 2 +- _maps/configs/independent_lagoon.json | 2 +- _maps/configs/independent_mudskipper.json | 2 +- _maps/configs/independent_rigger.json | 2 +- _maps/configs/independent_schmiedeberg.json | 2 +- _maps/configs/independent_sunskipper.json | 2 +- _maps/configs/independent_tranquility.json | 2 +- _maps/configs/inteq_colossus.json | 2 +- _maps/configs/inteq_talos.json | 2 +- _maps/configs/inteq_valor.json | 2 +- _maps/configs/inteq_vaquero.json | 2 +- _maps/configs/nanotrasen_delta.json | 2 +- _maps/configs/nanotrasen_gecko.json | 2 +- _maps/configs/nanotrasen_heron.json | 2 +- _maps/configs/nanotrasen_meta.json | 2 +- _maps/configs/nanotrasen_mimir.json | 2 +- _maps/configs/nanotrasen_osprey.json | 2 +- _maps/configs/nanotrasen_ranger.json | 2 +- _maps/configs/nanotrasen_skipper.json | 2 +- _maps/configs/pgf_crying_sun.json | 2 +- _maps/configs/pirate_libertatia.json | 2 +- _maps/configs/pirate_noderider.json | 2 +- _maps/configs/pirate_tortuga.json | 2 +- _maps/configs/solgov_chronicle.json | 2 +- _maps/configs/solgov_inkwell.json | 2 +- _maps/configs/solgov_paracelsus.json | 2 +- _maps/configs/srm_elder.json | 2 +- .../configs/syndicate_cybersun_kansatsu.json | 2 +- _maps/configs/syndicate_gorlex_hyena.json | 2 +- _maps/configs/syndicate_litieguai.json | 2 +- _maps/configs/syndicate_twinkleshine.json | 2 +- _maps/configs/terragov_chronicle.json | 47 ++++++++++++++++ _maps/configs/terragov_inkwell.json | 49 +++++++++++++++++ _maps/configs/terragov_paracelsus.json | 54 +++++++++++++++++++ _maps/example_ship_config.json | 2 +- _maps/ship_config_schema.json | 10 +++- 41 files changed, 196 insertions(+), 38 deletions(-) create mode 100644 _maps/configs/terragov_chronicle.json create mode 100644 _maps/configs/terragov_inkwell.json create mode 100644 _maps/configs/terragov_paracelsus.json diff --git a/_maps/configs/independent_beluga.json b/_maps/configs/independent_beluga.json index 6d7926a8e845..2f46c6655f63 100644 --- a/_maps/configs/independent_beluga.json +++ b/_maps/configs/independent_beluga.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Beluga-class Transport", "prefix": "SV", "namelists": ["CRUISE", "NATURAL"], diff --git a/_maps/configs/independent_box.json b/_maps/configs/independent_box.json index 14133f03f5bb..e268ccc38e38 100644 --- a/_maps/configs/independent_box.json +++ b/_maps/configs/independent_box.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Box-class Hospital Ship", "map_short_name": "Box-class", "description": "An early exemplar of several modern shipbuilding techniques that have since become standard, the Box is effectively a tiny spaceborne hospital, loaded with medical equipment that can often be difficult to source in Frontier space. Unusually, Boxes come equipped with medical cryo tubes, which have become a particular rarity on the Frontier due to their delicate nature and steep upkeep costs. Boxes are often found in surprisingly good repair for their age, and they have received several upgrades over the decades that have kept them well abreast of advances in medical science.", diff --git a/_maps/configs/independent_bubble.json b/_maps/configs/independent_bubble.json index f63aca854e8b..6e4544108baf 100644 --- 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/Constellado/Pentest/master/_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 index 64f68af68752..fa7bb01526f4 100644 --- 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/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Mark.II Dwayne-class Long Range Mining Transport", "prefix": "ISV", "namelists": [ diff --git a/_maps/configs/independent_junker.json b/_maps/configs/independent_junker.json index bd7807a02bb4..fbf10d38f634 100644 --- 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/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Junker-class Salvaged Ship", "prefix": "SV", "namelists": [ diff --git a/_maps/configs/independent_kilo.json b/_maps/configs/independent_kilo.json index b1304f2e78bb..9f941c74aa01 100644 --- 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/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Kilo-class Mining Ship", "description": "The Kilo-class is a miniscule mining ship that stretches the definition of an independently-capable spacecraft. Beginning life long ago as a series of purpose-built mining shuttles intended for use on Frontier outposts, progressive cycles of over-engineering for a longer mission duration eventually produced the lumpen, claustrophobic Kilo seen today. Once quite numerous, Kilos are still a common “barn find” on abandoned stations and forgotten storage bays, and their extreme age and poor storage conditions typically leaves them in especially poor condition. Kilo crews are often considered to be quite eccentric even by Frontier standards, and some spacers insist even a well-balanced spacer will quickly come unglued in the Kilo’s “unique” environment.", "tags": [ diff --git a/_maps/configs/independent_lagoon.json b/_maps/configs/independent_lagoon.json index 313b4cd71d95..07eba3679b39 100644 --- a/_maps/configs/independent_lagoon.json +++ b/_maps/configs/independent_lagoon.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Lagoon-class Cruise Ship", "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.", diff --git a/_maps/configs/independent_mudskipper.json b/_maps/configs/independent_mudskipper.json index 9f4cf32e0cf8..27ebb0e905eb 100644 --- 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/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Mudskipper-class Salvage Clipper", "map_short_name": "Mudskipper-class", "prefix": "ISV", diff --git a/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json index e36b57ca750a..fced4cfd0dde 100644 --- 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/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Riggs-class Sloop", "prefix": "SV", "namelists": [ diff --git a/_maps/configs/independent_schmiedeberg.json b/_maps/configs/independent_schmiedeberg.json index d7dd360bb1e4..6a3b231bbb21 100644 --- a/_maps/configs/independent_schmiedeberg.json +++ b/_maps/configs/independent_schmiedeberg.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Schmiedeberg-class Pharmacology Ship", "prefix": "IMV", "map_short_name": "Schmiedeberg-class", diff --git a/_maps/configs/independent_sunskipper.json b/_maps/configs/independent_sunskipper.json index 08a4a56f9fde..dda097292271 100644 --- 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/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Sunskipper-class Culinary Vessel", "prefix": "ISV", "namelists": ["CRUISE", "NATURAL"], diff --git a/_maps/configs/independent_tranquility.json b/_maps/configs/independent_tranquility.json index 07236d5e4568..53c7d368e9e3 100644 --- a/_maps/configs/independent_tranquility.json +++ b/_maps/configs/independent_tranquility.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Tranquility-class Flying Apartment Complex", "prefix": "SV", "namelists": [ diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json index 29337cb015a2..d083b4c21e34 100644 --- 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/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Colossus-class Armored Frigate", "prefix": "IRMV", "description": "The mainstay of Inteq’s mercenary fleet, the Colossus is a professionally-militarized freighter like most of Inteq’s ships, and is designed to operate independently for some time, serving IRMG’s interests and providing vital mercenary services wherever they are needed. Key features include a secure and well-stocked armory and ample crew space, as well as a spacious cargo bay, which crews often refurbish into additional recreational or training space.", diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json index e65253ad3239..31b7d9829447 100644 --- 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/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Talos-class Command Clipper", "prefix": "IRMV", "description": "The Talos is a command and support ship, and a rare example of a purpose-built Inteq ship. Outfitted with an abundance of construction and engineering equipment and a private bluespace communications suite capable of networking IRMG ships across any given system, Taloses are often the lynchpin of coordinated IRMG operations in a system, and offer construction and repair services as part of IRMG’s mercenary offerings. As Talos crews place a larger emphasis on support personnel, they tend to be less well-armed than other Inteq crews. One unusual feature of the Talos is its depressurized “wings” filled with redundant baffles, intended to provide extra durability in the case of impacts or weapons fire. They also double as auxiliary storage space and potential room for modification by their enterprising Artificer crews.", diff --git a/_maps/configs/inteq_valor.json b/_maps/configs/inteq_valor.json index 92162ac1a5da..fb0aa43f27c7 100644 --- 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/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Valor-Class Field Care Cruiser", "prefix": "IRMV", "description": "The Valor is the dedicated medical vessel of the Inteq fleet, suitable for treatment both for Inteq combat casualties, or paid treatment of outsiders. It's equipped with high-end medical equipment and a small ambulance for patient transport for this purpose.", diff --git a/_maps/configs/inteq_vaquero.json b/_maps/configs/inteq_vaquero.json index e8d790a526dc..5e5a5702e7bd 100644 --- 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/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Vaquero-class Light Frigate", "prefix": "IRMV", "description": "The Vaquero is a flexible and cheap military conversion of a light commercial freighter, widely used by Inteq Risk Management Group for picket, reconnaissance, and light escort duty, or for contracts that don't warrant a larger, more specialized ship. Unlike most Inteq ships, the Vaquero features basic medical, engineering, and military equipment all in one package, and its minimal crew requirements are an excellent fit for Vanguards with a smaller command and for training missions. Like its peers, it features a large cargo bay, which can be reconfigured as needed.", diff --git a/_maps/configs/nanotrasen_delta.json b/_maps/configs/nanotrasen_delta.json index 57e920f77d67..97f3d6b4e36e 100644 --- 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/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Delta-class Frigate", "prefix": "NSSV", "namelists": [ diff --git a/_maps/configs/nanotrasen_gecko.json b/_maps/configs/nanotrasen_gecko.json index 9ba0672f03db..c7b926562819 100644 --- a/_maps/configs/nanotrasen_gecko.json +++ b/_maps/configs/nanotrasen_gecko.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Gecko-class Salvage Runner", "prefix": "NTSV", "namelists": [ diff --git a/_maps/configs/nanotrasen_heron.json b/_maps/configs/nanotrasen_heron.json index 80bf87c0cd15..c655483ffee1 100644 --- a/_maps/configs/nanotrasen_heron.json +++ b/_maps/configs/nanotrasen_heron.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": " "prefix": "NTSV", "namelists": ["WEAPONS"], "map_name": "Heron-Class Dreadnaught", diff --git a/_maps/configs/nanotrasen_meta.json b/_maps/configs/nanotrasen_meta.json index b4287c3bca3b..f88a452e90e2 100644 --- 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": " "map_name": "Meta-class Freighter", "prefix": "NTSV", "map_short_name": "Meta-class", diff --git a/_maps/configs/nanotrasen_mimir.json b/_maps/configs/nanotrasen_mimir.json index db7d8b90d198..5bb74a5e44e9 100644 --- a/_maps/configs/nanotrasen_mimir.json +++ b/_maps/configs/nanotrasen_mimir.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": " "prefix": "NTSV", "namelists": [ "NANOTRASEN", diff --git a/_maps/configs/nanotrasen_osprey.json b/_maps/configs/nanotrasen_osprey.json index 7e0804a7f203..04fb5747c44a 100644 --- a/_maps/configs/nanotrasen_osprey.json +++ b/_maps/configs/nanotrasen_osprey.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Osprey-class Exploration Cruiser", "prefix": "NTSV", "namelists": [ diff --git a/_maps/configs/nanotrasen_ranger.json b/_maps/configs/nanotrasen_ranger.json index b4af3e797d39..36c98b719f10 100644 --- 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/constellado/Pentest/master/_maps/ship_config_schema.json", "prefix": "NTSV", "map_name": "Ranger-class Aid Vessel", "namelists": [ diff --git a/_maps/configs/nanotrasen_skipper.json b/_maps/configs/nanotrasen_skipper.json index 2f61c3afa601..058dd77c1c94 100644 --- a/_maps/configs/nanotrasen_skipper.json +++ b/_maps/configs/nanotrasen_skipper.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Skipper-class Heavy Cruiser", "map_short_name": "Skipper-class", "prefix": "NTSV", diff --git a/_maps/configs/pgf_crying_sun.json b/_maps/configs/pgf_crying_sun.json index d4eb67b1fb50..9aac8352e5b5 100644 --- a/_maps/configs/pgf_crying_sun.json +++ b/_maps/configs/pgf_crying_sun.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "prefix": "PGFN", "map_name": "Crying Sun-class Light Frigate", "namelists": [ diff --git a/_maps/configs/pirate_libertatia.json b/_maps/configs/pirate_libertatia.json index 4ed426746512..b29e18bf7af5 100644 --- 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/shiptest-ss13/Shiptest/master/_maps/", "map_name": "Libertatia-class Hauler", "map_short_name": "Libertatia-class", "map_path": "_maps/shuttles/pirate/pirate_libertatia.dmm", diff --git a/_maps/configs/pirate_noderider.json b/_maps/configs/pirate_noderider.json index 7863a9d96896..699b9a383f22 100644 --- a/_maps/configs/pirate_noderider.json +++ b/_maps/configs/pirate_noderider.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Jupiter-class Stormrider", "map_short_name": "Jupiter-class", "prefix": "ISV", diff --git a/_maps/configs/pirate_tortuga.json b/_maps/configs/pirate_tortuga.json index 702185c02387..ce58e999f2c7 100644 --- 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/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Tortuga-class Converted Cargo Freighter", "prefix": "ISV", "namelists": [ diff --git a/_maps/configs/solgov_chronicle.json b/_maps/configs/solgov_chronicle.json index 9fe11023e376..2d69eeebcb88 100644 --- a/_maps/configs/solgov_chronicle.json +++ b/_maps/configs/solgov_chronicle.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Chronicle-class Sensor Frigate", "prefix": "SCSV", "namelists": [ diff --git a/_maps/configs/solgov_inkwell.json b/_maps/configs/solgov_inkwell.json index b7ae54a1b6b9..4ad92251c170 100644 --- a/_maps/configs/solgov_inkwell.json +++ b/_maps/configs/solgov_inkwell.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Inkwell-class Supply Freighter", "prefix": "SCSV", "namelists": [ diff --git a/_maps/configs/solgov_paracelsus.json b/_maps/configs/solgov_paracelsus.json index a5eefc5296df..721f8c35288c 100644 --- a/_maps/configs/solgov_paracelsus.json +++ b/_maps/configs/solgov_paracelsus.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Paracelsus-class Medical Corvette", "prefix": "SCSV", "namelists": [ diff --git a/_maps/configs/srm_elder.json b/_maps/configs/srm_elder.json index 03caf7196183..2473ee150dc8 100644 --- a/_maps/configs/srm_elder.json +++ b/_maps/configs/srm_elder.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Elder-class Montagnes' Vessel", "prefix": "SRSV", "namelists": [ diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json index a9c9fcb94349..da3997f560e2 100644 --- a/_maps/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/configs/syndicate_cybersun_kansatsu.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "prefix": "CSSV", "namelists": [ "CYBERSUN", diff --git a/_maps/configs/syndicate_gorlex_hyena.json b/_maps/configs/syndicate_gorlex_hyena.json index a835e00b1eba..d80015e991bf 100644 --- a/_maps/configs/syndicate_gorlex_hyena.json +++ b/_maps/configs/syndicate_gorlex_hyena.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/", "prefix": "NGRV", "namelists": [ "GORLEX", diff --git a/_maps/configs/syndicate_litieguai.json b/_maps/configs/syndicate_litieguai.json index 685a53187422..58597e19b8f9 100644 --- a/_maps/configs/syndicate_litieguai.json +++ b/_maps/configs/syndicate_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/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Li Tieguai-class Rescue Ship", "prefix": "CSSV", "map_short_name": "Li Tieguai-class", diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json index ef84cca126f5..da4582e107da 100644 --- 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/constellado/Pentest/master/_maps/ship_config_schema.json", "prefix": "SSV", "namelists": [ "GORLEX", diff --git a/_maps/configs/terragov_chronicle.json b/_maps/configs/terragov_chronicle.json new file mode 100644 index 000000000000..21520d03fdf1 --- /dev/null +++ b/_maps/configs/terragov_chronicle.json @@ -0,0 +1,47 @@ +{ + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", + "map_name": "Chronicle-class Sensor Frigate", + "prefix": "SCSV", + "namelists": [ + "TERRAGOV", + "SPACE", + "BRITISH_NAVY", + "NATURAL" + ], + "map_short_name": "Chronicle-class", + "map_path": "_maps/shuttles/terragov/terragov_chronicle.dmm", + "description": "Equipped with a sophisticated sensors suite and powerful data utilities, the Chronicle is a clerical workhorse, able to collect and process vast amounts of information. Often employed for census duties and interstellar exploration, the Chronicle is also a favorite of Evidenzkompanien, employed often for intelligence operations. With this fact in mind, Chronicle-class vessels are often placed under increased scrutiny by patrols, somewhat mitigating their effectiveness as a spymaster's tool.", + "tags": [ + "Specialist" + ], + "limit": 1, + "job_slots": { + "Captain": { + "outfit": "/datum/outfit/job/terragov/captain", + "officer": true, + "slots": 1 + }, + "Overseer": { + "outfit": "/datum/outfit/job/terragov/overseer", + "officer": true, + "slots": 1 + }, + "Sonnensöldner": { + "outfit": "/datum/outfit/job/terragov/sonnensoldner", + "slots": 1 + }, + "Ship Engineer": { + "outfit": "/datum/outfit/job/terragov/engineer", + "slots": 2 + }, + "Field Engineer": { + "outfit": "/datum/outfit/job/terragov/miner", + "slots": 2 + }, + "Scribe": { + "outfit": "/datum/outfit/job/terragov/assistant", + "slots" : 2 + } + }, + "enabled": true +} diff --git a/_maps/configs/terragov_inkwell.json b/_maps/configs/terragov_inkwell.json new file mode 100644 index 000000000000..66f38195667a --- /dev/null +++ b/_maps/configs/terragov_inkwell.json @@ -0,0 +1,49 @@ +{ + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", + "map_name": "Inkwell-class Supply Freighter", + "prefix": "SCSV", + "namelists": [ + "TERRAGOV", + "SPACE", + "BRITISH_NAVY", + "NATURAL" + ], + "map_short_name": "Inkwell-class", + "map_path": "_maps/shuttles/terragov/terragov_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-Terran 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": { + "Captain": { + "outfit": "/datum/outfit/job/terragov/captain", + "officer": true, + "slots": 1 + }, + "Logistics Deck Officer": { + "outfit": "/datum/outfit/job/terragov/quartermaster", + "officer": true, + "slots": 1 + }, + "Sonnensöldner": { + "outfit": "/datum/outfit/job/terragov/sonnensoldner", + "slots": 3 + }, + "Ship Engineer": { + "outfit": "/datum/outfit/job/terragov/engineer", + "slots": 2 + }, + "Field Engineer": { + "outfit": "/datum/outfit/job/terragov/miner", + "slots": 3 + }, + "Bureaucrat": { + "outfit": "/datum/outfit/job/terragov/bureaucrat", + "slots": 2 + }, + "Scribe": { + "outfit": "/datum/outfit/job/terragov/assistant", + "slots" : 6 + } + }, + "enabled": true +} diff --git a/_maps/configs/terragov_paracelsus.json b/_maps/configs/terragov_paracelsus.json new file mode 100644 index 000000000000..abe2e57399ae --- /dev/null +++ b/_maps/configs/terragov_paracelsus.json @@ -0,0 +1,54 @@ +{ + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", + "map_name": "Paracelsus-class Medical Corvette", + "prefix": "SCSV", + "namelists": [ + "TERRAGOV", + "SPACE", + "BRITISH_NAVY", + "NATURAL" + ], + "map_short_name": "Paracelsus-class", + "description": "Fulfilling its role as a medicinal powerhouse of the Terran Navy, the Paracelsus-class is a specially designed corvette to assist terran fleets in medical troubles, as well as supplying such vessels with medication. Scribes pursuing a medical degree often work in these ships to shadow trained medical doctors to complete their residency.", + "tags": ["RP Focus", "Medical", "Chemistry"], + "map_path": "_maps/shuttles/terragov/terragov_paracelsus.dmm", + "limit": 1, + "job_slots": { + "Captain": { + "outfit": "/datum/outfit/job/terragov/captain", + "officer": true, + "slots": 1 + }, + "Overseer": { + "outfit": "/datum/outfit/job/terragov/overseer", + "officer": true, + "slots": 1 + }, + "Medical Doctor": { + "outfit": "/datum/outfit/job/terragov/doctor", + "slots": 3 + }, + "Ship Engineer": { + "outfit": "/datum/outfit/job/terragov/engineer", + "slots": 1 + }, + "Psychologist": { + "outfit": "/datum/outfit/job/terragov/psychologist", + "slots": 1 + }, + "Field Engineer": { + "outfit": "/datum/outfit/job/terragov/miner", + "slots": 2 + }, + "Scribe": { + "outfit": "/datum/outfit/job/terragov/assistant", + "slots" : 3 + }, + "Attentive Care Patient": { + "outfit": "/datum/outfit/job/terragov/patient", + "slots" : 3 + } + + }, + "enabled": true +} diff --git a/_maps/example_ship_config.json b/_maps/example_ship_config.json index 7c34d7bc6841..f164f488e441 100644 --- a/_maps/example_ship_config.json +++ b/_maps/example_ship_config.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", + "$schema": "https://raw.githubusercontent.com/Constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Example-class Experimental Ship", "map_short_name": "Test-class", "prefix": "STSV", diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json index 2afd8e065170..d444f71a89e2 100644 --- a/_maps/ship_config_schema.json +++ b/_maps/ship_config_schema.json @@ -21,7 +21,7 @@ "title": "Class Description", "type": "string", "description": "A description of the ship class, currently only shown to admins on the shuttle manipulator, but will likely be shown to players before ship purchase in the future.", - "minLength": 250 + "minLength": 50 }, "tags": { "title": "Ship Tags", @@ -54,6 +54,10 @@ "SPACE", "NATURAL", "NATURAL_AGGRESSIVE", + "TERRAGOV", + "MOTHIC", + "TIZIRAN", + "ETHEREAL", "BEASTS", "MYTHOLOGICAL", "HISTORICAL", @@ -71,6 +75,10 @@ "ACLF", "GEC", "DONK", + "SELF", + "HORIZON", + "HERETICAL", + "BLUESPACE", "CLIP MINUTEMEN", "SAINT-ROUMAIN", "INSTALLATION", From 3e9ff6782bb43e112e74af7d848df0e6449ba198 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 18:13:17 +1200 Subject: [PATCH 2/3] woopsies --- _maps/configs/terragov_chronicle.json | 47 ---------------------- _maps/configs/terragov_inkwell.json | 49 ----------------------- _maps/configs/terragov_paracelsus.json | 54 -------------------------- 3 files changed, 150 deletions(-) delete mode 100644 _maps/configs/terragov_chronicle.json delete mode 100644 _maps/configs/terragov_inkwell.json delete mode 100644 _maps/configs/terragov_paracelsus.json diff --git a/_maps/configs/terragov_chronicle.json b/_maps/configs/terragov_chronicle.json deleted file mode 100644 index 21520d03fdf1..000000000000 --- a/_maps/configs/terragov_chronicle.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", - "map_name": "Chronicle-class Sensor Frigate", - "prefix": "SCSV", - "namelists": [ - "TERRAGOV", - "SPACE", - "BRITISH_NAVY", - "NATURAL" - ], - "map_short_name": "Chronicle-class", - "map_path": "_maps/shuttles/terragov/terragov_chronicle.dmm", - "description": "Equipped with a sophisticated sensors suite and powerful data utilities, the Chronicle is a clerical workhorse, able to collect and process vast amounts of information. Often employed for census duties and interstellar exploration, the Chronicle is also a favorite of Evidenzkompanien, employed often for intelligence operations. With this fact in mind, Chronicle-class vessels are often placed under increased scrutiny by patrols, somewhat mitigating their effectiveness as a spymaster's tool.", - "tags": [ - "Specialist" - ], - "limit": 1, - "job_slots": { - "Captain": { - "outfit": "/datum/outfit/job/terragov/captain", - "officer": true, - "slots": 1 - }, - "Overseer": { - "outfit": "/datum/outfit/job/terragov/overseer", - "officer": true, - "slots": 1 - }, - "Sonnensöldner": { - "outfit": "/datum/outfit/job/terragov/sonnensoldner", - "slots": 1 - }, - "Ship Engineer": { - "outfit": "/datum/outfit/job/terragov/engineer", - "slots": 2 - }, - "Field Engineer": { - "outfit": "/datum/outfit/job/terragov/miner", - "slots": 2 - }, - "Scribe": { - "outfit": "/datum/outfit/job/terragov/assistant", - "slots" : 2 - } - }, - "enabled": true -} diff --git a/_maps/configs/terragov_inkwell.json b/_maps/configs/terragov_inkwell.json deleted file mode 100644 index 66f38195667a..000000000000 --- a/_maps/configs/terragov_inkwell.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", - "map_name": "Inkwell-class Supply Freighter", - "prefix": "SCSV", - "namelists": [ - "TERRAGOV", - "SPACE", - "BRITISH_NAVY", - "NATURAL" - ], - "map_short_name": "Inkwell-class", - "map_path": "_maps/shuttles/terragov/terragov_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-Terran 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": { - "Captain": { - "outfit": "/datum/outfit/job/terragov/captain", - "officer": true, - "slots": 1 - }, - "Logistics Deck Officer": { - "outfit": "/datum/outfit/job/terragov/quartermaster", - "officer": true, - "slots": 1 - }, - "Sonnensöldner": { - "outfit": "/datum/outfit/job/terragov/sonnensoldner", - "slots": 3 - }, - "Ship Engineer": { - "outfit": "/datum/outfit/job/terragov/engineer", - "slots": 2 - }, - "Field Engineer": { - "outfit": "/datum/outfit/job/terragov/miner", - "slots": 3 - }, - "Bureaucrat": { - "outfit": "/datum/outfit/job/terragov/bureaucrat", - "slots": 2 - }, - "Scribe": { - "outfit": "/datum/outfit/job/terragov/assistant", - "slots" : 6 - } - }, - "enabled": true -} diff --git a/_maps/configs/terragov_paracelsus.json b/_maps/configs/terragov_paracelsus.json deleted file mode 100644 index abe2e57399ae..000000000000 --- a/_maps/configs/terragov_paracelsus.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", - "map_name": "Paracelsus-class Medical Corvette", - "prefix": "SCSV", - "namelists": [ - "TERRAGOV", - "SPACE", - "BRITISH_NAVY", - "NATURAL" - ], - "map_short_name": "Paracelsus-class", - "description": "Fulfilling its role as a medicinal powerhouse of the Terran Navy, the Paracelsus-class is a specially designed corvette to assist terran fleets in medical troubles, as well as supplying such vessels with medication. Scribes pursuing a medical degree often work in these ships to shadow trained medical doctors to complete their residency.", - "tags": ["RP Focus", "Medical", "Chemistry"], - "map_path": "_maps/shuttles/terragov/terragov_paracelsus.dmm", - "limit": 1, - "job_slots": { - "Captain": { - "outfit": "/datum/outfit/job/terragov/captain", - "officer": true, - "slots": 1 - }, - "Overseer": { - "outfit": "/datum/outfit/job/terragov/overseer", - "officer": true, - "slots": 1 - }, - "Medical Doctor": { - "outfit": "/datum/outfit/job/terragov/doctor", - "slots": 3 - }, - "Ship Engineer": { - "outfit": "/datum/outfit/job/terragov/engineer", - "slots": 1 - }, - "Psychologist": { - "outfit": "/datum/outfit/job/terragov/psychologist", - "slots": 1 - }, - "Field Engineer": { - "outfit": "/datum/outfit/job/terragov/miner", - "slots": 2 - }, - "Scribe": { - "outfit": "/datum/outfit/job/terragov/assistant", - "slots" : 3 - }, - "Attentive Care Patient": { - "outfit": "/datum/outfit/job/terragov/patient", - "slots" : 3 - } - - }, - "enabled": true -} From 87cca46b1b097c7c0192f6c8e26e5ea8ad9e442b Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 27 Jul 2024 18:26:28 +1200 Subject: [PATCH 3/3] fix fix fixy! --- _maps/configs/nanotrasen_heron.json | 2 +- _maps/configs/nanotrasen_meta.json | 2 +- _maps/configs/nanotrasen_mimir.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/configs/nanotrasen_heron.json b/_maps/configs/nanotrasen_heron.json index c655483ffee1..839052ab961f 100644 --- a/_maps/configs/nanotrasen_heron.json +++ b/_maps/configs/nanotrasen_heron.json @@ -1,5 +1,5 @@ { - "$schema": " + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "prefix": "NTSV", "namelists": ["WEAPONS"], "map_name": "Heron-Class Dreadnaught", diff --git a/_maps/configs/nanotrasen_meta.json b/_maps/configs/nanotrasen_meta.json index f88a452e90e2..94d2c2e65fdf 100644 --- a/_maps/configs/nanotrasen_meta.json +++ b/_maps/configs/nanotrasen_meta.json @@ -1,5 +1,5 @@ { - "$schema": " + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "map_name": "Meta-class Freighter", "prefix": "NTSV", "map_short_name": "Meta-class", diff --git a/_maps/configs/nanotrasen_mimir.json b/_maps/configs/nanotrasen_mimir.json index 5bb74a5e44e9..82eb21b1c44d 100644 --- a/_maps/configs/nanotrasen_mimir.json +++ b/_maps/configs/nanotrasen_mimir.json @@ -1,5 +1,5 @@ { - "$schema": " + "$schema": "https://raw.githubusercontent.com/constellado/Pentest/master/_maps/ship_config_schema.json", "prefix": "NTSV", "namelists": [ "NANOTRASEN",