Merge remote-tracking branch 'upstream/master'

Imaginos16 · Jul 12, 2024 · a42acc3 · a42acc3
2 parents 74fa33a + 0644edb
commit a42acc3
Show file tree

Hide file tree

Showing 61 changed files with 1,907 additions and 2,147 deletions.
diff --git a/_maps/configs/independent_beluga.json b/_maps/configs/independent_beluga.json
@@ -12,7 +12,7 @@
 		"Service"
 	],
 	"starting_funds": 4000,
-	"limit": 2,
+	"limit": 1,
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/independent/captain",

diff --git a/_maps/configs/independent_mudskipper.json b/_maps/configs/independent_mudskipper.json
@@ -14,7 +14,7 @@
 		"SPACE"
 	],
 	"map_path": "_maps/shuttles/independent/independent_mudskipper.dmm",
-	"limit": 2,
+	"limit": 1,
 	"starting_funds": 1500,
 	"job_slots": {
 		"Salvage Leader": {

diff --git a/_maps/configs/independent_schmiedeberg.json b/_maps/configs/independent_schmiedeberg.json
@@ -14,7 +14,7 @@
 		"SUNS",
 		"GENERAL"
 	],
-	"limit": 2,
+	"limit": 1,
 	"job_slots": {
 		"Chief Pharmacist": {
 			"outfit": "/datum/outfit/job/independent/cmo/pharma",

diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json
@@ -18,7 +18,7 @@
 	"limit": 1,
 	"job_slots": {
 		"Vanguard": {
-			"outfit": "/datum/outfit/job/inteq/captain",
+			"outfit": "/datum/outfit/job/inteq/captain/empty",
 			"officer": true,
 			"slots": 1
 		},

diff --git a/_maps/configs/inteq_hound.json b/_maps/configs/inteq_hound.json
@@ -17,7 +17,7 @@
 	"limit": 2,
 	"job_slots": {
 		"Vanguard": {
-			"outfit": "/datum/outfit/job/inteq/captain",
+			"outfit": "/datum/outfit/job/inteq/captain/empty",
 			"officer": true,
 			"slots": 1
 		},

diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json
@@ -18,7 +18,7 @@
 	"limit": 1,
 	"job_slots": {
 		"Vanguard": {
-			"outfit": "/datum/outfit/job/inteq/captain",
+			"outfit": "/datum/outfit/job/inteq/captain/empty",
 			"officer": true,
 			"slots": 1
 		},
@@ -27,7 +27,7 @@
 			"officer": true,
 			"slots": 1
 		},
-		"Artificer Class II": {
+		"Honorable Artificer": {
 			"outfit": "/datum/outfit/job/inteq/ce",
 			"officer": true,
 			"slots": 1
@@ -36,10 +36,6 @@
 			"outfit": "/datum/outfit/job/inteq/engineer",
 			"slots": 3
 		},
-		"Corpsman": {
-			"outfit": "/datum/outfit/job/inteq/paramedic",
-			"slots": 2
-		},
 		"Enforcer": {
 			"outfit": "/datum/outfit/job/inteq/security",
 			"slots": 1

diff --git a/_maps/configs/inteq_valor.json b/_maps/configs/inteq_valor.json
@@ -23,9 +23,18 @@
 			"officer": true,
 			"slots": 1
 		},
+		"Shuttle Pilot": {
+			"outfit": "/datum/outfit/job/inteq/warden/pilot",
+			"officer": true,
+			"slots": 1
+		},
+		"Shuttle Corpsman": {
+			"outfit": "/datum/outfit/job/inteq/paramedic/empty",
+			"slots": 1
+		},
 		"Corpsman": {
 			"outfit": "/datum/outfit/job/inteq/paramedic/empty",
-			"slots": 3
+			"slots": 2
 		},
 		"Enforcer": {
 			"outfit": "/datum/outfit/job/inteq/security/empty",

diff --git a/_maps/configs/inteq_vaquero.json b/_maps/configs/inteq_vaquero.json
@@ -15,7 +15,7 @@
 	"limit": 1,
 	"job_slots": {
 		"Vanguard": {
-			"outfit": "/datum/outfit/job/inteq/captain",
+			"outfit": "/datum/outfit/job/inteq/captain/empty",
 			"officer": true,
 			"slots": 1
 		},

diff --git a/_maps/configs/nanotrasen_gecko.json b/_maps/configs/nanotrasen_gecko.json
@@ -14,7 +14,7 @@
 		"Mining",
 		"Engineering"
 	],
-	"limit": 2,
+	"limit": 1,
 	"starting_funds": 5000,
 	"job_slots": {
 		"Captain": {

diff --git a/_maps/example_ship_config.json b/_maps/example_ship_config.json
@@ -5,7 +5,7 @@
 	"prefix": "STSV",
 	"namelists": ["GENERAL", "SPACE", "MYTHOLOGICAL", "WEAPONS"],
 	"map_path": "_maps/shuttles/shiptest/null.dmm",
-	"limit": 2,
+	"limit": 1,
 	"spawn_time_coeff": 1.5,
 	"officer_time_coeff": 0.5,
 	"job_slots": {

diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json
@@ -134,7 +134,7 @@
 			"description": "The amount of ships that can be spawned in by players in a round at once.",
 			"minimum": 0,
 			"maximum": 100,
-			"default": 2
+			"default": 1
 		},
 		"starting_funds":{
 			"title": "Ship Starting Funds",

diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm
@@ -930,12 +930,6 @@
 	},
 /turf/open/floor/carpet/nanoweave/red,
 /area/ship/crew/canteen)
-"fZ" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering)
 "gb" = (
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
@@ -1150,9 +1144,6 @@
 /turf/open/floor/wood,
 /area/ship/crew/library)
 "hK" = (
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
 	dir = 4
 	},
@@ -2507,12 +2498,6 @@
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
-"qq" = (
-/obj/structure/disposalpipe/segment{
-	dir = 6
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering)
 "qu" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
@@ -3147,7 +3132,6 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
 "uV" = (
-/obj/structure/closet/radiation,
 /obj/machinery/firealarm/directional/west,
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -5503,6 +5487,11 @@
 /obj/effect/turf_decal/industrial/radiation{
 	dir = 10
 	},
+/obj/machinery/button/ignition/incinerator/atmos{
+	dir = 4;
+	pixel_x = -27;
+	pixel_y = 8
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "LB" = (
@@ -5560,12 +5549,6 @@
 /turf/open/floor/light,
 /area/ship/engineering)
 "Me" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/obj/item/weldingtool,
-/obj/item/weldingtool,
 /obj/machinery/button/door/incinerator_vent_atmos_aux{
 	dir = 4;
 	pixel_x = -28;
@@ -5581,6 +5564,9 @@
 	pixel_x = -28;
 	pixel_y = -8
 	},
+/obj/machinery/computer/atmos_control/incinerator{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Mf" = (
@@ -5610,13 +5596,11 @@
 /turf/open/floor/wood,
 /area/ship/crew/library)
 "Mr" = (
-/obj/machinery/computer/atmos_control/incinerator{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/opaque/green/arrow_ccw,
+/obj/structure/closet/radiation,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Mx" = (
@@ -5888,6 +5872,7 @@
 /area/ship/hallway/fore)
 "Pc" = (
 /obj/machinery/air_sensor/atmos/incinerator_tank,
+/obj/machinery/igniter/incinerator_atmos,
 /turf/open/floor/engine,
 /area/ship/engineering)
 "Pe" = (
@@ -7664,7 +7649,7 @@ Pn
 Bz
 Pn
 Nr
-qq
+Pn
 hK
 Pc
 FA
@@ -7705,7 +7690,7 @@ eS
 Vc
 Pn
 VS
-fZ
+Pn
 NB
 cT
 RC

diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
@@ -1895,7 +1895,6 @@
 /obj/machinery/atmospherics/pipe/simple/dark/visible{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
@@ -2215,12 +2214,6 @@
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/hallway/fore)
-"sV" = (
-/obj/structure/disposalpipe/segment{
-	dir = 9
-	},
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
 "sX" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
@@ -2299,9 +2292,6 @@
 "tU" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "tX" = (
@@ -2935,9 +2925,6 @@
 	pixel_x = -23;
 	pixel_y = 8
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 6
-	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "yU" = (
@@ -4406,9 +4393,6 @@
 	pixel_x = -4;
 	pixel_y = 10
 	},
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
 /turf/open/floor/engine/vacuum,
 /area/ship/engineering/engine)
 "LQ" = (
@@ -5912,11 +5896,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
 "Zn" = (
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/obj/machinery/disposal/bin,
-/obj/item/weldingtool/mini,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Zr" = (
@@ -6109,7 +6088,7 @@ pr
 NK
 yP
 qk
-sV
+Zn
 CZ
 vz
 on