From 8f3b01b6bf2bc6b8a198c72035a72c4fcf75aedb Mon Sep 17 00:00:00 2001 From: Bjarl <94164348+Bjarl@users.noreply.github.com> Date: Thu, 20 Jul 2023 22:04:08 -0700 Subject: [PATCH] Ship Funds "Refactor" (#2157) ## About The Pull Request A ship's starting funds are now settable in their ship's config, allowing some granularity of control. A few ships now use this feature to either have more or less starting funds. Unique Ship Access is also enabled by default (no idea why it wasn't) and the junker now has a safe with a cargo console. ## Why It's Good For The Game More variety + more granularity of control. ## Changelog :cl: add: The Junker has another Mystery Safe add: Ships can now start with varying amounts of money. add: Ship access might work now /:cl: --- _maps/configs/independent_beluga.json | 7 ++++++- _maps/configs/independent_box.json | 4 +++- _maps/configs/independent_boyardee.json | 8 ++++++-- _maps/configs/independent_bubble.json | 5 ++++- _maps/configs/independent_byo.json | 5 ++++- _maps/configs/independent_caravan.json | 5 ++++- _maps/configs/independent_dwayne.json | 5 ++++- _maps/configs/independent_halftrack.json | 5 ++++- _maps/configs/independent_junker.json | 5 ++++- _maps/configs/independent_kilo.json | 6 ++++-- _maps/configs/independent_lagoon.json | 7 ++++++- _maps/configs/independent_litieguai.json | 4 +++- _maps/configs/independent_masinyane.json | 4 +++- _maps/configs/independent_meta.json | 5 ++++- _maps/configs/independent_metis.json | 9 +++++++-- _maps/configs/independent_nemo.json | 7 ++++++- _maps/configs/independent_pill.json | 5 ++++- _maps/configs/independent_rigger.json | 7 ++++++- _maps/configs/independent_scav.json | 4 +++- _maps/configs/independent_schmiedeberg.json | 6 +++++- _maps/configs/independent_shepherd.json | 6 +++++- _maps/configs/independent_shetland.json | 6 +++++- _maps/configs/independent_tranquility.json | 6 +++++- _maps/configs/inteq_colossus.json | 5 ++++- _maps/configs/inteq_hound.json | 4 +++- _maps/configs/inteq_talos.json | 5 ++++- _maps/configs/minutemen_asclepius.json | 5 ++++- _maps/configs/minutemen_cepheus.json | 4 +++- _maps/configs/minutemen_corvus.json | 5 ++++- _maps/configs/minutemen_vela.json | 7 ++++++- _maps/configs/nanotrasen_delta.json | 6 +++++- _maps/configs/nanotrasen_gecko.json | 6 +++++- _maps/configs/nanotrasen_mimir.json | 7 ++++++- _maps/configs/nanotrasen_osprey.json | 1 + _maps/configs/nanotrasen_powerrangers.json | 10 +++++++++- _maps/configs/nanotrasen_skipper.json | 6 +++++- _maps/configs/pirate_ember.json | 7 ++++++- _maps/configs/pirate_libertatia.json | 9 +++++++-- _maps/configs/pirate_noderider.json | 12 ++++++++++-- _maps/configs/solgov_chronicle.json | 4 +++- _maps/configs/srm_glaive.json | 11 +++++++++-- _maps/configs/syndicate_aegis.json | 6 +++++- _maps/configs/syndicate_cybersun_kansatsu.json | 4 +++- _maps/configs/syndicate_gorlex_hyena.json | 5 ++++- _maps/configs/syndicate_gorlex_komodo.json | 6 +++++- _maps/configs/syndicate_lugol.json | 11 +++++++++-- _maps/configs/syndicate_luxembourg.json | 12 ++++++++++-- _maps/configs/syndicate_twinkleshine.json | 13 +++++++++++-- _maps/ship_config_schema.json | 8 ++++++++ _maps/shuttles/shiptest/independent_junker.dmm | 2 ++ code/controllers/subsystem/mapping.dm | 3 +++ code/datums/shuttles.dm | 7 ++++++- code/modules/overmap/ships/controlled_ship_datum.dm | 2 +- 53 files changed, 266 insertions(+), 58 deletions(-) diff --git a/_maps/configs/independent_beluga.json b/_maps/configs/independent_beluga.json index 63133862bdc6..dcbcba91b54d 100644 --- a/_maps/configs/independent_beluga.json +++ b/_maps/configs/independent_beluga.json @@ -6,7 +6,12 @@ "map_short_name": "Beluga-class", "map_path": "_maps/shuttles/shiptest/independent_beluga.dmm", "description": "The Beluga-Class is a transport vessel for those with especially rich blood. Featuring a modest kitchen, hired Inteq security, and luxurious decoration, the Beluga is a first choice pick for many wealthy spacers trying to get from point A to B. The independent ship features several rooms for its guests and a well furnished meeting room for any corporate occassion.", - "tags": ["RP Focus", "Riot", "Service"], + "tags": [ + "RP Focus", + "Riot", + "Service" + ], + "starting_funds": 4000, "limit": 2, "roundstart": true, "job_slots": { diff --git a/_maps/configs/independent_box.json b/_maps/configs/independent_box.json index b396ba90963d..f4a836900702 100644 --- a/_maps/configs/independent_box.json +++ b/_maps/configs/independent_box.json @@ -3,7 +3,9 @@ "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.", - "tags": ["Medical"], + "tags": [ + "Medical" + ], "map_path": "_maps/shuttles/shiptest/independent_box.dmm", "namelists": [ "GENERAL", diff --git a/_maps/configs/independent_boyardee.json b/_maps/configs/independent_boyardee.json index 789ac0236184..f5f14556d842 100644 --- a/_maps/configs/independent_boyardee.json +++ b/_maps/configs/independent_boyardee.json @@ -3,13 +3,17 @@ "map_name": "Boyardee-class Entertainment Vessel", "prefix": "ISV", "description": "Named for an ancient Solarian folk hero known for providing food to the masses shortly after the Night of Fire, the Boyardee-class is a remarkably popular civilian vessel, and a welcome sight to any weary travelers tired of synthesized tap water and stale rations for breakfast, lunch and dinner every day. The Boyardee-class features a full bar, an advanced hydroponics setup, a large kitchen and an expansive seating area, perfect for serving hungry customers and thirsty colonists. During the early days of the Syndicate, associated organizations would often create their own retrofits of the Boyardee to serve as recruiting centers or “shore-leave” posts, though these variants have mostly ceased to exist in the Frontier.", - "tags": ["Service", "Botany", "RP Focus"], + "tags": [ + "Service", + "Botany", + "RP Focus" + ], "namelists": [ "GENERAL", "SPACE", "MERCANTILE" ], - + "starting_funds": 5000, "map_short_name": "Boyardee-class", "map_path": "_maps/shuttles/shiptest/independent_boyardee.dmm", "job_slots": { diff --git a/_maps/configs/independent_bubble.json b/_maps/configs/independent_bubble.json index 8f3a30c29e4b..6c94b80564ee 100644 --- a/_maps/configs/independent_bubble.json +++ b/_maps/configs/independent_bubble.json @@ -4,7 +4,10 @@ "map_short_name": "Bubble-class", "map_path": "_maps/shuttles/shiptest/independent_bubble.dmm", "description": "While the most famous colony ships were hulking, highly-advanced affairs designed to ferry hundreds-if-not-thousands of settlers to far-off worlds and create cities in a matter of months – the Kalixcian Moonlight, the Candor, the First Train to Fort Sol – the Bubble-class is designed to cater to homesteaders aiming to establish a small ranch or village out in the great vastness of space. The Bubble-class is highly compact but complete with all the necessities for colony creation – extensive R&D equipment, robust mining gear, and a small selection of personal arms for fending off hostile fauna. While the Bubble-class has been historically utilized by the Solarian Federation for colony efforts, their proprietary version has recently been phased out of operation.", - "tags": ["Generalist", "Construction"], + "tags": [ + "Generalist", + "Construction" + ], "namelists": [ "GENERAL", "SPACE" diff --git a/_maps/configs/independent_byo.json b/_maps/configs/independent_byo.json index e17724203f9c..36fc8718678a 100644 --- a/_maps/configs/independent_byo.json +++ b/_maps/configs/independent_byo.json @@ -4,7 +4,10 @@ "map_short_name": "BYO-class", "map_path": "_maps/shuttles/shiptest/independent_byo.dmm", "description": "The BYO can barely be considered a “ship” when initially deployed; more of a construction platform launched hazardously into space. The only thing that separates crews on a BYO from breathable safety and the cold vacuum of space are typically little airtight flaps of plastic. Equipped with a plethora of building material and tools fit for construction, BYO vessels are seen in a variety of shapes and sizes, and almost never with any consistency of form.", - "tags": ["Engineering", "Construction"], + "tags": [ + "Engineering", + "Construction" + ], "namelists": [ "ENGINEERING", "GENERAL" diff --git a/_maps/configs/independent_caravan.json b/_maps/configs/independent_caravan.json index 03e7f1822838..3e244cbf49b5 100644 --- a/_maps/configs/independent_caravan.json +++ b/_maps/configs/independent_caravan.json @@ -5,7 +5,10 @@ "map_path": "_maps/shuttles/shiptest/independent_caravan.dmm", "prefix": "ISV", "description": "The Caravan is a relatively new freighter pattern, designed around a modular pod system that enables the ship to serve in a variety of roles beyond simple transportation. These pods are designed around a quick-release mechanism that allows the main hull to bluespace jump in, detach the pods, and load a new set of empty Caravan-type pods in a matter of minutes. While impressive in theory, the lack of empty compatible cargo pods in Frontier space renders the quick-detach system useless. Additionally, the modular attachment system is prone to wear and tear, necessitating more frequent and costly maintenance than other freighters. Despite these shortcomings, the Caravan has still earned a reputation as a versatile platform for a variety of missions. The main hull features a robust power pack and respectable crew accommodations, and most examples on the Frontier carry pods loaded for mining and survey duties.", - "tags": ["Generalist", "Engineering"], + "tags": [ + "Generalist", + "Engineering" + ], "namelists": [ "GENERAL", "SPACE", diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json index 9b4eccd82956..2d312fabc045 100644 --- a/_maps/configs/independent_dwayne.json +++ b/_maps/configs/independent_dwayne.json @@ -11,7 +11,10 @@ "map_short_name": "Mk.II Dwayne-class ", "map_path": "_maps/shuttles/shiptest/independent_dwayne.dmm", "description": "The Dwayne is one of the older classes of ships commonly seen on the Frontier, and one of the few such classes that doesn’t also carry a reputation for nightmarish conditions or high accident rates. Originally conceived of as a “mothership” for Nanotrasen mining shuttles that could enable long-duration mining missions at minimal cost, severe budget overruns and issues with the mining shuttle docking system left Nanotrasen with a massive number of mostly-completed hulls upon the project’s cancellation. These hulls were then quickly refurbished and sold on the civilian market, where they proved an immediate success on the Frontier. Contemporary Dwaynes can typically be found carrying a variety of mining equipment and extensive modifications unique to their captains. Recently-available aftermarket modifications have solved the Dwayne’s longstanding shuttle dock issues, allowing modern Dwaynes to finally serve their original design purpose, provided the captain is able to source a shuttle.", - "tags": ["Mining", "Generalist"], + "tags": [ + "Mining", + "Generalist" + ], "roundstart": true, "limit": 1, "job_slots": { diff --git a/_maps/configs/independent_halftrack.json b/_maps/configs/independent_halftrack.json index 181fc0d2a118..65d63f6df6cc 100644 --- a/_maps/configs/independent_halftrack.json +++ b/_maps/configs/independent_halftrack.json @@ -8,7 +8,10 @@ ], "map_short_name": "Halftrack-Class", "description": "A rare sight in the Frontier (but a welcome one), the Halftrack-class is a heavily retrofitted variant of the Li Tieguai-class Rescue Ship, used as a mobile firearms shop by enterprising arms dealers everywhere. While initial variants of the vessel were more obviously just the Li Tieguai with the medical fixtures stripped out and replaced with gun racks and ammunition lockers, the modern iteration of the Halftrack comes complete with a firing range, an Inteq-certified security compliment and a centralized sales floor perfect for showing off the wares while keeping them safe at the same time.", - "tags": ["Combat", "Cargo"], + "tags": [ + "Combat", + "Cargo" + ], "map_path": "_maps/shuttles/shiptest/independent_halftrack.dmm", "job_slots": { "Captain": { diff --git a/_maps/configs/independent_junker.json b/_maps/configs/independent_junker.json index 8f330188d993..26d3ab445766 100644 --- a/_maps/configs/independent_junker.json +++ b/_maps/configs/independent_junker.json @@ -8,7 +8,10 @@ ], "map_short_name": "Junker-class", "description": "The Junker-class is not an official class, but rather the name for a general group of designs crafted from the ruins of old ships or stations. These ships became a common sight during the ICW, as deserters fled areas of conflict on these 'junkers', unprepared for the challenges of spacer life. They have since become a rare sight, and the few surviving crews of these ships typically bear a sense of disdain to ordinary power structures, and usually have no defined captain, or even owner, of the vessel.", - "tags": ["Survival Challenge"], + "tags": [ + "Survival Challenge" + ], + "starting_funds": 0, "map_path": "_maps/shuttles/shiptest/independent_junker.dmm", "limit": 1, "job_slots": { diff --git a/_maps/configs/independent_kilo.json b/_maps/configs/independent_kilo.json index 761849a123b2..7877bbfcd08e 100644 --- a/_maps/configs/independent_kilo.json +++ b/_maps/configs/independent_kilo.json @@ -1,9 +1,10 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Kilo-class Mining Ship", - "prefix": "SV", "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": ["Generalist"], + "tags": [ + "Generalist" + ], "prefix": "ISV", "namelists": [ "GENERAL", @@ -11,6 +12,7 @@ "NATURAL" ], "map_short_name": "Kilo-class", + "starting_funds": 1500, "map_path": "_maps/shuttles/shiptest/independent_kilo.dmm", "job_slots": { "Captain": { diff --git a/_maps/configs/independent_lagoon.json b/_maps/configs/independent_lagoon.json index 7917f6783735..3be6a5d95b74 100644 --- a/_maps/configs/independent_lagoon.json +++ b/_maps/configs/independent_lagoon.json @@ -3,12 +3,17 @@ "map_name": "Lagoon-class Cruise Ship", "prefix": "ISV", "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.", - "tags": ["RP Focus", "Service", "Engineering"], + "tags": [ + "RP Focus", + "Service", + "Engineering" + ], "namelists": [ "CRUISE" ], "map_short_name": "Lagoon-class", "map_path": "_maps/shuttles/shiptest/independent_lagoon.dmm", + "starting_funds": 3000, "job_slots": { "Captain": { "outfit": "/datum/outfit/job/captain", diff --git a/_maps/configs/independent_litieguai.json b/_maps/configs/independent_litieguai.json index 448a6ddbb5c0..8128d3f6c980 100644 --- a/_maps/configs/independent_litieguai.json +++ b/_maps/configs/independent_litieguai.json @@ -3,7 +3,9 @@ "map_name": "Li Tieguai-class Rescue Ship", "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": ["Medical"], + "tags": [ + "Medical" + ], "map_path": "_maps/shuttles/shiptest/independent_litieguai.dmm", "namelists": [ "SPACE", diff --git a/_maps/configs/independent_masinyane.json b/_maps/configs/independent_masinyane.json index c083bbfbbc98..4c4cdd330ecb 100644 --- a/_maps/configs/independent_masinyane.json +++ b/_maps/configs/independent_masinyane.json @@ -3,7 +3,9 @@ "map_name": "Masinyane-Class Personal Shuttle", "map_short_name": "Masinyane-Class", "description": "The Masinyane is the sports car of space, with the price tag to match. Staggeringly fast and equipped with top of the line gear, Masinyanes are generally found in the hands of lone pilots with far more money than sense. The Masinyane was only ever produced in very limited numbers, and a series of fraud investigations involving a complex web of production contractors and shell companies have effectively put a halt to any further production. As such, they are exceedingly rare even in the core worlds – on the Frontier, they are practically non-existent.", - "tags": ["Generalist"], + "tags": [ + "Generalist" + ], "prefix": "ISV", "namelists": [ "MYTHOLOGICAL", diff --git a/_maps/configs/independent_meta.json b/_maps/configs/independent_meta.json index 9ae8c2b7694a..26bd1504b3a9 100644 --- a/_maps/configs/independent_meta.json +++ b/_maps/configs/independent_meta.json @@ -4,7 +4,10 @@ "prefix": "ISV", "map_short_name": "Meta-class", "description": "The Meta-class is a small freight vessel, and even before the ICW was a common sight on the Frontier as a tramp freighter, running independent contracts between the myriad outposts of the area (with, occasionally, some smuggling or mining on the side). Since the collapse of Nanotrasen’s logistics network in the Frontier region, Meta-classes operating in this capacity have exploded in popularity, and are likely to remain a very common sight wherever larger corporations such as Donk! Co. have yet to establish market dominance.", - "tags": ["Generalist", "Cargo"], + "tags": [ + "Generalist", + "Cargo" + ], "namelists": [ "GENERAL", "SPACE", diff --git a/_maps/configs/independent_metis.json b/_maps/configs/independent_metis.json index c077b6e8cfe4..ce0cb6fa7151 100644 --- a/_maps/configs/independent_metis.json +++ b/_maps/configs/independent_metis.json @@ -3,13 +3,18 @@ "map_name": "Metis-class Experimental Extrasolar Pathfinder", "map_short_name": "Metis-class", "description": "The elderly Metis-class is effectively a mobile research barge, a large and ungainly hunk of titanium outfitted with a wide variety of scientific facilities and equipment. While the specifics of any given Metis are subject to extreme variance, common features include AI facilities, xenobiological research chambers, and robotics equipment. Due to the dangerous and often tenuously-legal research typically pursued on the Frontier as well as tight budgets and low safety investment common to independent research teams, the Metis-class has earned a reputation for disaster, and abandoned Metises overrun with xenofauna or rogue machines are a disturbingly common sight in some parts of the Frontier.", - "tags": ["Science", "Robotics", "Survival Challenge"], + "tags": [ + "Science", + "Robotics", + "Survival Challenge" + ], "map_path": "_maps/shuttles/shiptest/independent_metis.dmm", "prefix": "ISV", "namelists": [ "SPACE" ], - "limit": 2, + "limit": 1, + "starting_funds": 500, "job_slots": { "Extraterrestrial Exploratory Project Supervisor": { "outfit": "/datum/outfit/job/rd", diff --git a/_maps/configs/independent_nemo.json b/_maps/configs/independent_nemo.json index 38c5cff43750..38a86fbcb523 100644 --- a/_maps/configs/independent_nemo.json +++ b/_maps/configs/independent_nemo.json @@ -9,7 +9,12 @@ ], "map_short_name": "Nemo-class", "description": "The Nemo-Class is an eccentric collector’s dream vessel, perfectly suited to all the journalists, antiquarians and kooks of the Frontier. Featuring a comfortable study, a full robotics workshop (perfectly suited to building yourself some assistants!) and a host of esoteric weapons suitable for hunting creatures to mount above your fireplace. Other highlights include a compact-yet-functional medical bay, a reasonably well-designed engineering bay and a large array of mining equipment.", - "tags": ["Engineering", "Mining", "Robotics"], + "tags": [ + "Engineering", + "Mining", + "Robotics" + ], + "starting_funds": 500, "map_path": "_maps/shuttles/shiptest/independent_nemo.dmm", "job_slots": { "Research Director": { diff --git a/_maps/configs/independent_pill.json b/_maps/configs/independent_pill.json index d8b58c20d425..18b1a3968033 100644 --- a/_maps/configs/independent_pill.json +++ b/_maps/configs/independent_pill.json @@ -8,9 +8,12 @@ ], "map_short_name": "Pillbottle-class", "description": "The “Pillbottle,” as a class, should not rightfully exist. Tell-tale signs indicate that these ships originated as bulk carriers and tugs, but they have since been haphazardly converted into a carrier of sorts for a wing of Pill-class escape pods. As with the Pills, Pillbottles are crewed entirely by escaped prisoners, and as a rule, they operate in a state of complete anarchy. The only consistent aspect of Pillbottle crews is their inconsistency, but the realities of prison life tend to make the worst out of anyone.", - "tags": ["Specialist"], + "tags": [ + "Specialist" + ], "map_path": "_maps/shuttles/shiptest/independent_pillbottle.dmm", "limit":1, + "starting_funds": 0, "job_slots": { "Prisoner": { "outfit": "/datum/outfit/job/prisoner", diff --git a/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json index 79895959c6f0..ed778696bd74 100644 --- a/_maps/configs/independent_rigger.json +++ b/_maps/configs/independent_rigger.json @@ -10,7 +10,12 @@ ], "map_short_name": "Riggs-class", "description": "The Rigger-class is Kasagi-Fischer Partnership’s mainstay in the independent ship market. Spacious, affordable, and versatile, Riggers offer basic capabilities for everything a Frontier spacer might need in a convenient, easy-to-modify platform, and by default come equipped with a basic medbay, a small security office, atmospherics recycling and equipment to support an APLU utility mech. Thanks to this versatility, Riggers have become extremely popular among moderately-wealthy independent captains, and can be found doing everything from mining to shipping to surveying Frontier planets.", - "tags": ["Mining", "Medical", "Robotics", "Generalist"], + "tags": [ + "Mining", + "Medical", + "Robotics", + "Generalist" + ], "map_path": "_maps/shuttles/shiptest/independent_rigger.dmm", "roundstart": true, "limit": 2, diff --git a/_maps/configs/independent_scav.json b/_maps/configs/independent_scav.json index 74e68e616194..0564e6182766 100644 --- a/_maps/configs/independent_scav.json +++ b/_maps/configs/independent_scav.json @@ -4,7 +4,9 @@ "map_short_name": "Scav-class", "prefix": "ISV", "description": "One of the cheapest (and yet, inexplicably popular) offerings from Miskilamo Spacefaring, the Scav-class is a compact, speedy vessel purpose-built for enterprising scrappers and looters looking to salvage bombed-out ruins and harvest boatloads of ore. Featuring an ‘innovative’ open-floor plan, a charitable supply of EVA/ruin raiding equipment, and some exotic implements of healing or death-dealing, the Scav-class just keeps on chuggin’!", - "tags": ["Generalist"], + "tags": [ + "Generalist" + ], "namelists": [ "NATURAL", "SPACE" diff --git a/_maps/configs/independent_schmiedeberg.json b/_maps/configs/independent_schmiedeberg.json index e94ede69d072..457b8d602f4f 100644 --- a/_maps/configs/independent_schmiedeberg.json +++ b/_maps/configs/independent_schmiedeberg.json @@ -4,7 +4,11 @@ "prefix": "IMV", "map_short_name": "Schmiedeberg-class", "description": "Interested in pharmacological science, but tired of sitting in front of a chemistry dispenser and pushing buttons all day? Eager to combine the culinary arts with the narcotic ones? Hoping to combine all of these qualities with the most important activity of all: making fat stacks of dosh? Then the Schmiedeberg-class is for you! Host to a robust ghetto chemistry lab, a high-efficiency botanical set-up and a complete kitchen-and-storefront, the Schmiedeberg is perfect for back-alley chemists and botanists everywhere.", - "tags": ["Botany", "Medical", "Chemistry"], + "tags": [ + "Botany", + "Medical", + "Chemistry" + ], "map_path": "_maps/shuttles/shiptest/independent_schmiedeberg.dmm", "namelists": [ "SUNS", diff --git a/_maps/configs/independent_shepherd.json b/_maps/configs/independent_shepherd.json index b5933e05584d..69c44f33341b 100644 --- a/_maps/configs/independent_shepherd.json +++ b/_maps/configs/independent_shepherd.json @@ -3,7 +3,11 @@ "map_name": "Shepherd-Class Space Monastery", "map_short_name": "Shepherd-class", "description": "Best suited to the vast array of the galaxy’s pilgrims, proselytizers and prophets, the Shephard-class is, in essence, a massive mobile monastery. With a great grassy grove dominating the center of the ship, a torturously tempered temple and a brutalist, yet bountiful botany set-up, the Shepherd is well suited to a large crew eager to preach, purify and pull in new followers.", - "tags": ["RP Focus", "Botany", "Service"], + "tags": [ + "RP Focus", + "Botany", + "Service" + ], "map_path": "_maps/shuttles/shiptest/independent_shepherd.dmm", "prefix": "ISV", "namelists": [ diff --git a/_maps/configs/independent_shetland.json b/_maps/configs/independent_shetland.json index 5532465fb6fe..fc2741514879 100644 --- a/_maps/configs/independent_shetland.json +++ b/_maps/configs/independent_shetland.json @@ -8,7 +8,11 @@ ], "map_short_name": "Shetland-class", "description": "The Shetland is Miskilamo Spacefaring’s flagship offer and one of their only truly original designs: A huge frigate offering a diverse array of facilities with ample room for expansion at a fraction of the price of the competition. Optimistic customers soon discover the haphazard workmanship and extreme cost-cutting measures common to Miskilamo ships. While Shetlands have plenty of room and a theoretically diverse array of facilities, they come with the minimal amount of equipment needed for those facilities, and a wide array of design deficiencies have given them a grim reputation for driving their crews to paranoid extremes. The waste disposal catapult is a frequent feature of such tales, and supposedly a great many Shetland crewmates have met their end by ejection.", - "tags": ["Generalist", "Service", "Medical"], + "tags": [ + "Generalist", + "Service", + "Medical" + ], "map_path": "_maps/shuttles/shiptest/independent_shetland.dmm", "map_id": "independent_shetland", "roundstart": true, diff --git a/_maps/configs/independent_tranquility.json b/_maps/configs/independent_tranquility.json index 46b329fd0b80..0d86be477344 100644 --- a/_maps/configs/independent_tranquility.json +++ b/_maps/configs/independent_tranquility.json @@ -9,7 +9,11 @@ ], "map_short_name": "Tranquility-class", "description": "While most vessels have some form of clear utility in mind – research, mining, cargo hauling, and so on – the Tranquility-class is a notable exception to this rule. The Tranquility is, fittingly, a fairly calm and level-headed affair, modeled around traditional apartment complexes. Fitted with several independent quarters, a large communal canteen and very little in the way of industrial equipment or self-defense tools, Tranquility-classes are often found cruising lazily around the Frontier, getting up to sitcom-esque antics and eschewing the more focused approach of many of their contemporaries.", - "tags": ["RP Focus", "Service", "Generalist"], + "tags": [ + "RP Focus", + "Service", + "Generalist" + ], "map_path": "_maps/shuttles/shiptest/independent_tranquility.dmm", "job_slots": { "Captain": { diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json index c628fa265af3..3447d5c54034 100644 --- a/_maps/configs/inteq_colossus.json +++ b/_maps/configs/inteq_colossus.json @@ -3,7 +3,10 @@ "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.", - "tags": ["Combat", "Riot"], + "tags": [ + "Combat", + "Riot" + ], "namelists": [ "MYTHOLOGICAL", "BEASTS", diff --git a/_maps/configs/inteq_hound.json b/_maps/configs/inteq_hound.json index 5bf2125a7009..9e41959ae6b9 100644 --- a/_maps/configs/inteq_hound.json +++ b/_maps/configs/inteq_hound.json @@ -9,7 +9,9 @@ ], "map_short_name": "Hound-class", "description": "A light, fast picket and interceptor ship operated by Inteq Risk Management, the Hound offers modest crew space sufficient for a 3-man fireteam of Inteq enforcers, a small cargo bay, powerful engines, a well-stocked armory for its size, and little else. Hounds can typically be found on picket and patrol duty, escorting larger and more vulnerable IRMG ships, or performing any duty that calls for a lightning-fast ship and a handful of very well-armed individuals.", - "tags": ["Combat"], + "tags": [ + "Combat" + ], "map_path": "_maps/shuttles/shiptest/inteq_hound.dmm", "map_id": "inteq_hound", "limit": 2, diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json index 975f253c18f1..4ec40fe76812 100644 --- a/_maps/configs/inteq_talos.json +++ b/_maps/configs/inteq_talos.json @@ -3,7 +3,10 @@ "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.", - "tags": ["Engineer", "Telecomms"], + "tags": [ + "Engineer", + "Telecomms" + ], "namelists": [ "MYTHOLOGICAL", "BEASTS", diff --git a/_maps/configs/minutemen_asclepius.json b/_maps/configs/minutemen_asclepius.json index 12e19cbe5720..26a145841792 100644 --- a/_maps/configs/minutemen_asclepius.json +++ b/_maps/configs/minutemen_asclepius.json @@ -3,7 +3,10 @@ "map_name": "Asclepius-Class Hospital Ship", "prefix": "CMSV", "description": "The Asclepius is a medical vessel employed by the CMM. Much in CMM fashion it features tight hallways and moderately sized personal quarters. Well stocked in medical supplies, this vessel is known for its capability of fulfilling extensive treatment for patients in sectors where such treatment is otherwise scarce. Stocked with a cryo lab, a morgue, a chemlab, and surgery room, the Asclepius rarely finds difficulty when provided all measures both preventative and restorative.", - "tags": ["Medical", "Chemistry"], + "tags": [ + "Medical", + "Chemistry" + ], "namelists": [ "COLONIAL MINUTEMEN", "CMM-BARD", diff --git a/_maps/configs/minutemen_cepheus.json b/_maps/configs/minutemen_cepheus.json index da3737203713..8712a34b127a 100644 --- a/_maps/configs/minutemen_cepheus.json +++ b/_maps/configs/minutemen_cepheus.json @@ -3,7 +3,9 @@ "map_name": "Cepheus-Class Mech Carrier", "prefix": "CMSV", "description": "The Cepheus is the go-to for the CMM whenever it wishes to deploy vessels capable of creating anything in the realm robotica. These vessels are deployed to sectors full of scrap and salvageable material, stocked with armament for their salvagers and a mechanical laboratory for their mechanical engineers. Crews on Cepheus ships are typically treated to somewhat crammed together quarters and tight schedules of collection and production.", - "tags": ["Robotics"], + "tags": [ + "Robotics" + ], "namelists": [ "COLONIAL MINUTEMEN", "MYTHOLOGICAL" diff --git a/_maps/configs/minutemen_corvus.json b/_maps/configs/minutemen_corvus.json index 08e746848f0c..355669e158fd 100644 --- a/_maps/configs/minutemen_corvus.json +++ b/_maps/configs/minutemen_corvus.json @@ -3,7 +3,10 @@ "map_name": "Corvus-class Response Vessel", "prefix": "CMSV", "description": "A lightly equipped patrol vessel used by the Minutemen for extended operations in the Frontier. In many systems, a lone Corvus is the only sign of Minutemen presence, an image that is not helped by their widespread usage. The Corvus was originally a light personal vessel retrofitted for combat usage by the Colonial Militia, which was later adopted as their official remote infantry patrol ship as a symbol of colonial ingenuity and grit. First designated the Wallaby-class, until the crew of a now-legendary Wallaby-class known as the CMSV Corvus single handedly destroyed a Frontiersmen capital ship in 392.", - "tags": ["Combot", "Riot"], + "tags": [ + "Combot", + "Riot" + ], "namelists": [ "COLONIAL MINUTEMEN", "MYTHOLOGICAL" diff --git a/_maps/configs/minutemen_vela.json b/_maps/configs/minutemen_vela.json index f5e50ec66d57..4829166a56d6 100644 --- a/_maps/configs/minutemen_vela.json +++ b/_maps/configs/minutemen_vela.json @@ -4,8 +4,13 @@ "prefix": "CMGSV", "namelists": ["GENERAL", "MYTHOLOGICAL", "BEASTS"], "description": "The Vela-Class is the designation for a series of semi-modular industrial cruisers created by the Colonial Minutemen in the early 440s. While the original design was created almost exclusively for extracting minerals from asteroid belts, modern examples tend to take on a multi-mission role, with the most common configuration being a mech hanger, and research pod. The ship itself often sees long deployments that encourage modification, leading to Velas taking on a personality as their crews leave their mark.", - "tags": ["Robotics", "Construction", "Science"], + "tags": [ + "Robotics", + "Construction", + "Science" + ], "map_short_name": "Vela-Class", + "starting_funds": 1000, "map_path": "_maps/shuttles/shiptest/minutemen_vela.dmm", "limit": 1, "job_slots": { diff --git a/_maps/configs/nanotrasen_delta.json b/_maps/configs/nanotrasen_delta.json index 9f528a85071f..6f81f5972a22 100644 --- a/_maps/configs/nanotrasen_delta.json +++ b/_maps/configs/nanotrasen_delta.json @@ -11,8 +11,12 @@ ], "map_short_name": "Delta-class", "description": "The Delta is a compact and advanced mining ship that supplements its comparatively small organic crew with a full suite of robotics facilities, including an AI and a host of mining and logistics drones and cyborgs. While much-loved by Nanotrasen logisticians for their minimal upkeep and high cost efficiency, Deltas are far less popular among the crews chosen to operate them, as they are severely lacking in crew accommodations and defensive armament.", - "tags": ["Science", "Robotics"], + "tags": [ + "Science", + "Robotics" + ], "map_path": "_maps/shuttles/shiptest/nanotrasen_delta.dmm", + "starting_funds": 4000, "job_slots": { "Captain": { "outfit": "/datum/outfit/job/captain/nt", diff --git a/_maps/configs/nanotrasen_gecko.json b/_maps/configs/nanotrasen_gecko.json index 9b12ea9a5d3d..f7f0791f7cb1 100644 --- a/_maps/configs/nanotrasen_gecko.json +++ b/_maps/configs/nanotrasen_gecko.json @@ -10,8 +10,12 @@ "map_short_name": "Gecko-class", "map_path": "_maps/shuttles/shiptest/nanotrasen_gecko.dmm", "description": "A bulky, robust, and exceedingly ugly salvage ship. The Gecko is nothing less than a flying brick full of redundant maintenance spaces and open-to-space salvage bays, powered by a temperamental TEG system, with a cramped crew space sandwiched in between. Due to its deeply obsolete design and the dangerous nature of salvage work, Geckos are often the final resting point for the careers of officers that have stepped on too many toes in the corporate world without doing anything outright criminal. Despite these shortcomings, Geckos offer a large amount of open space and a good supply of engineering equipment, which is all an enterprising engineer truly needs.", - "tags": ["Mining", "Engineering"], + "tags": [ + "Mining", + "Engineering" + ], "limit": 2, + "starting_funds": 5000, "job_slots": { "Captain": { "outfit": "/datum/outfit/job/captain/nt", diff --git a/_maps/configs/nanotrasen_mimir.json b/_maps/configs/nanotrasen_mimir.json index 35bcdac2087e..310b9962b63d 100644 --- a/_maps/configs/nanotrasen_mimir.json +++ b/_maps/configs/nanotrasen_mimir.json @@ -9,7 +9,12 @@ "map_name": "Mimir-Class Rehabillitation Vessel", "map_short_name": "Mimir-class", "description": "The Mimir-class are Nanotrasen “patient” transfer and holding ships. Nanotrasen deploys Mimirs to hold those they’ve interned, often in ruined or otherwise out-of-the-way sectors. This both minimizes the chances of the “patients” escaping and drastically lowers the incentive to do so in the first place, as it keeps them stuck in the middle of nowhere until Central Command is ready to pick them up and process them. While “patients” are largely kept in cryogenic storage, regulations and medical necessity both require occasional thawing. As such, the Mimir comes with a host of “rehabilitative” activities for the “patients” as well as a light security detail to manage them.", - "tags": ["Riot", "Service", "Generalist", "Specialist"], + "tags": [ + "Riot", + "Service", + "Generalist", + "Specialist" + ], "map_path": "_maps/shuttles/shiptest/nanotrasen_mimir.dmm", "limit": 1, "job_slots": { diff --git a/_maps/configs/nanotrasen_osprey.json b/_maps/configs/nanotrasen_osprey.json index 5d2ed3c4e535..feea5e777c69 100644 --- a/_maps/configs/nanotrasen_osprey.json +++ b/_maps/configs/nanotrasen_osprey.json @@ -13,6 +13,7 @@ "description": "Some of the most modern ships in Nanotrasen’s fleet and a prestigious assignment for their captains, the famed Osprey of the ICW’s most dramatic astronautical engagements lives on as a very well-appointed exploration ship. Extensively refurbished from their origins as Bluespace Artillery platforms, the contemporary Osprey repurposes military-grade sensor equipment and AI systems for exploration and scientific work. Features include respectably-equipped medical, culinary, and scientific facilities and an AI core, as well as a ship-wide disposals and delivery system and a very spacious cargo bay. However, the powerful (if temperamental) supermatter engines that powered the initial batch of Ospreys were stripped out during their rebuilds, and the replacement generator banks have left contemporary Ospreys somewhat power-starved.", "tags": ["Cargo", "Robotics", "Generalist"], "limit": 1, + "starting_funds": 4000, "job_slots": { "Captain": { "outfit": "/datum/outfit/job/captain/nt", diff --git a/_maps/configs/nanotrasen_powerrangers.json b/_maps/configs/nanotrasen_powerrangers.json index dca54737ba04..4549e153a81b 100644 --- a/_maps/configs/nanotrasen_powerrangers.json +++ b/_maps/configs/nanotrasen_powerrangers.json @@ -9,7 +9,15 @@ ], "map_short_name": "Ranger-class", "description": "A Nanotrasen rescue and aid vessel. Equipped with an AI core, moderate combat gear, and equipment fit for rescue and general aid operations. Nanotrasen often deploys these ships in lieu of a proper ERT to aid their allies in the Frontier without committing their full might. The shipowner is the Lieutenant of a Loss Prevention squad, with a Commissioner to aid with operations on the ship proper.", - "tags": ["Combat", "Riot", "Robotics", "Medical", "Telecomms", "Generalist"], + "tags": [ + "Combat", + "Riot", + "Robotics", + "Medical", + "Telecomms", + "Generalist" + ], + "starting_funds": 4000, "map_path": "_maps/shuttles/shiptest/nanotrasen_powerrangers.dmm", "limit": 1, "job_slots": { diff --git a/_maps/configs/nanotrasen_skipper.json b/_maps/configs/nanotrasen_skipper.json index 04488fe9c6db..501ddf7b1afa 100644 --- a/_maps/configs/nanotrasen_skipper.json +++ b/_maps/configs/nanotrasen_skipper.json @@ -12,7 +12,11 @@ ], "map_path": "_maps/shuttles/shiptest/nanotrasen_skipper.dmm", "description": "An example of one of Nanotrasen’s “standard-pattern” cruisers. The Skipper-class is well-equipped by Frontier standards, with ample room for engineering equipment, well-appointed crew accommodations, and a decent supply of defensive weaponry. Notably, the Skipper comes with a larger command section than average, and the officers on Skippers tend to be better-equipped than their peers. Though not as prestigious as a position aboard an Osprey, few Nanotrasen captains would turn down a position commanding a Skipper.", - "tags": ["Engineering", "Mining"], + "tags": [ + "Engineering", + "Mining" + ], + "starting_funds": 4000, "roundstart": true, "job_slots": { "Captain": { diff --git a/_maps/configs/pirate_ember.json b/_maps/configs/pirate_ember.json index b293001c8338..ef23ccd8ef3b 100644 --- a/_maps/configs/pirate_ember.json +++ b/_maps/configs/pirate_ember.json @@ -9,7 +9,12 @@ "map_short_name": "Ember-class", "map_path": "_maps/shuttles/shiptest/pirate_ember.dmm", "description": "The Ember class is a red flag in any sector. A giant, slow moving, safety hazard of a ship, makeshift in almost every regard, finds itself favored amongst the most ruthless and cutthroat of pirates and scoundrels galaxy-wide. Simply to be willing to exist on one of these ships shows a hardiness not typically found in most spacers. The best way to deal with Ember vessels is to simply give them a wide berth.", - "tags": ["Combat", "Riot", "Combat", "Engineering"], + "tags": [ + "Combat", + "Riot", + "Combat", + "Engineering" + ], "limit": 1, "job_slots": { "Captain": { diff --git a/_maps/configs/pirate_libertatia.json b/_maps/configs/pirate_libertatia.json index a11109153b97..196f8652753f 100644 --- a/_maps/configs/pirate_libertatia.json +++ b/_maps/configs/pirate_libertatia.json @@ -4,9 +4,14 @@ "map_short_name": "Libertatia-class", "map_path": "_maps/shuttles/shiptest/pirate_libertatia.dmm", "description": "A widely-available and dirt-cheap courier ship by Miskilamo Spacefaring, Libertatias are shoddy overhauls of old civilian atmospheric ships or the burned-out wrecks of other Libertatias, made nominally space worthy and capable of carrying a modest cargo at blistering speeds. While marketed as courier ships and short-range cargo shuttles, the Libertatia found its true target market in the hands of smugglers, blockade runners, and pirates, who find its speed, low sensor signature, and rock-bottom price point extremely attractive. In recent years, it’s become far more common to see Libertatias captained by pirates than anyone else, especially in the loosely-patrolled Frontier sectors. Surprisingly enough, the more organized Frontiersmen pirate group shows little love for the humble Libertatia, instead preferring larger and more threatening ships.", - "tags": ["Combat"], + "tags": [ + "Combat" + ], "prefix": "ISV", - "namelists": ["PIRATES", "NATURAL_AGGRESSIVE"], + "namelists": [ + "PIRATES", + "NATURAL_AGGRESSIVE" + ], "job_slots": { "Captain": { "outfit": "/datum/outfit/job/captain/pirate", diff --git a/_maps/configs/pirate_noderider.json b/_maps/configs/pirate_noderider.json index b00b76f632a8..4a004bdee87e 100644 --- a/_maps/configs/pirate_noderider.json +++ b/_maps/configs/pirate_noderider.json @@ -3,10 +3,18 @@ "map_name": "Jupiter-Class Stormrider", "map_short_name": "Jupiter-Class", "prefix": "ISV", - "namelists": ["INSTALLATION", "PIRATES"], + "namelists": [ + "INSTALLATION", + "PIRATES" + ], "map_path": "_maps/shuttles/shiptest/pirate_noderider.dmm", "description": "The Jupiter-class Stormrider is a specialist design originating from the Silicon Elevation Council, typically used for sustained missions in the Frontier. While habitable to organic life (typically as a matter of convenience), the ship is designed with silicons in mind, and features an AI core built into its hull. Many captains have been quoted as being “frightened” (although “piss-pants scared” was the exact statement) by one suddenly appearing out of a storm, IFF loudly declaring who they were, or in worse conditions, not functioning at all. Some examples have been known to find their way into pirate hands, who leverage the ship to spring ambushes on unsuspecting traders.", - "tags": ["Robotics", "Specialist", "Riot", "Combat"], + "tags": [ + "Robotics", + "Specialist", + "Riot", + "Combat" + ], "job_slots": { "Command Node": { "outfit": "/datum/outfit/job/captain/aipirate", diff --git a/_maps/configs/solgov_chronicle.json b/_maps/configs/solgov_chronicle.json index 9ba03669996f..aed35c98daa0 100644 --- a/_maps/configs/solgov_chronicle.json +++ b/_maps/configs/solgov_chronicle.json @@ -11,7 +11,9 @@ "map_short_name": "Chronicle-class", "map_path": "_maps/shuttles/shiptest/solgov_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"], + "tags": [ + "Specialist" + ], "limit": 1, "job_slots": { "Captain": { diff --git a/_maps/configs/srm_glaive.json b/_maps/configs/srm_glaive.json index 363d401fd933..093e28107e2c 100644 --- a/_maps/configs/srm_glaive.json +++ b/_maps/configs/srm_glaive.json @@ -2,11 +2,18 @@ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "SRM Glaive-class Hunter Vessel", "prefix": "SRSV", - "namelists": ["SAINT-ROUMAIN", "BEASTS"], + "namelists": [ + "SAINT-ROUMAIN", + "BEASTS" + ], "map_short_name": "Glaive-class", "map_path": "_maps/shuttles/shiptest/srm_glaive.dmm", "description": "A standard issue vessel to the highest ranks of the Saint-Roumain Militia. While “standard”, this class of vessel is unique to the Montagne that owns it. Each ship is designed around a central garden consisting of plants, soil, and a tree from the owning Montagnes’ home planet. As a highly religious ascetic order, the SRM supplies each Glaive with supplies to farm, raise animals, and perform medicine in more “natural” ways, using herbs and plants grown in house. Alongside this, the ship has a decent amount of mining equipment, and supplies required to begin the manufacturing of SRM-pattern firearms as is standard for Hunter’s Pride. The ship is captained by a Montagne, who oversees a team of Hunters, and Shadows apprenticing them.", - "tags": ["Mining", "Combat", "Specialist"], + "tags": [ + "Mining", + "Combat", + "Specialist" + ], "map_id": "srm_glaive", "limit": 1, "job_slots": { diff --git a/_maps/configs/syndicate_aegis.json b/_maps/configs/syndicate_aegis.json index 29606b1cddde..1a7804bee932 100644 --- a/_maps/configs/syndicate_aegis.json +++ b/_maps/configs/syndicate_aegis.json @@ -4,7 +4,11 @@ "map_short_name": "Aegis-class", "map_path": "_maps/shuttles/shiptest/syndicate_aegis.dmm", "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. While the Li Tieguai filled the rescue role, the Aegis-Class was to fill the rehabilitation role. Featuring a host of ‘quality of life’ features for long-term patients (a full bar, a hydroponics setup, and so on), an expansive medical bay and an array of comfort fixtures like couches and gardens, the Aegis is perfect for aspiring doctors or wounded patients.", - "tags": ["Botany", "Medical", "RP Focus"], + "tags": [ + "Botany", + "Medical", + "RP Focus" + ], "map_id": "syndicate_aegis", "namelists": [ "SUNS", diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json index 87218a2f4c4b..784dab0483cb 100644 --- a/_maps/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/configs/syndicate_cybersun_kansatsu.json @@ -8,7 +8,9 @@ ], "map_name": "Kansatsu-Class Scout Courier", "description": "The Kansatsu-class is a Cybersun remodel of the old Type-S SolGov Courier, rebuilt for rapid package ferrying and light surveillance operations in the Frontier. While fairly cramped, it excels at its design goals, with rapid surveys, scouting, and espionage flowing from its presence. Syndicate deployments typically include a deployment of 5, with a recommended max of 7. This is broken down into 1 captain, an intelligence officer for coordinating the field agents, an engineer, and 2 field agents. The simplicity of the hull has led to the ship becoming a widespread indicator of Syndicate interest in locations, and some models have found their way into private purchasers' hands.", - "tags": ["Specialist"], + "tags": [ + "Specialist" + ], "map_short_name": "Kansatsu-Class", "map_path": "_maps/shuttles/shiptest/syndicate_cybersun_kansatsu.dmm", "map_id": "cybersun_kansatsu", diff --git a/_maps/configs/syndicate_gorlex_hyena.json b/_maps/configs/syndicate_gorlex_hyena.json index 86b2be8d6530..2c0d12a29a45 100644 --- a/_maps/configs/syndicate_gorlex_hyena.json +++ b/_maps/configs/syndicate_gorlex_hyena.json @@ -10,7 +10,10 @@ ], "map_name": "Hyena-class Wrecking Tug", "description": "The Hyena is a common salvage tug, frequently operated by the Gorlex Marauders for “salvage” missions on ICW-era Nanotrasen derelicts (and occasionally occupied outposts and ships). The Hyena features a fairly compact floor plan with a dedicated secure armory space and a fairly large cargo bay for its size, as well as a complement of high-grade hardsuits and mining equipment. The Hyena’s low cost and high demand in its niche has made it a very common sight on the Frontier in the years following the ICW, and despite their tight finances nearly all Gorlex Marauder splinter factions continue to acquire more.", - "tags": ["Mining", "Combat"], + "tags": [ + "Mining", + "Combat" + ], "map_short_name": "Hyena-class", "map_path": "_maps/shuttles/shiptest/syndicate_gorlex_hyena.dmm", "job_slots": { diff --git a/_maps/configs/syndicate_gorlex_komodo.json b/_maps/configs/syndicate_gorlex_komodo.json index 48eaeec595b0..f65d05a44e60 100644 --- a/_maps/configs/syndicate_gorlex_komodo.json +++ b/_maps/configs/syndicate_gorlex_komodo.json @@ -9,7 +9,11 @@ "map_name": "Komodo-class Warship", "map_short_name": "Komodo-class", "description": "An ICW-era design, the Komodo is a dedicated warship operated by the Gorlex Marauders. Contemporaries of the legendary Starfury-class, Komodos were the backbone of Gorlex and ACLF fleets during the ICW, and saw significant combat service – not always to a tragic end like their Cybersun companions. Contemporary examples often still bear the scars of ICW-period combat, and the dire financial straits of most Gorlex splinter factions means many of those survivors are in a state of poor repair. Despite the stresses of age, they remain capable ships, and often still have the heavier armament associated with their ICW deployments in storage.", - "tags": ["RP Focus", "Combat", "Engineering"], + "tags": [ + "RP Focus", + "Combat", + "Engineering" + ], "map_path": "_maps/shuttles/shiptest/syndicate_gorlex_komodo.dmm", "map_id": "syndicate_gorlex_komodo", "limit": 1, diff --git a/_maps/configs/syndicate_lugol.json b/_maps/configs/syndicate_lugol.json index d614123d04ae..891a19641252 100644 --- a/_maps/configs/syndicate_lugol.json +++ b/_maps/configs/syndicate_lugol.json @@ -3,8 +3,15 @@ "prefix": "SEV", "map_short_name": "Lugol-class", "description": "The Lugol is effectively an enormous Galactic Engineers Concordat research barge, used as a test bed for refinements to power systems, new technologies, and so on. As it offers freedom from the usual constraints of working aboard vessels belonging to other Syndicate factions, Lugols are especially popular among the GEC’s more radical members. Accordingly, they have a reputation for either accomplishing the impossible or generating the equivalent of a new star when they inevitably melt down. Lugols are generally only found on the Frontier, where the collateral damage from potential accidents can be kept to a minimum and secrecy, when needed, can be better maintained.", - "tags": ["Engineering", "Construction"], - "namelists": ["ENGINEERING", "GEC", "SPACE"], + "tags": [ + "Engineering", + "Construction" + ], + "namelists": [ + "ENGINEERING", + "GEC", + "SPACE" + ], "map_path": "_maps/shuttles/shiptest/syndicate_gec_lugol.dmm", "map_id": "gec_lugol", "limit": 2, diff --git a/_maps/configs/syndicate_luxembourg.json b/_maps/configs/syndicate_luxembourg.json index af5f46630dca..40fe900ae3d6 100644 --- a/_maps/configs/syndicate_luxembourg.json +++ b/_maps/configs/syndicate_luxembourg.json @@ -1,13 +1,21 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "prefix": "SSV", - "namelists": ["DONK", "MERCANTILE", "SPACE"], + "namelists": [ + "DONK", + "MERCANTILE", + "SPACE" + ], "map_name": "Luxembourg-class Delivery Vessel", "description": "A dual-purpose delivery vessel and mobile storefront, Luxembourgs make up a substantial portion of Donk! Co.’s fleet on the Frontier, where the ever-opportunistic corporation has begun to fill the gaps left behind by the collapse of Nanotrasen’s logistics network. Donk! Co. managers have a great degree of autonomy, and so any given Luxembourg will often bear substantial modifications to the sales floor and on-board cafe, the better to entice new customers in an unstable yet lucrative region of space.", - "tags": ["Robotics", "Cargo"], + "tags": [ + "Robotics", + "Cargo" + ], "map_short_name": "Luxembourg-class", "map_path": "_maps/shuttles/shiptest/syndicate_luxembourg.dmm", "limit": 1, + "starting_funds": 6000, "job_slots": { "Manager": { "outfit": "/datum/outfit/job/quartermaster/donk", diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json index 9d725b61b950..24b55c7bd35c 100644 --- a/_maps/configs/syndicate_twinkleshine.json +++ b/_maps/configs/syndicate_twinkleshine.json @@ -1,10 +1,19 @@ { "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "prefix": "SSV", - "namelists": ["GORLEX", "SPACE", "ACLF"], + "namelists": [ + "GORLEX", + "SPACE", + "ACLF" + ], "map_name": "Twinkleshine-class Battle Cruiser", "description": "After the destruction of the larger Starfury-class Battle Cruisers during the Inter-Corporate War, Cybersun engineered the Twinkleshine as a replacement to fill the now-vacant flagship role. However, the war came to a close before any examples of this class could see combat. Now, they are kept as a valuable symbol of the Syndicate’s might and unity – in theory. As with the Starfury-class, Twinkleshine crews contain a mix of all Syndicate member factions as a matter of political necessity – none would consent to Cybersun operating such powerful ships alone. While Twinkleshine crews are supposedly selected for more diplomatic tendencies than one might expect, the political situation aboard a Twinkleshine is often delicate, particularly as tensions between the Syndicate’s corporate and anti-corporate elements continue to build. Nevertheless, they remain the most potent singular assets in the Syndicate’s combined arsenal, and frequently serve the role of power projection in Frontier space.", - "tags": ["Engineering", "Combat", "Service", "Medical"], + "tags": [ + "Engineering", + "Combat", + "Service", + "Medical" + ], "map_short_name": "Twinkleshine-class", "map_path": "_maps/shuttles/shiptest/syndicate_twinkleshine.dmm", "job_slots": { diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json index 475b8ce5da7e..e0e1b4eb8ce0 100644 --- a/_maps/ship_config_schema.json +++ b/_maps/ship_config_schema.json @@ -129,6 +129,14 @@ "maximum": 100, "default": 2 }, + "starting_funds":{ + "title": "Ship Starting Funds", + "Type": "integer", + "description": "The amount of money a ship's bank account starts with", + "minimum": 0, + "maximum": 20000, + "default": 2000 + }, "spawn_time_coeff": { "title": "Required Spawn Playtime Coefficient", "type": "number", diff --git a/_maps/shuttles/shiptest/independent_junker.dmm b/_maps/shuttles/shiptest/independent_junker.dmm index be165b48c81a..41e443a3040e 100644 --- a/_maps/shuttles/shiptest/independent_junker.dmm +++ b/_maps/shuttles/shiptest/independent_junker.dmm @@ -2294,6 +2294,8 @@ dir = 4 }, /obj/effect/decal/cleanable/glass, +/obj/structure/safe/floor, +/obj/item/circuitboard/computer/cargo/express, /turf/open/floor/pod/dark, /area/ship/crew/office) "Rj" = ( diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 89f5fa727f67..087b41134cd9 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -223,6 +223,9 @@ SUBSYSTEM_DEF(mapping) if(isnum(data["officer_time_coeff"])) S.officer_time_coeff = data["officer_time_coeff"] + if(isnum(data["starting_funds"])) + S.starting_funds = data["starting_funds"] + if(isnum(data["enabled"]) && data["enabled"]) S.enabled = TRUE ship_purchase_list[S.name] = S diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index e089a1e87102..e4255541911d 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -17,9 +17,12 @@ var/short_name var/list/job_slots = list() var/list/name_categories = list("GENERAL") - var/prefix = "SV" + var/prefix = "ISV" var/unique_ship_access = FALSE + //how much money the ship starts with + var/starting_funds = 2000 + // Coefficients regulating the amount of necessary Living playtime to spawn this ship or join as an officer. // When a player attempts to spawn a ship via the join menu, officer time requirements are ignored even if the "captain" job is an officer. var/spawn_time_coeff = 1 @@ -339,6 +342,7 @@ /// Shuttles to be loaded in ruins /datum/map_template/shuttle/ruin category = "ruin" + starting_funds = 0 /datum/map_template/shuttle/ruin/caravan_victim file_name = "ruin_caravan_victim" @@ -371,6 +375,7 @@ /datum/map_template/shuttle/subshuttles category = "subshuttles" + starting_funds = 0 /datum/map_template/shuttle/subshuttles/pill file_name = "independent_pill" diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm index 1479c3f0ceb3..d4ebcb8d4735 100644 --- a/code/modules/overmap/ships/controlled_ship_datum.dm +++ b/code/modules/overmap/ships/controlled_ship_datum.dm @@ -96,8 +96,8 @@ qdel(src) // Can't return INITIALIZE_HINT_QDEL here since this isn't ACTUAL initialisation. Considering changing the name of the proc. return refresh_engines() + ship_account = new(name, source_template.starting_funds) - ship_account = new(name, 2000) #ifdef UNIT_TESTS Rename("[source_template]") #else