Merge remote-tracking branch 'upstream/master' into ballistic-finisher

_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": {

_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",

_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": {

_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"

_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"

_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",

_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": {

_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": {

_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": {

_maps/configs/independent_kilo.json

@@ -1,16 +1,18 @@
 {
 	"$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",
 		"SPACE",
 		"NATURAL"
 	],
 	"map_short_name": "Kilo-class",
+	"starting_funds": 1500,
 	"map_path": "_maps/shuttles/shiptest/independent_kilo.dmm",
 	"job_slots": {
 		"Captain": {

_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",

_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",

_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",

_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",

_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": {

_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",

_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,

_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"

_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",