Upstream 2026-04-04-2239Z

_maps/RandomRuins/BeachRuins/beach_bunkers.dmm

@@ -1465,7 +1465,7 @@
 	dir = 1;
 	pixel_y = -21;
 	pixel_x = 10;
-	id = "bunk2";
+	id = "bunk_2";
 	name = "shutter control"
 	},
 /turf/open/floor/concrete/slab_1,
@@ -3282,7 +3282,7 @@
 	dir = 4;
 	pixel_y = -10;
 	pixel_x = -23;
-	id = "bunk2";
+	id = "bunk_2";
 	name = "shutter control"
 	},
 /turf/open/floor/plating/asteroid/dirt/beach,

_maps/RandomRuins/IceRuins/icemoon_downed_transport.dmm

@@ -182,10 +182,6 @@
 	icon_state = "monotile_light"
 	},
 /area/ruin/unpowered/icemoon/downed_transport/crew_accomodations)
-"bG" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input,
-/turf/open/floor/plating/asteroid/snow/lit,
-/area/overmap_encounter/planetoid/ice/explored)
 "bH" = (
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/box,
@@ -2633,11 +2629,15 @@
 /turf/open/floor/plating/asteroid/icerock/lit,
 /area/overmap_encounter/planetoid/ice/explored)
 "tW" = (
-/obj/item/stack/medical/gauze,
 /obj/item/stock_parts/cell/gun/pgf/empty{
 	pixel_y = -6;
 	pixel_x = 6
 	},
+/obj/item/stock_parts/cell/gun/pgf/empty{
+	pixel_y = -8;
+	pixel_x = -8
+	},
+/obj/item/stack/medical/gauze,
 /turf/open/floor/plating/asteroid/icerock,
 /area/overmap_encounter/planetoid/cave/explored)
 "ua" = (
@@ -5329,8 +5329,9 @@
 	pixel_x = 27
 	},
 /obj/effect/mob_spawn/human/corpse/pgf/skeleton_marine,
-/obj/item/gun/energy/kalix/pgf/medium/empty_cell{
-	pixel_y = -11
+/obj/item/gun/energy/kalix/pgf/pdw/empty_cell{
+	pixel_x = -8;
+	pixel_y = -10
 	},
 /turf/open/floor/plating/asteroid/icerock,
 /area/overmap_encounter/planetoid/cave/explored)
@@ -6904,7 +6905,7 @@ yu
 yu
 yu
 yu
-bG
+yu
 yu
 yu
 yu

_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm

@@ -2365,7 +2365,7 @@
 	pixel_x = -7;
 	pixel_y = 4
 	},
-/obj/item/trash/cheesie{
+/obj/item/trash/gummycarps{
 	pixel_y = 4
 	},
 /obj/effect/turf_decal/siding/thinplating/dark{

_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm

@@ -175,7 +175,7 @@
 	pixel_y = -5
 	},
 /obj/item/trash/popcorn,
-/obj/item/trash/cheesie,
+/obj/item/trash/gummycarps,
 /obj/item/trash/chips,
 /obj/item/trash/pistachios{
 	pixel_x = 6

_maps/RandomRuins/RockRuins/rockplanet_river_valley_stash.dmm

@@ -716,7 +716,7 @@
 	},
 /obj/structure/table/reinforced,
 /obj/item/trash/candy,
-/obj/item/trash/cheesie,
+/obj/item/trash/gummycarps,
 /obj/item/trash/chips,
 /obj/item/trash/pistachios,
 /obj/item/trash/popcorn,

_maps/RandomRuins/RockRuins/rockplanet_somme.dmm

@@ -5840,7 +5840,7 @@
 /area/ruin/rockplanet/somme/trench)
 "CO" = (
 /obj/structure/table,
-/obj/item/trash/cheesie,
+/obj/item/trash/gummycarps,
 /turf/open/floor/hangar/plasteel/dark,
 /area/ruin/rockplanet/somme/hallway)
 "CR" = (

_maps/RandomRuins/SandRuins/whitesands_settlement_raid.dmm

@@ -4049,23 +4049,23 @@
 /area/ruin/whitesands/settlement/shuttle_three)
 "ts" = (
 /obj/structure/rack,
-/obj/item/food/sosjerky/healthy{
+/obj/item/food/homemade_jerky{
 	pixel_x = 11;
 	pixel_y = 6
 	},
-/obj/item/food/sosjerky/healthy{
+/obj/item/food/homemade_jerky{
 	pixel_x = 2;
 	pixel_y = 6
 	},
-/obj/item/food/sosjerky/healthy{
+/obj/item/food/homemade_jerky{
 	pixel_x = 10;
 	pixel_y = -6
 	},
-/obj/item/food/sosjerky/healthy{
+/obj/item/food/homemade_jerky{
 	pixel_x = 1;
 	pixel_y = -6
 	},
-/obj/item/food/sosjerky/healthy{
+/obj/item/food/homemade_jerky{
 	pixel_x = -7;
 	pixel_y = -6
 	},
@@ -4109,19 +4109,19 @@
 /area/ruin/whitesands/settlement/greenhouse)
 "tK" = (
 /obj/structure/rack,
-/obj/item/food/sosjerky/healthy{
+/obj/item/food/homemade_jerky{
 	pixel_x = 3;
 	pixel_y = -5
 	},
-/obj/item/food/sosjerky/healthy{
+/obj/item/food/homemade_jerky{
 	pixel_x = -6;
 	pixel_y = -5
 	},
-/obj/item/food/sosjerky/healthy{
+/obj/item/food/homemade_jerky{
 	pixel_x = 9;
 	pixel_y = 7
 	},
-/obj/item/food/sosjerky/healthy{
+/obj/item/food/homemade_jerky{
 	pixel_x = -6;
 	pixel_y = 7
 	},
@@ -5425,11 +5425,11 @@
 /area/ruin/whitesands/settlement/fortress)
 "Au" = (
 /obj/structure/table/reinforced,
-/obj/item/food/sosjerky/healthy{
+/obj/item/food/homemade_jerky{
 	pixel_x = -1;
 	pixel_y = 1
 	},
-/obj/item/food/sosjerky/healthy{
+/obj/item/food/homemade_jerky{
 	pixel_x = -15;
 	pixel_y = 9
 	},

_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm

@@ -1390,7 +1390,7 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/whitesands/pubbycrash)
 "Eb" = (
-/obj/item/trash/cheesie{
+/obj/item/trash/gummycarps{
 	pixel_x = 5;
 	pixel_y = 6
 	},
@@ -1907,7 +1907,7 @@
 	pixel_y = 5
 	},
 /obj/item/trash/energybar,
-/obj/item/trash/cheesie,
+/obj/item/trash/gummycarps,
 /obj/item/trash/can/food,
 /obj/item/trash/sosjerky{
 	pixel_x = 5

_maps/RandomRuins/SpaceRuins/scrapstation.dmm

@@ -128,7 +128,7 @@
 	pixel_x = -5
 	},
 /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/trash/cheesie{
+/obj/item/trash/gummycarps{
 	pixel_x = -5;
 	pixel_y = -10
 	},

_maps/configs/minutemen_cetus.json

@@ -0,0 +1,60 @@
+	{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"map_name": "Cetus-class Interceptor",
+	"prefix": "CMSV",
+	"manufacturer": "Lanchester Shipyards",
+	"namelists": ["GENERAL", "CLIP MINUTEMEN", "NATURAL_AGGRESSIVE"],
+	"description": "Like many Minuteman ships, the Cetus-class is a modernized and purpose-built successor to a generation of informally-modified civilian freighters during the First Frontiersman War. Inspired by the then-common practice of replacing external cargo containers with boarding shuttles (and CLIP-CMM's need for a uniform replacement), Lanchester Shipyards engineers designed the Cetus around an open central cavity that allows the specially-designed Mira-class pursuit shuttle to dock safely with much simpler and less expensive engineering than an internal, pressurized hangar. Since entering service in 485 FSC, the Cetus-class has become a staple of CLIP-CMM patrols throughout CLIP-controlled volumes, with a respected service record spanning two major regional conflicts- barring a few early accidents that necessitated the deployment of dedicated pilots to Cetus crews.",
+	"tags": [
+		"Combat",
+		"Specialist"
+	],
+	"map_short_name": "Cetus-class",
+	"tranist_x_offset": -5,
+	"faction": "/datum/faction/clip",
+	"starting_funds": 3000,
+	"map_path": "_maps/shuttles/minutemen/minutemen_cetus.dmm",
+	"limit": 1,
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/clip/minutemen/captain",
+			"officer": true,
+			"slots": 1
+		},
+		"Sergeant": {
+			"outfit": "/datum/outfit/job/clip/minutemen/grunt/lead",
+			"officer": true,
+			"slots": 1
+		},
+		"Shuttle Pilot": {
+			"outfit": "/datum/outfit/job/clip/minutemen/vehicle_pilot",
+			"officer": true,
+			"slots": 1
+		},
+		"Combat Medic": {
+			"outfit": "/datum/outfit/job/clip/minutemen/grunt/medic",
+			"slots": 1
+		},
+		"Minuteman": {
+			"outfit": "/datum/outfit/job/clip/minutemen/grunt",
+			"slots": 2
+		},
+		"Reservist": {
+			"outfit": "/datum/outfit/job/clip/minutemen/grunt/reserve",
+			"slots": 1
+		},
+		"Engineer": {
+			"outfit": "/datum/outfit/job/clip/minutemen/engineer",
+			"slots": 1
+		},
+		"Crewman": {
+		"outfit": "/datum/outfit/job/clip/assistant",
+		"slots": 1
+		},
+		"Military Correspondent": {
+			"outfit": "/datum/outfit/job/clip/correspondent",
+			"slots": 1
+		}
+	},
+	"enabled": true
+}

_maps/configs/minutemen_arke.json → _maps/configs/minutemen_gliese.json

@@ -1,23 +1,23 @@
 	{
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
-	"map_name": "Arke-class Surveying Ship",
+	"map_name": "Gliese-class Surveying Ship",
 	"prefix": "CLSV",
 	"manufacturer": "Lanchester Shipyards",
 	"namelists": [
 		"GENERAL",
 		"CLIP MINUTEMEN",
 		"NATURAL"
 	],
-	"description": "The Arke-class is a relatively new appearance in the Frontier, continuing it's use as a planet surveying ship for CLIP-LAND's colony development. The Arke is lightly equipped and crewed, specializing in gathering data to relay to allied ships in the sector. Despite it's size, it boasts a telecommunications array for sharing data and communication with other ships. Descending from the Proteus-class, designed for low-cost manufacturing and modularity, the Arke is deployed into the frontier with a specific goal, but remains able to adapt with it's relatively spaceful cargo bay.",
+	"description": "The Gliese-class is a relatively new appearance in the Frontier, continuing it's use as a planet surveying ship for CLIP-LAND's colony development. The Gliese is lightly equipped and crewed, specializing in gathering data to relay to allied ships in the sector. Despite it's size, it boasts a telecommunications array for sharing data and communication with other ships. Descending from the Sculptor-class, designed for low-cost manufacturing and modularity, the Gliese is deployed into the frontier with a specific goal, but remains able to adapt with it's relatively spaceful cargo bay.",
 	"tags": [
 		"Telecomms",
 		"Specialist"
 	],
-	"map_short_name": "Arke-class",
+	"map_short_name": "Gliese-class",
 	"tranist_x_offset": -15,
 	"tranist_y_offset": -20,
 	"faction": "/datum/faction/clip",
-	"map_path": "_maps/shuttles/minutemen/minutemen_arke.dmm",
+	"map_path": "_maps/shuttles/minutemen/minutemen_gliese.dmm",
 	"limit": 1,
 	"job_slots": {
 		"Captain": {