Merge remote-tracking branch 'upstream/master' into scarab-class

shiptest-ss13 · Oct 5, 2024 · adb4967 · adb4967
2 parents 24efc53 + b009822
commit adb4967
Show file tree

Hide file tree

Showing 79 changed files with 1,403 additions and 388 deletions.
diff --git a/_maps/configs/independent_kilo.json b/_maps/configs/independent_kilo.json
@@ -31,7 +31,7 @@
 		},
 		"Deckhand": {
 			"outfit": "/datum/outfit/job/independent/assistant",
-			"slots": 2
+			"slots": 1
 		}
 	},
 	"enabled": true

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

diff --git a/_maps/configs/inteq_vaquero.json b/_maps/configs/inteq_vaquero.json
@@ -39,7 +39,7 @@
 		},
 		"Recruit": {
 			"outfit": "/datum/outfit/job/inteq/assistant",
-			"slots": 2
+			"slots": 1
 		}
 	},
 	"enabled": true

diff --git a/_maps/shuttles/independent/independent_junker.dmm b/_maps/shuttles/independent/independent_junker.dmm
@@ -2284,7 +2284,6 @@
 /turf/closed/wall/r_wall,
 /area/ship/maintenance/port)
 "Ro" = (
-/obj/machinery/pipedispenser/disposal,
 /obj/item/reagent_containers/food/drinks/mug/tea{
 	pixel_y = 8;
 	pixel_x = -7
@@ -2305,6 +2304,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
+/obj/machinery/pipedispenser,
 /turf/open/floor/plating,
 /area/ship/maintenance/central)
 "RQ" = (

diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -653,9 +653,9 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "gH" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 6;
-	id = "colossus_grid"
+/obj/machinery/porta_turret/ship/inteq{
+	id = "colossus_grid";
+	dir = 4
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew)
@@ -1138,9 +1138,9 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
 "mb" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 5;
-	id = "colossus_grid"
+/obj/machinery/porta_turret/ship/inteq/light{
+	id = "colossus_grid";
+	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/hallway/port)
@@ -1734,9 +1734,9 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "sT" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 5;
-	id = "colossus_grid"
+/obj/machinery/porta_turret/ship/inteq/light{
+	id = "colossus_grid";
+	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/crew)
@@ -2068,9 +2068,9 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/cargo)
 "vJ" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 5;
-	id = "colossus_grid"
+/obj/machinery/porta_turret/ship/inteq{
+	id = "colossus_grid";
+	dir = 5
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/maintenance/port)
@@ -2442,9 +2442,9 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Bi" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 9;
-	id = "colossus_grid"
+/obj/machinery/porta_turret/ship/inteq{
+	id = "colossus_grid";
+	dir = 9
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew/office)
@@ -3320,8 +3320,9 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/security/armory)
 "Ll" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 5
+/obj/machinery/porta_turret/ship/inteq{
+	id = "colossus_grid";
+	dir = 4
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -3557,7 +3558,8 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Oa" = (
-/obj/machinery/porta_turret/ship/ballistic{
+/obj/machinery/porta_turret/ship/inteq/light{
+	id = "colossus_grid";
 	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium,
@@ -3630,9 +3632,9 @@
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/maintenance/starboard)
 "OI" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 6;
-	id = "colossus_grid"
+/obj/machinery/porta_turret/ship/inteq{
+	id = "colossus_grid";
+	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/maintenance/starboard)
@@ -3790,9 +3792,9 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "Qw" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 10;
-	id = "colossus_grid"
+/obj/machinery/porta_turret/ship/inteq{
+	id = "colossus_grid";
+	dir = 10
 	},
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/security/armory)
@@ -3944,9 +3946,9 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "RZ" = (
-/obj/machinery/porta_turret/ship/ballistic{
-	dir = 6;
-	id = "colossus_grid"
+/obj/machinery/porta_turret/ship/inteq/light{
+	id = "talos_grid";
+	dir = 6
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/security)

diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -103,7 +103,7 @@
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/ship/engineering/communications)
 "aC" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 5;
 	id = "talos_grid"
 	},
@@ -849,7 +849,7 @@
 /turf/open/floor/plating/airless,
 /area/ship/storage/port)
 "fs" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 5;
 	id = "talos_grid"
 	},
@@ -2689,14 +2689,14 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/cryo)
 "qt" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 6;
 	id = "talos_grid"
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/maintenance/starboard)
 "qz" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 5;
 	id = "talos_grid"
 	},
@@ -4556,9 +4556,9 @@
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "Cr" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 9;
-	id = "talos_grid"
+/obj/machinery/porta_turret/ship/inteq/light{
+	id = "talos_grid";
+	dir = 9
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/engineering/communications)
@@ -4821,7 +4821,7 @@
 	autolinkers = list("hub","processor4","bus");
 	network = "irmg_commnet"
 	},
-/turf/open/floor/circuit/telecomms/mainframe,
+/turf/closed/wall/mineral/plastitanium,
 /area/ship/engineering/communications)
 "Ep" = (
 /obj/item/trash/can,
@@ -4853,9 +4853,9 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "ED" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 10;
-	id = "talos_grid"
+/obj/machinery/porta_turret/ship/inteq/light{
+	id = "talos_grid";
+	dir = 10
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/storage)
@@ -6624,7 +6624,7 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "Rf" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 6;
 	id = "talos_grid"
 	},
@@ -7491,7 +7491,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "WN" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 6;
 	id = "talos_grid"
 	},

diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -1933,7 +1933,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "DT" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 6;
 	id = "vaquero_grid"
 	},
@@ -2027,7 +2027,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "Fm" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 5;
 	id = "vaquero_grid"
 	},
@@ -2523,7 +2523,7 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "NO" = (
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 6;
 	id = "vaquero_grid"
 	},
@@ -2957,7 +2957,7 @@
 	port_direction = 8;
 	preferred_direction = 4
 	},
-/obj/machinery/porta_turret/ship/weak{
+/obj/machinery/porta_turret/ship/inteq{
 	dir = 5;
 	id = "vaquero_grid"
 	},

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
@@ -1371,9 +1371,9 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "jH" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 9;
-	id = "delta_grid"
+/obj/machinery/porta_turret/ship/nt/light{
+	id = "delta_grid";
+	dir = 9
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -2891,9 +2891,9 @@
 /turf/open/floor/plasteel/white,
 /area/ship/science/robotics)
 "WG" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 4;
-	id = "delta_grid"
+/obj/machinery/porta_turret/ship/nt/light{
+	id = "delta_grid";
+	dir = 4
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
@@ -3018,9 +3018,9 @@
 /turf/open/floor/plasteel/white,
 /area/ship/science/robotics)
 "YZ" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 10;
-	id = "delta_grid"
+/obj/machinery/porta_turret/ship/nt/light{
+	id = "delta_grid";
+	dir = 10
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)