Merge branch 'master' into realworldiconsnovirus

shiptest-ss13 · Nov 13, 2023 · c71b84f · c71b84f
2 parents d192bec + dbc88b0
commit c71b84f
Show file tree

Hide file tree

Showing 162 changed files with 10,702 additions and 1,221 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -1456,32 +1456,34 @@
 /area/ruin)
 "dA" = (
 /obj/effect/turf_decal/trimline/transparent/neutral/filled/line,
-/obj/effect/turf_decal/weather/snow/corner{
-	dir = 10
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
+/obj/effect/turf_decal/weather/snow{
+	dir = 10
+	},
 /turf/open/floor/plasteel/dark{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin)
 "dB" = (
 /obj/effect/turf_decal/trimline/transparent/neutral/filled/line,
-/obj/effect/turf_decal/weather/snow/corner,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
+/obj/effect/turf_decal/weather/snow,
 /turf/open/floor/plasteel/dark{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin)
 "dC" = (
 /obj/effect/turf_decal/trimline/transparent/neutral/filled/line,
-/obj/effect/turf_decal/weather/snow/corner,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
+/obj/effect/turf_decal/weather/snow{
+	dir = 6
+	},
 /turf/open/floor/plasteel/dark{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/lab4071.dmm b/_maps/RandomRuins/SpaceRuins/lab4071.dmm
@@ -231,17 +231,6 @@
 /turf/open/floor/plasteel/mono/white,
 /area/ruin/space/has_grav/crazylab/crew)
 "dO" = (
-/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{
-	assignedrole = "Unlicensed Chemist";
-	dir = 4;
-	flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options.";
-	id_job = "Unlicensed Chemist";
-	important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim.";
-	mob_name = "unlicensed chemist";
-	name = "Unlicensed Chemist";
-	outfit = /datum/outfit/job/chemist/juniorchemist;
-	short_desc = "You are a chemist in an illegal laboratory."
-	},
 /obj/machinery/button/door{
 	id = 64;
 	name = "Dorm Shutters";
@@ -254,34 +243,6 @@
 /obj/structure/bookcase/random/reference,
 /turf/open/floor/plasteel/grimy,
 /area/ruin/space/has_grav/crazylab/crew)
-"eh" = (
-/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{
-	assignedrole = "Unlicensed Chemist";
-	dir = 4;
-	flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options.";
-	id_job = "Unlicensed Chemist";
-	important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim.";
-	mob_name = "unlicensed chemist";
-	name = "Unlicensed Chemist";
-	outfit = /datum/outfit/job/chemist/juniorchemist;
-	short_desc = "You are a chemist in an illegal laboratory."
-	},
-/turf/open/floor/plasteel/grimy,
-/area/ruin/space/has_grav/crazylab/crew)
-"et" = (
-/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{
-	assignedrole = "Unlicensed Chemist";
-	dir = 8;
-	flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options.";
-	id_job = "Unlicensed Chemist";
-	important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim.";
-	mob_name = "unlicensed chemist";
-	name = "Unlicensed Chemist";
-	outfit = /datum/outfit/job/chemist/juniorchemist;
-	short_desc = "You are a chemist in an illegal laboratory."
-	},
-/turf/open/floor/plasteel/grimy,
-/area/ruin/space/has_grav/crazylab/crew)
 "eA" = (
 /obj/structure/bookcase/random/nonfiction,
 /turf/open/floor/plasteel/grimy,
@@ -570,17 +531,6 @@
 /area/ruin/space/has_grav/crazylab/crew)
 "jL" = (
 /obj/machinery/light/directional/south,
-/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault{
-	assignedrole = "Unlicensed Chemist";
-	dir = 4;
-	flavour_text = "Despite all the setbacks, you have finally found a place to practice your craft in relative peace, thanks to a shady deal with a criminal organization. You now work for them as a contract chemist, but your goal of profit leaves you plenty of options.";
-	id_job = "Unlicensed Chemist";
-	important_info = "Work together, use chemistry to turn a profit and help out the population of the Outer Rim.";
-	mob_name = "unlicensed chemist";
-	name = "Unlicensed Chemist";
-	outfit = /datum/outfit/job/chemist/juniorchemist;
-	short_desc = "You are a chemist in an illegal laboratory."
-	},
 /turf/open/floor/plasteel/grimy,
 /area/ruin/space/has_grav/crazylab/crew)
 "jO" = (
@@ -4957,7 +4907,7 @@ GV
 GV
 ao
 cq
-eh
+gP
 gV
 jG
 lN
@@ -4995,7 +4945,7 @@ GV
 GV
 ao
 cq
-et
+gP
 hf
 jO
 lS

diff --git a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm
@@ -324,7 +324,6 @@
 /area/ruin/space/has_grav/syndicircle/winter)
 "iR" = (
 /obj/effect/mine/shrapnel,
-/obj/effect/turf_decal/weather/snow/corner,
 /obj/item/stack/tile/mineral/snow,
 /obj/machinery/light/dim/directional/west,
 /obj/effect/decal/cleanable/dirt/dust,

diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -4990,15 +4990,6 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/spacemall)
 "sH" = (
-/obj/item/clothing/under/pants/classicjeans{
-	pixel_y = -5
-	},
-/obj/item/clothing/under/pants/classicjeans{
-	pixel_y = -5
-	},
-/obj/item/clothing/under/pants/classicjeans{
-	pixel_y = -5
-	},
 /obj/item/clothing/suit/ianshirt,
 /obj/item/clothing/suit/ianshirt,
 /obj/item/clothing/suit/ianshirt,

diff --git a/_maps/configs/solgov_inkwell.json b/_maps/configs/solgov_inkwell.json
@@ -0,0 +1,49 @@
+{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"map_name": "Inkwell-class Supply Freighter",
+	"prefix": "SGSV",
+	"namelists": [
+		"SOLGOV",
+		"SPACE",
+		"BRITISH_NAVY",
+		"NATURAL"
+	],
+	"map_short_name": "Inkwell-class",
+	"map_path": "_maps/shuttles/solgov/solgov_inkwell.dmm",
+	"description": "One of the few Sol-designed hulls used outside of official contexts by non-Confederation parties, the Inkwell is a freighter respected for its engineering and loved for its lavish crew accommodations. \n The Inkwell-class seen in numerous contexts, perhaps most notably among the Verwaltungskompanien, where they are essential in solving the logistic concerns of any proper military-administration-for-hire. Additionally, they are often commissioned and sold to non-Solarian parties for use in interstellar shipping. \n The usage of the Inkwell-class to move illicit or untracked cargo is known by any seasoned (or even half-cooked) port authority; \"...such regrettable actions by an outlier minority are mere part-and-parcel of the realities of interstellar shipping,\" goes the official reply.",
+	"tags": ["RP Focus", "Combat", "Cargo", "Mining"],
+	"limit": 1,
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/solgov/captain",
+			"officer": true,
+			"slots": 1
+		},
+		"Logistics Deck Officer": {
+			"outfit": "/datum/outfit/job/solgov/quartermaster",
+			"officer": true,
+			"slots": 1
+		},
+		"Sonnensöldner": {
+			"outfit": "/datum/outfit/job/solgov/sonnensoldner",
+			"slots": 3
+		},
+		"Ship Engineer": {
+			"outfit": "/datum/outfit/job/solgov/engineer",
+			"slots": 2
+		},
+		"Field Engineer": {
+			"outfit": "/datum/outfit/job/solgov/miner",
+			"slots": 3
+		},
+		"Bureaucrat": {
+			"outfit": "/datum/outfit/job/solgov/bureaucrat",
+			"slots": 2
+		},
+		"Scribe": {
+			"outfit": "/datum/outfit/job/solgov/assistant",
+			"slots" : 6
+		}
+	},
+	"enabled": true
+}
diff --git a/_maps/configs/syndicate_aegis.json b/_maps/configs/syndicate_aegis.json
@@ -18,38 +18,38 @@
 	],
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/syndicate",
+			"outfit": "/datum/outfit/job/syndicate/captain",
 			"officer": true,
 			"slots": 1
 		},
 
 		"Lead Doctor": {
-			"outfit": "/datum/outfit/job/cmo/syndicate/nsv",
+			"outfit": "/datum/outfit/job/syndicate/cmo/suns",
 			"slots": 1
 		},
 
 		"Ship Doctor":{
-			"outfit": "/datum/outfit/job/doctor/syndicate/nsv",
+			"outfit": "/datum/outfit/job/syndicate/doctor/suns",
 			"slots": 2
 		},
 
 		"Mechanic": {
-			"outfit": "/datum/outfit/job/engineer/syndicate",
+			"outfit": "/datum/outfit/job/syndicate/engineer",
 			"slots": 1
 		},
 
 		"Deck Service Assistant": {
-			"outfit": "/datum/outfit/job/botanist/syndicate/nsv",
+			"outfit": "/datum/outfit/job/syndicate/botanist/suns",
 			"slots": 2
 		},
 
 		"Ship Psychologist": {
-			"outfit": "/datum/outfit/job/psychologist/syndicate/nsv",
+			"outfit": "/datum/outfit/job/syndicate/psychologist/suns",
 			"slots": 1
 		},
 
 		"Long Term Patient": {
-			"outfit": "/datum/outfit/job/prisoner/syndicatepatient",
+			"outfit": "/datum/outfit/job/syndicate/patient",
 			"slots": 2
 		}
 	},

diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json
@@ -15,26 +15,26 @@
 	"map_path": "_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm",
 	"map_id": "cybersun_kansatsu",
 	"job_slots": {
-		"Captain": {
-			"outfit": "/datum/outfit/job/captain/syndicate/cybersun",
+		"Commander": {
+			"outfit": "/datum/outfit/job/syndicate/captain/cybersun",
 			"officer": true,
 			"slots": 1
 		},
 		"Intelligence Officer": {
-			"outfit": "/datum/outfit/job/head_of_personnel/syndicate/intel",
+			"outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun",
 			"officer": true,
 			"slots": 1
 		},
 		"Engineer": {
-			"outfit": "/datum/outfit/job/engineer/syndicate/cybersun",
+			"outfit": "/datum/outfit/job/syndicate/engineer/cybersun",
 			"slots": 1
 		},
 		"Field Agent": {
-			"outfit": "/datum/outfit/job/miner/syndicate/cybersun",
+			"outfit": "/datum/outfit/job/syndicate/miner/cybersun",
 			"slots": 2
 		},
 		"Junior Agent": {
-			"outfit": "/datum/outfit/job/assistant/syndicate/cyberagent",
+			"outfit": "/datum/outfit/job/syndicate/assistant/cybersun",
 			"slots": 2
 		}
 	},

diff --git a/_maps/configs/syndicate_gorlex_hyena.json b/_maps/configs/syndicate_gorlex_hyena.json
@@ -18,25 +18,25 @@
 	"map_path": "_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm",
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/syndicate/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/captain/gorlex",
 			"officer": true,
 			"slots": 1
 		},
 		"Foreman": {
-			"outfit": "/datum/outfit/job/ce/syndicate/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/ce/gorlex",
 			"officer": true,
 			"slots": 1
 		},
 		"Mechanic": {
-			"outfit": "/datum/outfit/job/engineer/syndicate/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/engineer/gorlex",
 			"slots": 1
 		},
 		"Wrecker": {
-			"outfit": "/datum/outfit/job/miner/syndicate/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/miner/gorlex",
 			"slots": 2
 		},
 		"Junior Agent": {
-			"outfit": "/datum/outfit/job/assistant/syndicate/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/assistant/gorlex",
 			"slots": 2
 		}
 	},

diff --git a/_maps/configs/syndicate_gorlex_komodo.json b/_maps/configs/syndicate_gorlex_komodo.json
@@ -19,33 +19,33 @@
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain/syndicate/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/captain/gorlex",
 			"officer": true,
 			"slots": 1
 		},
 		"Sergeant": {
-			"outfit": "/datum/outfit/job/hos/syndicate",
+			"outfit": "/datum/outfit/job/syndicate/hos/gorlex",
 			"officer": true,
 			"slots": 1
 		},
 		"Medic": {
-			"outfit": "/datum/outfit/job/doctor/syndicate_komodo",
+			"outfit": "/datum/outfit/job/syndicate/doctor/gorlex",
 			"slots": 1
 		},
 		"Mechanic": {
-			"outfit": "/datum/outfit/job/engineer/syndicate/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/miner/gorlex",
 			"slots": 1
 		},
 		"Trooper": {
-			"outfit": "/datum/outfit/job/security/syndicate/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/security/gorlex",
 			"slots": 3
 		},
 		"Deck assistant": {
-			"outfit": "/datum/outfit/job/assistant/syndicate/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/assistant/gorlex",
 			"slots": 2
 		},
 		"Bridge officer": {
-			"outfit": "/datum/outfit/job/head_of_personnel/syndicate",
+			"outfit": "/datum/outfit/job/syndicate/head_of_personnel",
 			"slots": 1
 		}
 	},

diff --git a/_maps/configs/syndicate_lugol.json b/_maps/configs/syndicate_lugol.json
@@ -17,28 +17,28 @@
 	"limit": 2,
 	"job_slots": {
 		"Project Overseer": {
-			"outfit": "/datum/outfit/job/ce/gec",
+			"outfit": "/datum/outfit/job/syndicate/ce/gec",
 			"slots": 1,
 			"officer": true
 		},
-		"GEC Engineer": {
-			"outfit": "/datum/outfit/job/engineer/gec",
+		"GEC Engineering": {
+			"outfit": "/datum/outfit/job/syndicate/engineer/gec",
 			"slots": 3
 		},
-		"Atmospheric Technician": {
-			"outfit": "/datum/outfit/job/atmos/gec",
+		"GEC Atmospherics": {
+			"outfit": "/datum/outfit/job/syndicate/atmos/gec",
 			"slots": 3
 		},
 		"Beverage Specialist": {
-			"outfit": "/datum/outfit/job/bartender/syndicate",
+			"outfit": "/datum/outfit/job/syndicate/bartender",
 			"slots": 1
 		},
-		"Shaft Miner": {
-			"outfit": "/datum/outfit/job/miner/syndicate/gec",
+		"GEC Miner": {
+			"outfit": "/datum/outfit/job/syndicate/miner/gec",
 			"slots": 1
 		},
 		"GEC Apprentice": {
-			"outfit": "/datum/outfit/job/assistant/syndicate/gec",
+			"outfit": "/datum/outfit/job/syndicate/assistant/gec",
 			"slots": 2
 		}
 	},