Merge remote-tracking branch 'upstream/master'

_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm

@@ -1232,7 +1232,9 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/listening_post/commons)
 "vJ" = (
-/obj/machinery/suit_storage_unit/mining/eva,
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/syndicate,
+/obj/item/clothing/head/helmet/space/syndicate,
 /turf/open/floor/plasteel/tech/grid,
 /area/ruin/unpowered/listening_post)
 "vR" = (
@@ -1762,12 +1764,12 @@
 /turf/open/floor/plating,
 /area/ruin/unpowered/listening_post/engineering)
 "Gy" = (
-/obj/machinery/computer/telecomms/monitor{
-	dir = 8
-	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
+/obj/machinery/computer/telecomms/server{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/listening_post/operations)
 "GB" = (

_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm

@@ -3073,7 +3073,7 @@
 	pixel_x = -3
 	},
 /obj/item/ammo_box/magazine/illestren_a850r,
-/obj/item/storage/box/ammo/c9mm/ap,
+/obj/item/storage/box/ammo/c9mm_ap,
 /obj/item/ammo_box/magazine/illestren_a850r,
 /obj/item/ammo_box/magazine/co9mm{
 	start_empty = 1

_maps/configs/syndicate_gorlex_komodo.json

@@ -1,5 +1,5 @@
 {
-	"faction": "/datum/faction/syndicate",
+	"faction": "/datum/faction/syndicate/hardliners",
 	"prefix": "ISV",
 	"namelists": [
 		"GORLEX",

_maps/configs/syndicate_gorlex_hyena.json → _maps/configs/syndicate_ngr_derecho.json

@@ -6,17 +6,17 @@
 		"GORLEX",
 		"NATURAL_AGGRESSIVE",
 		"BEASTS",
-		"WEAPONS",
-		"ACLF"
+		"WEAPONS"
 	],
-	"map_name": "Hyena-class Wrecking Tug",
-	"description": "The Hyena is a common salvage tug, frequently operated by the Gorlex Marauders for “salvage” missions on ICW-era Nanotrasen derelicts (and occasionally occupied outposts and ships). The Hyena features a fairly compact floor plan with a dedicated secure armory space and a fairly large cargo bay for its size, as well as a complement of high-grade hardsuits and mining equipment. The Hyena’s low cost and high demand in its niche has made it a very common sight on the Frontier in the years following the ICW, and despite their tight finances nearly all Gorlex Marauder splinter factions continue to acquire more.",
+	"map_name": "Derecho-class Wrecking Tug",
+	"description": "The Derecho-class is a series of salvage ships commissioned by the New Gorlex Republic almost as soon as the Republic was founded for the prodigious task of cleaning the space around New Gorlex of countless ICW-era shipwrecks. In recent years, Derechos are operated as auxiliary ships typically tasked with surveying, assessment, and their original mission of salvaging in space controlled or contested by the NGR.",
 	"tags": [
 		"Mining",
+		"Salvage",
 		"Combat"
 	],
-	"map_short_name": "Hyena-class",
-	"map_path": "_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm",
+	"map_short_name": "Derecho-class",
+	"map_path": "_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm",
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/syndicate/captain/ngr",

_maps/shuttles/independent/independent_kilo.dmm

@@ -661,7 +661,10 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/item/storage/box/ammo/a12g_rubbershot,
+/obj/item/storage/box/ammo/a12g_buckshot,
+/obj/item/gun/ballistic/shotgun/doublebarrel/presawn{
+	default_ammo_type = 0
+	},
 /obj/structure/cable/pink{
 	icon_state = "4-10"
 	},

_maps/shuttles/independent/independent_scarab.dmm

@@ -3987,10 +3987,6 @@
 	dir = 5
 	},
 /obj/structure/rack,
-/obj/item/storage/box/ammo/a12g_rubbershot{
-	pixel_x = -4;
-	pixel_y = 9
-	},
 /obj/item/storage/box/ammo/a12g_buckshot{
 	pixel_y = 2;
 	pixel_x = 4

_maps/shuttles/nanotrasen/nanotrasen_heron.dmm

@@ -13080,7 +13080,7 @@
 /obj/item/storage/box/ammo/c9mm,
 /obj/item/storage/box/ammo/c9mm,
 /obj/item/storage/box/ammo/c9mm,
-/obj/item/storage/box/ammo/c9mm/ap,
+/obj/item/storage/box/ammo/c9mm_ap,
 /obj/item/stock_parts/cell/gun{
 	pixel_x = -3;
 	pixel_y = -5