diff --git a/_maps/configs/independent_atoll.json b/_maps/configs/independent_atoll.json index 4d91d09694be..d0f32c9a8428 100644 --- a/_maps/configs/independent_atoll.json +++ b/_maps/configs/independent_atoll.json @@ -14,6 +14,7 @@ ], "faction": "/datum/faction/independent", "prefix": "IMV", + "manufacturer": "Ihejirika Civ. Manufacturing", "job_slots": { "Captain": { "outfit": "/datum/outfit/job/independent/captain", diff --git a/_maps/configs/independent_bubble.json b/_maps/configs/independent_bubble.json index 33a8cf8c1815..c2b5221122ce 100644 --- a/_maps/configs/independent_bubble.json +++ b/_maps/configs/independent_bubble.json @@ -14,6 +14,7 @@ ], "faction": "/datum/faction/independent", "prefix": "ISV", + "manufacturer": "Nanotrasen Spaceworks", "limit": 1, "job_slots": { "Captain": { diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json index e770c725fc14..b9f35dcc7322 100644 --- a/_maps/configs/independent_dwayne.json +++ b/_maps/configs/independent_dwayne.json @@ -3,6 +3,7 @@ "map_name": "Mark.II Dwayne-class Long Range Mining Transport", "faction": "/datum/faction/independent", "prefix": "SV", + "manufacturer": "Nanotrasen Spaceworks", "namelists": [ "GENERAL", "SPACE", diff --git a/_maps/configs/independent_kilo.json b/_maps/configs/independent_kilo.json index 9ff4ccfbf191..da6683e9db22 100644 --- a/_maps/configs/independent_kilo.json +++ b/_maps/configs/independent_kilo.json @@ -7,6 +7,7 @@ ], "faction": "/datum/faction/independent", "prefix": "SV", + "manufacturer": "Miskilamo Spacefaring", "namelists": [ "GENERAL", "SPACE", diff --git a/_maps/configs/independent_mudskipper.json b/_maps/configs/independent_mudskipper.json index 469230d752a3..15ca44b9096c 100644 --- a/_maps/configs/independent_mudskipper.json +++ b/_maps/configs/independent_mudskipper.json @@ -4,6 +4,7 @@ "map_short_name": "Mudskipper-class", "faction": "/datum/faction/independent", "prefix": "ISV", + "manufacturer": "Miskilamo Spacefaring", "description": "One of the cheapest (and yet, inexplicably popular) offerings from Miskilamo Spacefaring, the Mudskipper-class is a vessel purpose-built for enterprising scrappers and looters looking to salvage bombed-out ruins and harvest boatloads of materials. Featuring a diverse set of multipurpose rooms, a charitable supply of EVA/ruin raiding equipment, and a set of anti-radiation gear for dealing with industrial accidents, the Mudskipper-class just keeps on chuggin’!", "tags": [ "Combat", diff --git a/_maps/configs/independent_raleigh.json b/_maps/configs/independent_raleigh.json index 2f818addbd67..adf4cc36365d 100644 --- a/_maps/configs/independent_raleigh.json +++ b/_maps/configs/independent_raleigh.json @@ -3,6 +3,7 @@ "map_name": "Raleigh-class Corvette", "faction": "/datum/faction/independent", "prefix": "ISV", + "manufacturer": "Kasagi-Fischer Partnership", "namelists": [ "SPACE", "BEASTS", diff --git a/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json index 57f147867e29..0f981f395c41 100644 --- a/_maps/configs/independent_rigger.json +++ b/_maps/configs/independent_rigger.json @@ -3,6 +3,7 @@ "map_name": "Riggs-class Sloop", "faction": "/datum/faction/independent", "prefix": "SV", + "manufacturer": "Kasagi-Fischer Partnership", "namelists": [ "GENERAL", "SPACE", diff --git a/_maps/configs/independent_scarab.json b/_maps/configs/independent_scarab.json index 8916043ea6a4..6c5721785335 100644 --- a/_maps/configs/independent_scarab.json +++ b/_maps/configs/independent_scarab.json @@ -3,6 +3,7 @@ "map_name": "Scarab-class Heavy Mining Ship", "faction": "/datum/faction/independent", "prefix": "SV", + "manufacturer": "Hardline Salvage and Mining", "namelists": [ "GENERAL", "SPACE", diff --git a/_maps/configs/independent_shetland.json b/_maps/configs/independent_shetland.json index a44478e49c74..b9897788bd10 100644 --- a/_maps/configs/independent_shetland.json +++ b/_maps/configs/independent_shetland.json @@ -2,6 +2,7 @@ "map_name": "Shetland-class Multipurpose Frigate", "faction": "/datum/faction/independent", "prefix": "SV", + "manufacturer": "Miskilamo Spacefaring", "namelists": [ "GENERAL", "SPACE", diff --git a/_maps/configs/independent_sunskipper.json b/_maps/configs/independent_sunskipper.json index a87d2582f097..792959d95b41 100644 --- a/_maps/configs/independent_sunskipper.json +++ b/_maps/configs/independent_sunskipper.json @@ -3,6 +3,7 @@ "map_name": "Sunskipper-class Culinary Vessel", "faction": "/datum/faction/independent", "prefix": "SV", + "manufacturer": "Ihejirika Civ. Manufacturing", "namelists": ["CRUISE", "NATURAL"], "map_short_name": "Sunskipper-class", "map_path": "_maps/shuttles/independent/independent_sunskipper.dmm", diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json index 68bc1e2ec1b3..d4e930750607 100644 --- a/_maps/configs/inteq_colossus.json +++ b/_maps/configs/inteq_colossus.json @@ -3,6 +3,7 @@ "map_name": "Colossus-class Armored Frigate", "faction": "/datum/faction/inteq", "prefix": "IRMV", + "manufacturer": "Hardline Salvage and Mining", "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.", "tags": [ "Combat", diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json index b2d39c10f443..9bbef06f0458 100644 --- a/_maps/configs/inteq_talos.json +++ b/_maps/configs/inteq_talos.json @@ -3,6 +3,7 @@ "map_name": "Talos-class Command Clipper", "faction": "/datum/faction/inteq", "prefix": "IRMV", + "manufacturer": "Hardline Salvage and Mining", "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.", "tags": [ "Engineer", @@ -47,7 +48,7 @@ }, "Recruit": { "outfit": "/datum/outfit/job/inteq/assistant", - "slots": 4 + "slots": 4 } }, "enabled": true diff --git a/_maps/configs/inteq_valor.json b/_maps/configs/inteq_valor.json index 9c23544026ce..63252ef4d614 100644 --- a/_maps/configs/inteq_valor.json +++ b/_maps/configs/inteq_valor.json @@ -3,6 +3,7 @@ "map_name": "Valor-Class Field Care Cruiser", "faction": "/datum/faction/inteq", "prefix": "IRMV", + "manufacturer": "Hardline Salvage and Mining", "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.", "tags": ["Medical", "Subshuttle"], "namelists": [ diff --git a/_maps/configs/inteq_vaquero.json b/_maps/configs/inteq_vaquero.json index 2b0bed8bfe98..42c0a1a374c8 100644 --- a/_maps/configs/inteq_vaquero.json +++ b/_maps/configs/inteq_vaquero.json @@ -3,6 +3,7 @@ "map_name": "Vaquero-class Light Frigate", "faction": "/datum/faction/inteq", "prefix": "IRMV", + "manufacturer": "Hardline Salvage and Mining", "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.", "tags": [ "Generalist" diff --git a/_maps/configs/minutemen_atlas.json b/_maps/configs/minutemen_atlas.json index 32f30caa5b75..894ef5dc50b0 100644 --- a/_maps/configs/minutemen_atlas.json +++ b/_maps/configs/minutemen_atlas.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Atlas-class Light Armored Crusier", "prefix": "CMSV", + "manufacturer": "Lanchester Shipyards", "namelists": ["GENERAL", "CLIP MINUTEMEN", "NATURAL_AGGRESSIVE"], "description": "The Atlas-Class is the designation for some of the oldest serving vessels in the Confederated League's military fleet. Originally the Atlantas-class, the design of the Atlantas was taken by the Colonial Militia just before the beginning of the war with the Old Frontiersmen, playing a pivotal role in multiple skirmishes. It is small in size and crew, well-rounded, and well-suited as an unexpensive hit-and-run vessel. Despite its age, the Atlas continues to serve the Confederated League for peacekeeping missions and driving off small crews of pirates from colonies.", "tags": [ diff --git a/_maps/configs/nanotrasen_delta.json b/_maps/configs/nanotrasen_delta.json index cf28abc50219..fe6345afbc0d 100644 --- a/_maps/configs/nanotrasen_delta.json +++ b/_maps/configs/nanotrasen_delta.json @@ -3,6 +3,7 @@ "map_name": "Delta-class Frigate", "faction": "/datum/faction/nt/ns_logi", "prefix": "NSSV", + "manufacturer": "Nanotrasen Spaceworks", "namelists": [ "GENERAL", "SPACE", diff --git a/_maps/configs/nanotrasen_harrier.json b/_maps/configs/nanotrasen_harrier.json index 161a699c2783..e627c0ed2044 100644 --- a/_maps/configs/nanotrasen_harrier.json +++ b/_maps/configs/nanotrasen_harrier.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Harrier-class Exploration Cruiser", "prefix": "NTSV", + "manufacturer": "Nanotrasen Spaceworks", "faction": "/datum/faction/nt", "namelists": [ "NANOTRASEN", diff --git a/_maps/configs/nanotrasen_meta.json b/_maps/configs/nanotrasen_meta.json index 207a6a89864b..963c31a34adf 100644 --- a/_maps/configs/nanotrasen_meta.json +++ b/_maps/configs/nanotrasen_meta.json @@ -3,6 +3,7 @@ "map_name": "Meta-class Freighter", "faction": "/datum/faction/nt", "prefix": "NTSV", + "manufacturer": "Nanotrasen Spaceworks", "map_short_name": "Meta-class", "description": "The Meta-class is a medium freight vessel designed for comfort and sustainability over long journeys of delivering cargo. Most, if not all of these ships are no longer under the direct management of the Company, leaving regulation and professionalism at the behest of individual captains. They can be found running independent contracts, delivering cargo, smuggling illicit goods, and generally trying to stay afloat ever since the collapse of Nanotrasen's operations in the frontier.", "tags": [ diff --git a/_maps/configs/nanotrasen_ranger.json b/_maps/configs/nanotrasen_ranger.json index fedc351e03b0..f5568a0a0343 100644 --- a/_maps/configs/nanotrasen_ranger.json +++ b/_maps/configs/nanotrasen_ranger.json @@ -1,6 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "prefix": "VISV", + "manufacturer": "Nanotrasen Spaceworks", "map_name": "Ranger-class Aid Vessel", "faction": "/datum/faction/nt/vigilitas", "namelists": [ diff --git a/_maps/configs/nanotrasen_tegu.json b/_maps/configs/nanotrasen_tegu.json index 92b8ddfa5fc1..993536ac2722 100644 --- a/_maps/configs/nanotrasen_tegu.json +++ b/_maps/configs/nanotrasen_tegu.json @@ -3,6 +3,7 @@ "map_name": "Tegu-class Communications Freighter", "faction": "/datum/faction/nt", "prefix": "NTSV", + "manufacturer": "Nanotrasen Spaceworks", "namelists": [ "NANOTRASEN", "SPACE", diff --git a/_maps/configs/pgf_crying_sun.json b/_maps/configs/pgf_crying_sun.json index fd8bfa3347b4..d6932a6efcb8 100644 --- a/_maps/configs/pgf_crying_sun.json +++ b/_maps/configs/pgf_crying_sun.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "faction": "/datum/faction/pgf", "prefix": "PGFN", + "manufacturer": "Etherbor Lihmona Shipyards", "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 index 6c3fe8e153c0..9f1698b9585c 100644 --- a/_maps/configs/pgf_elated_bolide.json +++ b/_maps/configs/pgf_elated_bolide.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "faction": "/datum/faction/pgf", "prefix": "PGFN", + "manufacturer": "Etherbor Lihmona Shipyards", "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 index 442ebd2cc066..57ac133e3c71 100644 --- a/_maps/configs/pgf_woeful_cthonian.json +++ b/_maps/configs/pgf_woeful_cthonian.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "faction": "/datum/faction/pgf", "prefix": "PGFN", + "manufacturer": "Axilai Orbital Works", "map_name": "Woeful Cthonian-class Patrol Cutter", "namelists": [ "PGF" diff --git a/_maps/configs/pirate_libertatia.json b/_maps/configs/pirate_libertatia.json index 9a77cc2c5dec..5ba322f61f84 100644 --- a/_maps/configs/pirate_libertatia.json +++ b/_maps/configs/pirate_libertatia.json @@ -9,6 +9,7 @@ ], "faction": "/datum/faction/frontier", "prefix": "ISV", + "manufacturer": "Miskilamo Spacefaring", "namelists": [ "PIRATES", "NATURAL_AGGRESSIVE" diff --git a/_maps/configs/pirate_tortuga.json b/_maps/configs/pirate_tortuga.json index 6543d349bad9..e72dc3df25c9 100644 --- a/_maps/configs/pirate_tortuga.json +++ b/_maps/configs/pirate_tortuga.json @@ -3,6 +3,7 @@ "map_name": "Tortuga-class Converted Cargo Freighter", "faction": "/datum/faction/frontier", "prefix": "ISV", + "manufacturer": "Miskilamo Spacefaring", "namelists": [ "PIRATES", "BRITISH_NAVY" diff --git a/_maps/configs/syndicate_cybersun_litieguai.json b/_maps/configs/syndicate_cybersun_litieguai.json index 41fb97deb3ac..a79781362c3d 100644 --- a/_maps/configs/syndicate_cybersun_litieguai.json +++ b/_maps/configs/syndicate_cybersun_litieguai.json @@ -3,6 +3,7 @@ "map_name": "Li Tieguai-class Rescue Ship", "faction": "/datum/faction/syndicate/cybersun", "prefix": "CSSV", + "manufacturer": "ISF Spacecraft", "map_short_name": "Li Tieguai-class", "description": "A small, nimble, and exceptionally well-built medical response vessel, the Li Tieguai is a recent addition to Cybersun’s fleet, forming a critical component of their Frontier stabilization program. Li Tieguais come equipped with high-end medical equipment, including a selection of Cybersun augments and prosthetics, as well as weaponry and armor sufficient to protect its personnel in the often-dangerous Frontier sectors, so that they can offer premium healthcare (at premium prices) in even the most dangerous of scenarios.", "tags": [ diff --git a/_maps/configs/syndicate_gorlex_komodo.json b/_maps/configs/syndicate_gorlex_komodo.json index 5044590efb15..c6bb9d806f7c 100644 --- a/_maps/configs/syndicate_gorlex_komodo.json +++ b/_maps/configs/syndicate_gorlex_komodo.json @@ -1,6 +1,7 @@ { "faction": "/datum/faction/syndicate/hardliners", "prefix": "ISV", + "manufacturer": "Cybersun", "namelists": [ "GORLEX", "NATURAL_AGGRESSIVE", diff --git a/_maps/configs/syndicate_ngr_derecho.json b/_maps/configs/syndicate_ngr_derecho.json index e65ab90e3c7c..b607a903b482 100644 --- a/_maps/configs/syndicate_ngr_derecho.json +++ b/_maps/configs/syndicate_ngr_derecho.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "faction": "/datum/faction/syndicate/ngr", "prefix": "NGRV", + "manufacturer": "Hardline Salvage and Mining", "namelists": [ "GORLEX", "NATURAL_AGGRESSIVE", diff --git a/_maps/configs/syndicate_ngr_kaliandhi.json b/_maps/configs/syndicate_ngr_kaliandhi.json index 81b32af32741..e46133492841 100644 --- a/_maps/configs/syndicate_ngr_kaliandhi.json +++ b/_maps/configs/syndicate_ngr_kaliandhi.json @@ -1,6 +1,7 @@ { "faction": "/datum/faction/syndicate/ngr", "prefix": "NGRV", + "manufacturer": "Hardline Salvage and Mining", "namelists": [ "GORLEX", "NATURAL_AGGRESSIVE", diff --git a/_maps/configs/syndicate_panacea.json b/_maps/configs/syndicate_panacea.json index f56158d9d9df..f86e9c54439c 100644 --- a/_maps/configs/syndicate_panacea.json +++ b/_maps/configs/syndicate_panacea.json @@ -1,5 +1,6 @@ { "prefix": "SUNS", + "manufacturer": "Cybersun", "map_name": "Panacea-class Infirm Vessel", "map_short_name": "Panacea-class", "map_path": "_maps/shuttles/syndicate/syndicate_panacea.dmm", diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json index b1be2eb333d8..258cc1cc9858 100644 --- a/_maps/configs/syndicate_twinkleshine.json +++ b/_maps/configs/syndicate_twinkleshine.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "faction": "/datum/faction/syndicate", "prefix": "SSV", + "manufacturer": "Cybersun", "namelists": [ "GORLEX", "SPACE", diff --git a/_maps/example_ship_config.json b/_maps/example_ship_config.json index e5dbd47d61e2..c94b171bfc80 100644 --- a/_maps/example_ship_config.json +++ b/_maps/example_ship_config.json @@ -4,6 +4,7 @@ "map_short_name": "Test-class", "faction": "/datum/faction/independent", "prefix": "STSV", + "manufacturer": "Ihejirika Civ. Manufacturing", "namelists": ["GENERAL", "SPACE", "MYTHOLOGICAL", "WEAPONS"], "map_path": "_maps/shuttles/shiptest/null.dmm", "limit": 1, diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json index 1efa9eb95f2c..dba271025a1d 100644 --- a/_maps/ship_config_schema.json +++ b/_maps/ship_config_schema.json @@ -39,6 +39,11 @@ "description": "The prefix of the ship class, appended to randomly generated names when they're first purchased.", "maxLength": 5 }, + "manufacturer": { + "title": "Ship Manufacturer", + "type": [ "null", "string" ], + "description": "The manufacturer of the ship class, used in autowiki templates." + }, "namelists": { "title": "Namelists", "type": "array", diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 3fecc68fbfe4..ce076357c0ac 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -207,6 +207,9 @@ SUBSYSTEM_DEF(mapping) if(istext(data["prefix"])) S.prefix = data["prefix"] + if(istext(data["manufacturer"])) + S.manufacturer = data["manufacturer"] + if(istext(data["faction"])) S.faction_path = text2path(data["faction"]) if(S.faction_path) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 9e0e8c125978..94dd2122c14d 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -19,6 +19,8 @@ var/list/name_categories = list("GENERAL") /// The prefix of the ship's name. var/prefix = "ISV" + /// The name of the ship's manufacturer. + var/manufacturer = "Unknown" /// The full name of the ship's faction. var/faction_name = "Independent" var/faction_path = /datum/faction/independent diff --git a/code/modules/autowiki/pages/ships.dm b/code/modules/autowiki/pages/ships.dm index c59a321942b6..56b59c8b6540 100644 --- a/code/modules/autowiki/pages/ships.dm +++ b/code/modules/autowiki/pages/ships.dm @@ -28,6 +28,7 @@ "name" = ship_name, "shortname" = escape_value(ship.short_name) || ship_name, "description" = escape_value(ship.description), + "manufacturer" = escape_value(ship.manufacturer), "prefix" = escape_value(ship.prefix), "tags" = escape_value(ship.tags?.Join(", ")), "limit" = ship.limit,