Merge remote-tracking branch 'upstream/master' into ert

_maps/RandomRuins/JungleRuins/jungle_demon.dmm

@@ -157,7 +157,7 @@
 /area/ruin/powered)
 "pm" = (
 /obj/structure/table/reinforced,
-/obj/item/upgradescroll,
+/obj/item/paper,
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered)
 "pE" = (
@@ -220,9 +220,27 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered)
 "tR" = (
-/obj/structure/closet/gimmick/tacticool,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/under/syndicate,
+/obj/structure/closet/syndicate{
+	desc = "It's a basic storage unit.";
+	name = "uniform closet"
+	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/old,
+/obj/item/clothing/under/syndicate,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/head/helmet/operator,
+/obj/item/clothing/head/helmet/operator,
+/obj/item/clothing/suit/armor/vest/syndie,
+/obj/item/clothing/suit/armor/vest/syndie,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/combat,
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered)
 "uj" = (
@@ -494,8 +512,11 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered)
 "PA" = (
-/obj/machinery/suit_storage_unit/syndicate,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
+/obj/item/clothing/mask/breath,
+/obj/item/tank/internals/oxygen/red,
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered)
 "QI" = (

_maps/configs/independent_beluga.json

@@ -4,7 +4,7 @@
 	"prefix": "ISV",
 	"namelists": ["CRUISE", "NATURAL"],
 	"map_short_name": "Beluga-class",
-	"map_path": "_maps/shuttles/shiptest/independent_beluga.dmm",
+	"map_path": "_maps/shuttles/independent/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",

_maps/configs/independent_box.json

@@ -6,7 +6,7 @@
 	"tags": [
 		"Medical"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_box.dmm",
+	"map_path": "_maps/shuttles/independent/independent_box.dmm",
 	"namelists": [
 		"GENERAL",
 		"SPACE",

_maps/configs/independent_boyardee.json

@@ -15,7 +15,7 @@
 	],
 	"starting_funds": 5000,
 	"map_short_name": "Boyardee-class",
-	"map_path": "_maps/shuttles/shiptest/independent_boyardee.dmm",
+	"map_path": "_maps/shuttles/independent/independent_boyardee.dmm",
 	"job_slots": {
 		"Bartender": {
 			"outfit": "/datum/outfit/job/bartender",

_maps/configs/independent_bubble.json

@@ -2,7 +2,7 @@
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Bubble-class Colonial Ship",
 	"map_short_name": "Bubble-class",
-	"map_path": "_maps/shuttles/shiptest/independent_bubble.dmm",
+	"map_path": "_maps/shuttles/independent/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",

_maps/configs/independent_byo.json

@@ -2,7 +2,7 @@
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "BYO-class Do-It-Yourself Enthusiast Special",
 	"map_short_name": "BYO-class",
-	"map_path": "_maps/shuttles/shiptest/independent_byo.dmm",
+	"map_path": "_maps/shuttles/independent/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",

_maps/configs/independent_caravan.json

@@ -2,7 +2,7 @@
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Caravan-class Modular ship",
 	"map_short_name": "Caravan-class",
-	"map_path": "_maps/shuttles/shiptest/independent_caravan.dmm",
+	"map_path": "_maps/shuttles/independent/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": [

_maps/configs/independent_dwayne.json

@@ -9,7 +9,7 @@
 		"MERCANTILE"
 	],
 	"map_short_name": "Mk.II Dwayne-class ",
-	"map_path": "_maps/shuttles/shiptest/independent_dwayne.dmm",
+	"map_path": "_maps/shuttles/independent/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",

_maps/configs/independent_halftrack.json

@@ -12,7 +12,7 @@
 	"Combat",
 	"Cargo"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_halftrack.dmm",
+	"map_path": "_maps/shuttles/independent/independent_halftrack.dmm",
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/captain",

_maps/configs/independent_junker.json

@@ -12,7 +12,7 @@
 		"Survival Challenge"
 	],
 	"starting_funds": 0,
-	"map_path": "_maps/shuttles/shiptest/independent_junker.dmm",
+	"map_path": "_maps/shuttles/independent/independent_junker.dmm",
 	"limit": 1,
 	"job_slots": {
 		"Assistant": {

_maps/configs/independent_kilo.json

@@ -13,7 +13,7 @@
 	],
 	"map_short_name": "Kilo-class",
 	"starting_funds": 1500,
-	"map_path": "_maps/shuttles/shiptest/independent_kilo.dmm",
+	"map_path": "_maps/shuttles/independent/independent_kilo.dmm",
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/captain/western",

_maps/configs/independent_lagoon.json

@@ -12,7 +12,7 @@
 		"CRUISE"
 	],
 	"map_short_name": "Lagoon-class",
-	"map_path": "_maps/shuttles/shiptest/independent_lagoon.dmm",
+	"map_path": "_maps/shuttles/independent/independent_lagoon.dmm",
 	"starting_funds": 3000,
 	"job_slots": {
 		"Captain": {

_maps/configs/independent_litieguai.json

@@ -6,7 +6,7 @@
 	"tags": [
 		"Medical"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_litieguai.dmm",
+	"map_path": "_maps/shuttles/independent/independent_litieguai.dmm",
 	"namelists": [
 		"SPACE",
 		"BEASTS",

_maps/configs/independent_masinyane.json

@@ -11,7 +11,7 @@
 		"MYTHOLOGICAL",
 		"NATURAL"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_masinyane.dmm",
+	"map_path": "_maps/shuttles/independent/independent_masinyane.dmm",
 	"job_slots": {
 		"Private Ship Owner": {
 			"outfit": "/datum/outfit/job/captain/independent/owner",

_maps/configs/independent_meta.json

@@ -13,7 +13,7 @@
 		"SPACE",
 		"HISTORICAL"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_meta.dmm",
+	"map_path": "_maps/shuttles/independent/independent_meta.dmm",
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/captain",

_maps/configs/independent_mudskipper.json

@@ -13,7 +13,7 @@
 		"GENERAL",
 		"SPACE"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_mudskipper.dmm",
+	"map_path": "_maps/shuttles/independent/independent_mudskipper.dmm",
 	"roundstart": true,
 	"limit": 2,
 	"starting_funds": 1500,

_maps/configs/independent_nemo.json

@@ -15,7 +15,7 @@
 		"Robotics"
 	],
 	"starting_funds": 500,
-	"map_path": "_maps/shuttles/shiptest/independent_nemo.dmm",
+	"map_path": "_maps/shuttles/independent/independent_nemo.dmm",
 	"job_slots": {
 		"Research Director": {
 			"outfit": "/datum/outfit/job/rd",

_maps/configs/independent_pill.json

@@ -11,7 +11,7 @@
 	"tags": [
 		"Specialist"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_pillbottle.dmm",
+	"map_path": "_maps/shuttles/independent/independent_pillbottle.dmm",
 	"limit":1,
 	"starting_funds": 0,
 	"job_slots": {

_maps/configs/independent_rigger.json

@@ -16,7 +16,7 @@
 		"Robotics",
 		"Generalist"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_rigger.dmm",
+	"map_path": "_maps/shuttles/independent/independent_rigger.dmm",
 	"roundstart": true,
 	"limit": 2,
 	"job_slots": {

_maps/configs/independent_rube_goldberg.json

@@ -9,7 +9,7 @@
 	"map_short_name": "Rube Goldberg-class",
 	"description": "The Rube Goldberg-class Engineering Project is an experience, and a monument to insanity. Featuring a powerful supermatter engine in combination with an Escher-esque structural layout, complicated pipe and wire network, and utter disregard for basic safety procedures and common sense, this ship is a disaster waiting to happen.",
 	"tags": ["Engineering", "Construction"],
-	"map_path": "_maps/shuttles/shiptest/independent_rube_goldberg.dmm",
+	"map_path": "_maps/shuttles/independent/independent_rube_goldberg.dmm",
 	"limit": 1,
 	"job_slots": {
 		"Chief at Engineering": {

_maps/configs/independent_schmiedeberg.json

@@ -9,7 +9,7 @@
 		"Medical",
 		"Chemistry"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_schmiedeberg.dmm",
+	"map_path": "_maps/shuttles/independent/independent_schmiedeberg.dmm",
 	"namelists": [
 		"SUNS",
 		"GENERAL"

_maps/configs/independent_shepherd.json

@@ -8,7 +8,7 @@
 		"Botany",
 		"Service"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_shepherd.dmm",
+	"map_path": "_maps/shuttles/independent/independent_shepherd.dmm",
 	"prefix": "ISV",
 	"namelists": [
 		"MYTHOLOGICAL"

_maps/configs/independent_shetland.json

@@ -13,7 +13,7 @@
 		"Service",
 		"Medical"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_shetland.dmm",
+	"map_path": "_maps/shuttles/independent/independent_shetland.dmm",
 	"map_id": "independent_shetland",
 	"roundstart": true,
 	"job_slots": {

_maps/configs/independent_tranquility.json

@@ -14,7 +14,7 @@
 		"Service",
 		"Generalist"
 	],
-	"map_path": "_maps/shuttles/shiptest/independent_tranquility.dmm",
+	"map_path": "_maps/shuttles/independent/independent_tranquility.dmm",
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/captain/western",

_maps/configs/inteq_colossus.json

@@ -14,7 +14,7 @@
 		"INTEQ"
 	],
 	"map_short_name": "Colossus-class",
-	"map_path": "_maps/shuttles/shiptest/inteq_colossus.dmm",
+	"map_path": "_maps/shuttles/inteq/inteq_colossus.dmm",
 	"limit": 1,
 	"job_slots": {
 		"Vanguard": {

_maps/configs/inteq_hound.json

@@ -12,7 +12,7 @@
 	"tags": [
 		"Combat"
 	],
-	"map_path": "_maps/shuttles/shiptest/inteq_hound.dmm",
+	"map_path": "_maps/shuttles/inteq/inteq_hound.dmm",
 	"map_id": "inteq_hound",
 	"limit": 2,
 	"job_slots": {

_maps/configs/inteq_talos.json

@@ -14,7 +14,7 @@
 		"INTEQ"
 	],
 	"map_short_name": "Talos-class",
-	"map_path": "_maps/shuttles/shiptest/inteq_talos.dmm",
+	"map_path": "_maps/shuttles/inteq/inteq_talos.dmm",
 	"limit": 1,
 	"job_slots": {
 		"Vanguard": {

_maps/configs/inteq_vaquero.json

@@ -11,7 +11,7 @@
 		"INTEQ"
 	],
 	"map_short_name": "Vaquero-class",
-	"map_path": "_maps/shuttles/shiptest/inteq_vaquero.dmm",
+	"map_path": "_maps/shuttles/inteq/inteq_vaquero.dmm",
 	"limit": 1,
 	"job_slots": {
 		"Vanguard": {

_maps/configs/minutemen_asclepius.json

@@ -13,7 +13,7 @@
 		"MYTHOLOGICAL"
 	],
 	"map_short_name": "Asclepius-class",
-	"map_path": "_maps/shuttles/shiptest/minutemen_asclepius.dmm",
+	"map_path": "_maps/shuttles/minutemen/minutemen_asclepius.dmm",
 	"limit": 1,
 	"job_slots": {
 		"Captain": {

_maps/configs/minutemen_cepheus.json

@@ -11,7 +11,7 @@
 		"MYTHOLOGICAL"
 	],
 	"map_short_name": "Cepheus-class",
-	"map_path": "_maps/shuttles/shiptest/minutemen_cepheus.dmm",
+	"map_path": "_maps/shuttles/minutemen/minutemen_cepheus.dmm",
 	"limit": 1,
 	"job_slots": {
 		"Captain": {

_maps/configs/minutemen_corvus.json

@@ -12,7 +12,7 @@
 		"MYTHOLOGICAL"
 	],
 	"map_short_name": "Corvus-class",
-	"map_path": "_maps/shuttles/shiptest/minutemen_corvus.dmm",
+	"map_path": "_maps/shuttles/minutemen/minutemen_corvus.dmm",
 	"limit": 2,
 	"job_slots": {
 		"Captain": {

_maps/configs/minutemen_vela.json

@@ -11,7 +11,7 @@
 	],
 	"map_short_name": "Vela-class",
 	"starting_funds": 1000,
-	"map_path": "_maps/shuttles/shiptest/minutemen_vela.dmm",
+	"map_path": "_maps/shuttles/minutemen/minutemen_vela.dmm",
 	"limit": 1,
 	"job_slots": {
 		"Captain": {

_maps/configs/nanotrasen_delta.json

@@ -15,7 +15,7 @@
 		"Science",
 		"Robotics"
 	],
-	"map_path": "_maps/shuttles/shiptest/nanotrasen_delta.dmm",
+	"map_path": "_maps/shuttles/nanotrasen/nanotrasen_delta.dmm",
 	"starting_funds": 4000,
 	"job_slots": {
 		"Captain": {

_maps/configs/nanotrasen_gecko.json

@@ -8,7 +8,7 @@
 		"SPACE"
 	],
 	"map_short_name": "Gecko-class",
-	"map_path": "_maps/shuttles/shiptest/nanotrasen_gecko.dmm",
+	"map_path": "_maps/shuttles/nanotrasen/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",

_maps/configs/nanotrasen_mimir.json

@@ -15,7 +15,7 @@
 		"Generalist",
 		"Specialist"
 	],
-	"map_path": "_maps/shuttles/shiptest/nanotrasen_mimir.dmm",
+	"map_path": "_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm",
 	"limit": 1,
 	"job_slots": {
 		"Warden": {

_maps/configs/nanotrasen_osprey.json

@@ -9,7 +9,7 @@
 		"WEAPONS"
 	],
 	"map_short_name": "Osprey-class",
-	"map_path": "_maps/shuttles/shiptest/nanotrasen_osprey.dmm",
+	"map_path": "_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm",
 	"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,

_maps/configs/nanotrasen_ranger.json

@@ -18,7 +18,7 @@
 		"Generalist"
 	],
 	"starting_funds": 4000,
-	"map_path": "_maps/shuttles/shiptest/nanotrasen_ranger.dmm",
+	"map_path": "_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm",
 	"limit": 1,
 	"job_slots": {
 		"LP Lieutenant": {

_maps/configs/nanotrasen_skipper.json

@@ -10,7 +10,7 @@
 		"WEAPONS",
 		"MERCANTILE"
 	],
-	"map_path": "_maps/shuttles/shiptest/nanotrasen_skipper.dmm",
+	"map_path": "_maps/shuttles/nanotrasen/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",

_maps/configs/pirate_ember.json

@@ -7,7 +7,7 @@
 		"BRITISH_NAVY"
 	],
 	"map_short_name": "Ember-class",
-	"map_path": "_maps/shuttles/shiptest/pirate_ember.dmm",
+	"map_path": "_maps/shuttles/pirate/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",