Merge branch 'master' into drywall

shiptest-ss13 · Aug 26, 2024 · 0618d7e · 0618d7e
2 parents c918fa1 + 3a1f702
commit 0618d7e
Show file tree

Hide file tree

Showing 354 changed files with 14,707 additions and 3,142 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -393,7 +393,7 @@
 	pixel_x = 9;
 	pixel_y = -1
 	},
-/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
+/obj/item/gun/ballistic/automatic/assault/cm82{
 	pixel_y = 7;
 	pixel_x = -9
 	},

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -213,7 +213,7 @@
 /turf/open/floor/plating,
 /area/ruin)
 "ii" = (
-/obj/item/ammo_box/aac_300blk_stripper,
+/obj/item/ammo_box/a762_stripper,
 /turf/open/floor/wood,
 /area/ruin)
 "iK" = (
@@ -1066,7 +1066,7 @@
 /turf/open/floor/wood,
 /area/ruin)
 "Ok" = (
-/turf/open/acid/whitesands,
+/turf/open/water/acid/whitesands,
 /area/overmap_encounter/planetoid/sand/explored)
 "Ov" = (
 /obj/item/clothing/head/cowboy{
@@ -1184,8 +1184,8 @@
 /area/ruin)
 "Tl" = (
 /obj/structure/table,
-/obj/item/ammo_box/aac_300blk_stripper,
-/obj/item/ammo_box/aac_300blk_stripper,
+/obj/item/ammo_box/a762_stripper,
+/obj/item/ammo_box/a762_stripper,
 /turf/open/floor/concrete,
 /area/ruin)
 "TH" = (

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
@@ -1398,7 +1398,7 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/engineering{
-	name = "Mech Lab";
+	name = "Exosuit Lab";
 	dir = 4
 	},
 /obj/machinery/door/firedoor/border_only{
@@ -2577,7 +2577,7 @@
 /area/ruin/wasteplanet/abandoned_mechbay/mechlab)
 "DY" = (
 /obj/machinery/door/airlock/engineering{
-	name = "Mech Lab";
+	name = "Exosuit Lab";
 	dir = 4
 	},
 /obj/effect/decal/cleanable/glass,
@@ -2723,7 +2723,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_animal/hostile/human/syndicate/melee{
-	name = "Syndicate Mech Pilot"
+	name = "Syndicate Exosuit Pilot"
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ruin/wasteplanet/abandoned_mechbay/crewquarters)
@@ -2771,7 +2771,7 @@
 "Hj" = (
 /obj/machinery/light/dim/directional/south,
 /mob/living/simple_animal/hostile/human/syndicate/melee{
-	name = "Syndicate Mech Pilot"
+	name = "Syndicate Exosuit Pilot"
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ruin/wasteplanet/abandoned_mechbay/bay2)
@@ -3016,7 +3016,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/directional/south,
 /mob/living/simple_animal/hostile/human/syndicate/melee{
-	name = "Syndicate Mech Pilot"
+	name = "Syndicate Exosuit Pilot"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/wasteplanet/abandoned_mechbay/bay1)

diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Mark.II Dwayne-class Long Range Mining Transport",
-	"prefix": "ISV",
+	"prefix": "SV",
 	"namelists": [
 		"GENERAL",
 		"SPACE",
@@ -10,11 +10,12 @@
 	],
 	"map_short_name": "Mk.II Dwayne-class ",
 	"map_path": "_maps/shuttles/independent/independent_dwayne.dmm",
-	"description": "The Dwayne is one of the older classes of ships commonly seen on the Frontier, and one of the few such classes that doesn’t also carry a reputation for nightmarish conditions or high accident rates. Originally conceived of as a “mothership” for Nanotrasen mining shuttles that could enable long-duration mining missions at minimal cost, severe budget overruns and issues with the mining shuttle docking system left Nanotrasen with a massive number of mostly-completed hulls upon the project’s cancellation. These hulls were then quickly refurbished and sold on the civilian market, where they proved an immediate success on the Frontier. Contemporary Dwaynes can typically be found carrying a variety of mining equipment and extensive modifications unique to their captains. Recently-available aftermarket modifications have solved the Dwayne’s longstanding shuttle dock issues, allowing modern Dwaynes to finally serve their original design purpose, provided the captain is able to source a shuttle.",
+	"description": "The Dwayne is one of the older classes of ships commonly seen on the Frontier, and one of the few such classes that doesn’t also carry a reputation for nightmarish conditions or high accident rates. Originally conceived of as a “mothership” for Nanotrasen mining shuttles that could enable long-duration mining missions at minimal cost, severe budget overruns and issues with the mining shuttle docking system left Nanotrasen with a massive number of mostly-completed hulls upon the project’s cancellation. These hulls were then quickly refurbished and sold on the civilian market, where they proved an immediate success on the Frontier. Contemporary Dwaynes can typically be found carrying a variety of mining equipment and extensive modifications unique to their captains.",
 	"tags": [
 		"Mining",
-		"Generalist"
+		"Cargo"
 	],
+	"starting_funds": 4000,
 	"limit": 1,
 	"job_slots": {
 		"Captain": {
@@ -24,23 +25,20 @@
 		},
 		"Foreman": {
 			"outfit": "/datum/outfit/job/independent/quartermaster/western",
-			"slots": 1
-		},
-		"Ship's Doctor": {
-			"outfit": "/datum/outfit/job/independent/doctor",
-			"slots": 1
-		},
-		"Ship's Engineer": {
-			"outfit": "/datum/outfit/job/independent/engineer",
+			"officer": true,
 			"slots": 1
 		},
 		"Asteroid Miner": {
 			"outfit": "/datum/outfit/job/independent/miner/hazard",
 			"slots": 2
 		},
+		"Mechanic": {
+			"outfit": "/datum/outfit/job/independent/engineer",
+			"slots": 1
+		},
 		"Deckhand": {
 			"outfit": "/datum/outfit/job/independent/assistant",
-			"slots": 3
+			"slots": 1
 		}
 	},
 	"enabled": true

diff --git a/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json
@@ -8,7 +8,7 @@
 		"NATURAL"
 	],
 	"map_short_name": "Riggs-class",
-	"description": "The Riggs-class is Kasagi-Fischer Partnership’s mainstay in the independent ship market. Spacious, affordable, and versatile, the Riggs offers basic capabilities for everything a Frontier spacer might need in a convenient, easy-to-modify platform, and by default come equipped with a basic medbay, a small security office, atmospherics recycling and equipment to support an APLU utility mech. Thanks to this versatility, the Riggs has become extremely popular among moderately-wealthy independent captains, and can be found doing everything from mining to shipping to surveying Frontier planets.",
+	"description": "The Riggs-class is Kasagi-Fischer Partnership’s mainstay in the independent ship market. Spacious, affordable, and versatile, the Riggs offers basic capabilities for everything a Frontier spacer might need in a convenient, easy-to-modify platform, and by default come equipped with a basic medbay, a small security office, atmospherics recycling and equipment to support an APLU utility exosuit. Thanks to this versatility, the Riggs has become extremely popular among moderately-wealthy independent captains, and can be found doing everything from mining to shipping to surveying Frontier planets.",
 	"tags": [
 		"Mining",
 		"Medical",

diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json
@@ -40,9 +40,13 @@
 			"outfit": "/datum/outfit/job/inteq/security",
 			"slots": 1
 		},
+		"Corpsman": {
+			"outfit": "/datum/outfit/job/inteq/paramedic",
+			"slots": 1
+		},
 		"Recruit": {
 			"outfit": "/datum/outfit/job/inteq/assistant",
-			"slots": 4
+			"slots": 4 
 		}
 	},
 	"enabled": true

diff --git a/_maps/configs/nanotrasen_heron.json b/_maps/configs/nanotrasen_heron.json
@@ -45,7 +45,7 @@
 			"outfit": "/datum/outfit/job/nanotrasen/security/ert/engi",
 			"slots": 1
 		},
-		"Mech Pilot":{
+		"Exosuit Pilot":{
 			"outfit": "/datum/outfit/job/nanotrasen/security/mech_pilot",
 			"slots": 1
 		},

diff --git a/_maps/configs/pgf_crying_sun.json b/_maps/configs/pgf_crying_sun.json
@@ -21,7 +21,7 @@
 			"officer": true,
 			"slots": 1
 		},
-		"Bridge Crew": {
+		"Helmsman": {
 			"outfit": "/datum/outfit/job/gezena/assistant/bridge",
 			"slots": 1
 		},
@@ -37,7 +37,7 @@
 			"outfit": "/datum/outfit/job/gezena/assistant",
 			"slots": 2
 		},
-		"Marine Sergeant": {
+		"Marine Lieutenant": {
 			"outfit": "/datum/outfit/job/gezena/hos",
 			"slots": 1
 		},

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -1084,11 +1084,11 @@
 /area/centcom/control)
 "apm" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
 	pixel_x = 1;
 	pixel_y = 4
 	},
-/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
 	pixel_x = -4;
 	pixel_y = -2
 	},

diff --git a/_maps/outpost/hangar/nt_ice_20x20.dmm b/_maps/outpost/hangar/nt_ice_20x20.dmm
@@ -837,7 +837,7 @@
 /obj/effect/turf_decal/siding/white/corner{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/binary/pressure_valve,
+/obj/machinery/atmospherics/components/binary/volume_pump,
 /turf/open/floor/plasteel/patterned/brushed{
 	light_color = "#1B1D2E";
 	light_range = 2;

diff --git a/_maps/outpost/hangar/nt_ice_40x20.dmm b/_maps/outpost/hangar/nt_ice_40x20.dmm
@@ -305,7 +305,7 @@
 /obj/effect/turf_decal/siding/white/corner{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/binary/pressure_valve,
+/obj/machinery/atmospherics/components/binary/volume_pump,
 /turf/open/floor/plasteel/patterned/brushed{
 	light_color = "#1B1D2E";
 	light_range = 2;

diff --git a/_maps/outpost/hangar/nt_ice_40x40.dmm b/_maps/outpost/hangar/nt_ice_40x40.dmm
@@ -1398,7 +1398,7 @@
 /obj/effect/turf_decal/siding/white/corner{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/binary/pressure_valve,
+/obj/machinery/atmospherics/components/binary/volume_pump,
 /turf/open/floor/plasteel/patterned/brushed{
 	light_color = "#1B1D2E";
 	light_range = 2;

diff --git a/_maps/outpost/hangar/nt_ice_56x20.dmm b/_maps/outpost/hangar/nt_ice_56x20.dmm
@@ -322,20 +322,6 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"hD" = (
-/obj/effect/turf_decal/siding/white{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/binary/volume_pump{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/shutoff,
-/obj/structure/railing{
-	dir = 1;
-	layer = 2.8
-	},
-/turf/open/floor/plasteel/tech,
-/area/hangar)
 "if" = (
 /obj/machinery/door/airlock/outpost,
 /obj/machinery/atmospherics/pipe/simple/yellow/hidden,
@@ -934,7 +920,7 @@
 /obj/effect/turf_decal/siding/white/corner{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/binary/pressure_valve,
+/obj/machinery/atmospherics/components/binary/volume_pump,
 /turf/open/floor/plasteel/patterned/brushed{
 	light_color = "#1B1D2E";
 	light_range = 2;
@@ -3996,7 +3982,7 @@ Hr
 ag
 yh
 nD
-hD
+TK
 AZ
 Vu
 OZ

diff --git a/_maps/outpost/hangar/nt_ice_56x40.dmm b/_maps/outpost/hangar/nt_ice_56x40.dmm
@@ -443,7 +443,7 @@
 /obj/effect/turf_decal/siding/white/corner{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/binary/pressure_valve,
+/obj/machinery/atmospherics/components/binary/volume_pump,
 /turf/open/floor/plasteel/patterned/brushed{
 	light_color = "#1B1D2E";
 	light_range = 2;
@@ -1185,20 +1185,6 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"Eo" = (
-/obj/effect/turf_decal/siding/white{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/binary/volume_pump{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/shutoff,
-/obj/structure/railing{
-	dir = 1;
-	layer = 2.8
-	},
-/turf/open/floor/plasteel/tech,
-/area/hangar)
 "Eu" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/pipe/simple/orange/hidden,
@@ -5258,7 +5244,7 @@ tj
 aH
 Zj
 qN
-Eo
+AW
 pa
 Od
 aK