Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

…to drinksUpdate

_maps/configs/independent_sunskipper.json

@@ -0,0 +1,36 @@
+{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"map_name": "Sunskipper-class Culinary Vessel",
+	"prefix": "ISV",
+	"namelists": ["CRUISE", "NATURAL"],
+	"map_short_name": "Sunskipper-class",
+	"map_path": "_maps/shuttles/independent/independent_sunskipper.dmm",
+	"description": "The Sunskipper-class is a state-of-the-art culinary vessel found in the frontier. It's name is a wordplay between a Kalixcian species of butterfly and ship's unique solar-powered batteries. The Sunskipper is welcomed with open arms by weary spacers of greater paycheks, who are fatigued by the monotony of their everyday meals. The ship features a self-sustaining kitchen with hydroponics and a large, deluxe dining hall, designed to serve starved travelers. It also comes with a fully-stocked bar area that allows them to drink their troubles away, if even for a brief moment.",
+	"tags": [
+		"RP Focus",
+		"Service",
+		"Specialist"
+	],
+	"starting_funds": 3000,
+	"limit": 1,
+	"job_slots": {
+		"Manager": {
+			"outfit": "/datum/outfit/job/independent/captain/manager",
+			"slots": 1,
+			"officer": true
+		},
+		"Bartender": {
+			"outfit": "/datum/outfit/job/independent/bartender/disarmed",
+			"slots": 1
+		},
+		"Cook": {
+			"outfit": "/datum/outfit/job/independent/cook",
+			"slots": 2
+		},
+		"Waiter": {
+			"outfit": "/datum/outfit/job/independent/assistant/waiter",
+			"slots": 2
+		}
+	},
+	"enabled": true
+}

_maps/map_catalogue.txt

@@ -86,6 +86,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		Size = (x = 90)(y = 63)(z = 1)
 		Tags = "Medium Combat Challenge", "Medium Loot", "Megafauna", "Necropolis Loot", "Inhospitable", "Lava"
 
+		File Name = "_maps\RandomRuins\LavaRuins\lavaland_surface_wrecked_factory.dmm"
+		Size = (x = 47)(y = 47)(z = 1)
+		Tags = "Boss Combat Challenge", "Major Loot", "Shelter", "Lava"
+
 		File Name = "_maps\RandomRuins\BeachRuins\lavaland_crashed_starwalker.dmm"
 		Size = (x = 33)(y = 56)(z = 1)
 		Tags = "Minor Combat Challenge", "Medium Loot", "Lava"