Merge branch 'master' into ipc-surgery

shiptest-ss13 · Jan 11, 2025 · 190aca0 · 190aca0
2 parents eed1860 + f77b347
commit 190aca0
Show file tree

Hide file tree

Showing 283 changed files with 4,110 additions and 4,370 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
@@ -88,7 +88,7 @@
 	},
 /area/ruin/unpowered)
 "cW" = (
-/obj/structure/radioactive,
+/obj/structure/hazard/radioactive,
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "dG" = (
@@ -233,7 +233,7 @@
 /obj/effect/turf_decal/weather/sand{
 	dir = 1
 	},
-/obj/structure/radioactive,
+/obj/structure/hazard/radioactive,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
 "kP" = (
@@ -991,7 +991,7 @@
 /turf/open/floor/plating/asteroid/sand/dense/lit,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Sl" = (
-/obj/structure/radioactive/stack,
+/obj/structure/hazard/radioactive/stack,
 /turf/open/floor/plating/asteroid/sand/lit,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Sx" = (
@@ -1060,7 +1060,7 @@
 /turf/open/floor/plating,
 /area/ruin/unpowered)
 "TI" = (
-/obj/structure/radioactive/waste,
+/obj/structure/hazard/radioactive/waste,
 /obj/effect/decal/cleanable/greenglow,
 /turf/open/floor/plating/asteroid/sand/lit,
 /area/overmap_encounter/planetoid/beachplanet/explored)
@@ -1147,7 +1147,7 @@
 /turf/open/floor/plating/rust,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Xc" = (
-/obj/structure/radioactive,
+/obj/structure/hazard/radioactive,
 /obj/effect/decal/cleanable/greenglow,
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)

diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -2071,7 +2071,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "mr" = (
 /obj/machinery/light/directional/north,
-/obj/structure/radioactive/stack,
+/obj/structure/hazard/radioactive/stack,
 /turf/open/floor/plating/dirt/jungle,
 /area/overmap_encounter/planetoid/cave/explored)
 "mt" = (
@@ -2551,7 +2551,7 @@
 /obj/effect/turf_decal/box/corners{
 	dir = 4
 	},
-/obj/structure/radioactive/stack,
+/obj/structure/hazard/radioactive/stack,
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 4
 	},
@@ -3391,7 +3391,7 @@
 	},
 /area/overmap_encounter/planetoid/cave/explored)
 "uB" = (
-/obj/structure/radioactive{
+/obj/structure/hazard/radioactive{
 	pixel_x = 7;
 	pixel_y = 9
 	},

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm b/_maps/RandomRuins/RockRuins/rockplanet_mining_installation.dmm
@@ -273,9 +273,11 @@
 /turf/open/floor/mineral/titanium/tiled/rockplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "bx" = (
-/obj/structure/vein/classtwo,
 /obj/effect/turf_decal/box,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/vein/classtwo{
+	mining_charges = 60
+	},
 /turf/open/floor/plating/asteroid/rockplanet/wet/cracked,
 /area/ruin/rockplanet/mining_base/rig_two)
 "bC" = (
@@ -3697,7 +3699,8 @@
 /turf/open/floor/plating/asteroid/rockplanet/lit,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "tP" = (
-/obj/machinery/mineral/processing_unit,
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/railing,
 /turf/open/floor/plating,
 /area/ruin/rockplanet/mining_base/refinery)
 "tQ" = (
@@ -4091,7 +4094,6 @@
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "wz" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/structure/closet/crate,
 /turf/open/floor/plating,
 /area/ruin/rockplanet/mining_base/refinery)
 "wC" = (
@@ -5416,6 +5418,7 @@
 /obj/structure/platform/corner{
 	dir = 1
 	},
+/obj/structure/closet/crate,
 /turf/open/floor/plating,
 /area/ruin/rockplanet/mining_base/refinery)
 "CZ" = (
@@ -9303,9 +9306,6 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/effect/turf_decal/industrial/radiation{
-	dir = 1
-	},
 /turf/open/floor/concrete/slab_4,
 /area/ruin/rockplanet/mining_base/engineering)
 "Yk" = (
@@ -9619,7 +9619,9 @@
 /obj/structure/vein/classthree{
 	mining_charges = 80;
 	max_mobs = 18;
-	spawn_distance_max = 7
+	spawn_distance_max = 7;
+	ore_list = list(/obj/item/stack/ore/ice = 10);
+	vein_contents = list(/obj/item/stack/ore/ice)
 	},
 /obj/effect/turf_decal/box,
 /obj/effect/decal/cleanable/dirt,
@@ -12074,11 +12076,11 @@ at
 Eq
 xj
 ew
-MM
+tP
 wI
 wz
 xc
-tP
+xc
 xc
 xc
 hu

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
@@ -108,7 +108,6 @@
 /area/ruin/wasteplanet/abandoned_mechbay/crewquarters)
 "bU" = (
 /obj/effect/gibspawner/human,
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/disabler,
 /turf/open/floor/concrete/slab_1,
 /area/ruin/wasteplanet/abandoned_mechbay/bay2)
 "bZ" = (
@@ -884,7 +883,6 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/disabler,
 /turf/open/floor/plasteel/dark,
 /area/ruin/wasteplanet/abandoned_mechbay/bay1)
 "jj" = (
@@ -1516,7 +1514,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/wasteplanet/abandoned_mechbay/bay2)
 "ro" = (
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy,
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm
@@ -221,7 +221,7 @@
 /turf/open/floor/plastic,
 /area/ruin/wasteplanet/wasteplanet_radiation/main)
 "nN" = (
-/obj/structure/radioactive{
+/obj/structure/hazard/radioactive{
 	pixel_x = 7
 	},
 /turf/open/floor/plating,
@@ -305,10 +305,10 @@
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/ruin/wasteplanet/wasteplanet_radiation)
 "sh" = (
-/obj/structure/radioactive/stack{
+/obj/structure/hazard/radioactive/stack{
 	pixel_y = -12
 	},
-/obj/structure/radioactive{
+/obj/structure/hazard/radioactive{
 	pixel_y = 6
 	},
 /turf/open/floor/plating/rust,
@@ -807,7 +807,7 @@
 /turf/open/floor/plating,
 /area/ruin/wasteplanet/wasteplanet_radiation/main)
 "Rz" = (
-/obj/structure/radioactive/waste,
+/obj/structure/hazard/radioactive/waste,
 /obj/effect/decal/cleanable/greenglow/filled,
 /obj/effect/dummy/lighting_obj{
 	light_color = "#80B425";
@@ -835,14 +835,14 @@
 /turf/open/floor/plating,
 /area/ruin/wasteplanet/wasteplanet_radiation/main)
 "Tf" = (
-/obj/structure/radioactive{
+/obj/structure/hazard/radioactive{
 	pixel_x = -1;
 	pixel_y = 7
 	},
-/obj/structure/radioactive{
+/obj/structure/hazard/radioactive{
 	pixel_x = 8
 	},
-/obj/structure/radioactive{
+/obj/structure/hazard/radioactive{
 	pixel_x = 8;
 	pixel_y = 19
 	},
@@ -878,7 +878,7 @@
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/ruin/wasteplanet/wasteplanet_radiation)
 "Va" = (
-/obj/structure/radioactive/stack,
+/obj/structure/hazard/radioactive/stack,
 /turf/open/floor/plating/rust,
 /area/ruin/wasteplanet/wasteplanet_radiation/containment)
 "Vg" = (
@@ -895,11 +895,11 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/wasteplanet/wasteplanet_radiation/containment)
 "VA" = (
-/obj/structure/radioactive{
+/obj/structure/hazard/radioactive{
 	pixel_x = -6;
 	pixel_y = 9
 	},
-/obj/structure/radioactive{
+/obj/structure/hazard/radioactive{
 	pixel_x = 3;
 	pixel_y = 4
 	},
@@ -926,7 +926,7 @@
 /turf/open/floor/plastic,
 /area/ruin/wasteplanet/wasteplanet_radiation/main)
 "WB" = (
-/obj/structure/radioactive{
+/obj/structure/hazard/radioactive{
 	pixel_x = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,

diff --git a/_maps/configs/independent_atoll.json b/_maps/configs/independent_atoll.json
@@ -14,6 +14,7 @@
 	],
 	"faction": "/datum/faction/independent",
 	"prefix": "IMV",
+	"manufacturer": "Ihejirika Civ. Manufacturing",
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/independent/captain",

diff --git a/_maps/configs/independent_bubble.json b/_maps/configs/independent_bubble.json
@@ -14,6 +14,7 @@
 	],
 	"faction": "/datum/faction/independent",
 	"prefix": "ISV",
+	"manufacturer": "Nanotrasen Spaceworks",
 	"limit": 1,
 	"job_slots": {
 		"Captain": {

diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json
@@ -3,6 +3,7 @@
 	"map_name": "Mark.II Dwayne-class Long Range Mining Transport",
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",
+	"manufacturer": "Nanotrasen Spaceworks",
 	"namelists": [
 		"GENERAL",
 		"SPACE",

diff --git a/_maps/configs/independent_kilo.json b/_maps/configs/independent_kilo.json
@@ -7,6 +7,7 @@
 	],
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",
+	"manufacturer": "Miskilamo Spacefaring",
 	"namelists": [
 		"GENERAL",
 		"SPACE",

diff --git a/_maps/configs/independent_mudskipper.json b/_maps/configs/independent_mudskipper.json
@@ -4,6 +4,7 @@
 	"map_short_name": "Mudskipper-class",
 	"faction": "/datum/faction/independent",
 	"prefix": "ISV",
+	"manufacturer": "Miskilamo Spacefaring",
 	"description": "One of the cheapest (and yet, inexplicably popular) offerings from Miskilamo Spacefaring, the Mudskipper-class is a vessel purpose-built for enterprising scrappers and looters looking to salvage bombed-out ruins and harvest boatloads of materials. Featuring a diverse set of multipurpose rooms, a charitable supply of EVA/ruin raiding equipment, and a set of anti-radiation gear for dealing with industrial accidents, the Mudskipper-class just keeps on chuggin’!",
 	"tags": [
 		"Combat",

diff --git a/_maps/configs/independent_raleigh.json b/_maps/configs/independent_raleigh.json
@@ -3,6 +3,7 @@
 	"map_name": "Raleigh-class Corvette",
 	"faction": "/datum/faction/independent",
 	"prefix": "ISV",
+	"manufacturer": "Kasagi-Fischer Partnership",
 	"namelists": [
 		"SPACE",
 		"BEASTS",

diff --git a/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json
@@ -3,6 +3,7 @@
 	"map_name": "Riggs-class Sloop",
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",
+	"manufacturer": "Kasagi-Fischer Partnership",
 	"namelists": [
 		"GENERAL",
 		"SPACE",

diff --git a/_maps/configs/independent_scarab.json b/_maps/configs/independent_scarab.json
@@ -3,6 +3,7 @@
 	"map_name": "Scarab-class Heavy Mining Ship",
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",
+	"manufacturer": "Hardline Salvage and Mining",
 	"namelists": [
 		"GENERAL",
 		"SPACE",

diff --git a/_maps/configs/independent_shetland.json b/_maps/configs/independent_shetland.json
@@ -2,6 +2,7 @@
 	"map_name": "Shetland-class Multipurpose Frigate",
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",
+	"manufacturer": "Miskilamo Spacefaring",
 	"namelists": [
 		"GENERAL",
 		"SPACE",

diff --git a/_maps/configs/independent_sunskipper.json b/_maps/configs/independent_sunskipper.json
@@ -3,6 +3,7 @@
 	"map_name": "Sunskipper-class Culinary Vessel",
 	"faction": "/datum/faction/independent",
 	"prefix": "SV",
+	"manufacturer": "Ihejirika Civ. Manufacturing",
 	"namelists": ["CRUISE", "NATURAL"],
 	"map_short_name": "Sunskipper-class",
 	"map_path": "_maps/shuttles/independent/independent_sunskipper.dmm",

diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json
@@ -3,6 +3,7 @@
 	"map_name": "Colossus-class Armored Frigate",
 	"faction": "/datum/faction/inteq",
 	"prefix": "IRMV",
+	"manufacturer": "Hardline Salvage and Mining",
 	"description": "The mainstay of Inteq’s mercenary fleet, the Colossus is a professionally-militarized freighter like most of Inteq’s ships, and is designed to operate independently for some time, serving IRMG’s interests and providing vital mercenary services wherever they are needed. Key features include a secure and well-stocked armory and ample crew space, as well as a spacious cargo bay, which crews often refurbish into additional recreational or training space.",
 	"tags": [
 		"Combat",

diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json
@@ -3,6 +3,7 @@
 	"map_name": "Talos-class Command Clipper",
 	"faction": "/datum/faction/inteq",
 	"prefix": "IRMV",
+	"manufacturer": "Hardline Salvage and Mining",
 	"description": "The Talos is a command and support ship, and a rare example of a purpose-built Inteq ship. Outfitted with an abundance of construction and engineering equipment and a private bluespace communications suite capable of networking IRMG ships across any given system, Taloses are often the lynchpin of coordinated IRMG operations in a system, and offer construction and repair services as part of IRMG’s mercenary offerings. As Talos crews place a larger emphasis on support personnel, they tend to be less well-armed than other Inteq crews. One unusual feature of the Talos is its depressurized “wings” filled with redundant baffles, intended to provide extra durability in the case of impacts or weapons fire. They also double as auxiliary storage space and potential room for modification by their enterprising Artificer crews.",
 	"tags": [
 		"Engineer",
@@ -47,7 +48,7 @@
 		},
 		"Recruit": {
 			"outfit": "/datum/outfit/job/inteq/assistant",
-			"slots": 4 
+			"slots": 4
 		}
 	},
 	"enabled": true

diff --git a/_maps/configs/inteq_valor.json b/_maps/configs/inteq_valor.json
@@ -3,6 +3,7 @@
 	"map_name": "Valor-Class Field Care Cruiser",
 	"faction": "/datum/faction/inteq",
 	"prefix": "IRMV",
+	"manufacturer": "Hardline Salvage and Mining",
 	"description": "The Valor is the dedicated medical vessel of the Inteq fleet, suitable for treatment both for Inteq combat casualties, or paid treatment of outsiders. It's equipped with high-end medical equipment and a small ambulance for patient transport for this purpose.",
 	"tags": ["Medical", "Subshuttle"],
 	"namelists": [

diff --git a/_maps/configs/inteq_vaquero.json b/_maps/configs/inteq_vaquero.json
@@ -3,6 +3,7 @@
 	"map_name": "Vaquero-class Light Frigate",
 	"faction": "/datum/faction/inteq",
 	"prefix": "IRMV",
+	"manufacturer": "Hardline Salvage and Mining",
 	"description": "The Vaquero is a flexible and cheap military conversion of a light commercial freighter, widely used by Inteq Risk Management Group for picket, reconnaissance, and light escort duty, or for contracts that don't warrant a larger, more specialized ship. Unlike most Inteq ships, the Vaquero features basic medical, engineering, and military equipment all in one package, and its minimal crew requirements are an excellent fit for Vanguards with a smaller command and for training missions. Like its peers, it features a large cargo bay, which can be reconfigured as needed.",
 	"tags": [
 		"Generalist"

diff --git a/_maps/configs/minutemen_atlas.json b/_maps/configs/minutemen_atlas.json
@@ -2,6 +2,7 @@
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Atlas-class Light Armored Crusier",
 	"prefix": "CMSV",
+	"manufacturer": "Lanchester Shipyards",
 	"namelists": ["GENERAL", "CLIP MINUTEMEN", "NATURAL_AGGRESSIVE"],
 	"description": "The Atlas-Class is the designation for some of the oldest serving vessels in the Confederated League's military fleet. Originally the Atlantas-class, the design of the Atlantas was taken by the Colonial Militia just before the beginning of the war with the Old Frontiersmen, playing a pivotal role in multiple skirmishes. It is small in size and crew, well-rounded, and well-suited as an unexpensive hit-and-run vessel. Despite its age, the Atlas continues to serve the Confederated League for peacekeeping missions and driving off small crews of pirates from colonies.",
 	"tags": [

diff --git a/_maps/configs/nanotrasen_delta.json b/_maps/configs/nanotrasen_delta.json
@@ -3,6 +3,7 @@
 	"map_name": "Delta-class Frigate",
 	"faction": "/datum/faction/nt/ns_logi",
 	"prefix": "NSSV",
+	"manufacturer": "Nanotrasen Spaceworks",
 	"namelists": [
 		"GENERAL",
 		"SPACE",

diff --git a/_maps/configs/nanotrasen_harrier.json b/_maps/configs/nanotrasen_harrier.json
@@ -2,6 +2,7 @@
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Harrier-class Exploration Cruiser",
 	"prefix": "NTSV",
+	"manufacturer": "Nanotrasen Spaceworks",
 	"faction": "/datum/faction/nt",
 	"namelists": [
 		"NANOTRASEN",