From fb767b4070c4ad20b56e0d6c9948dd6ce4fda81a Mon Sep 17 00:00:00 2001 From: Jessica Harvey Date: Sat, 6 Jun 2026 16:54:15 -0700 Subject: [PATCH 1/7] Fix salvage magnet asteroids not spawning in ore. --- .../UI/SalvageMagnetBoundUserInterface.cs | 1 - .../Procedural/Magnet/asteroid_ore_gens.yml | 20 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs index a9370138898..7d90785eea7 100644 --- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs @@ -85,7 +85,6 @@ public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface { case AsteroidOffering asteroid: option.Title = Loc.GetString($"dungeon-config-proto-{asteroid.Id}"); - break; // DeltaV: Skip ores since they aren't used with custom generation var layerKeys = asteroid.MarkerLayers.Keys.ToList(); layerKeys.Sort(); diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml b/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml index de70e2d5ecd..3283c25a946 100644 --- a/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml +++ b/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml @@ -14,7 +14,7 @@ - type: oreDunGen id: OreIron - replacement: AsteroidRock + replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. entity: AsteroidRockTin count: 5 minGroupSize: 5 @@ -22,7 +22,7 @@ - type: oreDunGen id: OreQuartz - replacement: AsteroidRock + replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. entity: AsteroidRockQuartz count: 5 minGroupSize: 5 @@ -30,7 +30,7 @@ - type: oreDunGen id: OreCoal - replacement: AsteroidRock + replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. entity: AsteroidRockCoal count: 3 minGroupSize: 5 @@ -38,7 +38,7 @@ - type: oreDunGen id: OreSalt - replacement: AsteroidRock + replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. entity: AsteroidRockSalt count: 3 minGroupSize: 5 @@ -46,7 +46,7 @@ - type: oreDunGen id: OreGold - replacement: AsteroidRock + replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. entity: AsteroidRockGold count: 4 minGroupSize: 5 @@ -54,7 +54,7 @@ - type: oreDunGen id: OreSilver - replacement: AsteroidRock + replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. entity: AsteroidRockSilver count: 4 minGroupSize: 5 @@ -62,7 +62,7 @@ - type: oreDunGen id: OrePlasma - replacement: AsteroidRock + replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. entity: AsteroidRockPlasma count: 4 minGroupSize: 5 @@ -70,7 +70,7 @@ - type: oreDunGen id: OreUranium - replacement: AsteroidRock + replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. entity: AsteroidRockUranium count: 4 minGroupSize: 5 @@ -78,7 +78,7 @@ - type: oreDunGen id: OreBananium - replacement: AsteroidRock + replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. entity: AsteroidRockBananium count: 6 minGroupSize: 3 @@ -86,7 +86,7 @@ - type: oreDunGen id: OreArtifactFragment - replacement: AsteroidRock + replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. entity: AsteroidRockArtifactFragment count: 5 minGroupSize: 1 From 9e0fa8ef359a257065c39feb31c57be6058fbf19 Mon Sep 17 00:00:00 2001 From: Jessica Harvey Date: Tue, 7 Jul 2026 21:38:27 -0700 Subject: [PATCH 2/7] Rebalance redrock down to about 65% ore yield --- Resources/Prototypes/Procedural/vgroid.yml | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Resources/Prototypes/Procedural/vgroid.yml b/Resources/Prototypes/Procedural/vgroid.yml index 59fa846e550..4a072353051 100644 --- a/Resources/Prototypes/Procedural/vgroid.yml +++ b/Resources/Prototypes/Procedural/vgroid.yml @@ -32,63 +32,63 @@ - !type:OreDunGen replacement: IronRock entity: IronRockIron - count: 50 - minGroupSize: 10 - maxGroupSize: 15 + count: 35 #DeltaV - Was 50 + minGroupSize: 6 #DeltaV - Was 10 + maxGroupSize: 11 #DeltaV - Was 15 - !type:OreDunGen replacement: IronRock entity: IronRockCoal - count: 50 - minGroupSize: 8 - maxGroupSize: 12 + count: 30 #DeltaV - Was 50 + minGroupSize: 6 #DeltaV - Was 8 + maxGroupSize: 10 #DeltaV - Was 12 - !type:OreDunGen replacement: IronRock entity: IronRockQuartz - count: 50 - minGroupSize: 10 - maxGroupSize: 15 + count: 35 #DeltaV - Was 50 + minGroupSize: 6 #DeltaV - Was 10 + maxGroupSize: 11 #DeltaV - Was 15 - !type:OreDunGen replacement: IronRock entity: IronRockSalt - count: 25 - minGroupSize: 8 - maxGroupSize: 12 + count: 25 #DeltaV - Was 50 + minGroupSize: 6 #DeltaV - Was 8 + maxGroupSize: 8 #DeltaV - Was 12 - !type:OreDunGen replacement: IronRock entity: IronRockGold - count: 40 - minGroupSize: 8 - maxGroupSize: 12 + count: 32 #DeltaV - Was 40 + minGroupSize: 5 #DeltaV - Was 8 + maxGroupSize: 9 #DeltaV - Was 12 - !type:OreDunGen replacement: IronRock entity: IronRockSilver - count: 40 - minGroupSize: 8 - maxGroupSize: 12 + count: 32 #DeltaV - Was 40 + minGroupSize: 5 #DeltaV - Was 8 + maxGroupSize: 9 #DeltaV - Was 12 - !type:OreDunGen replacement: IronRock entity: IronRockPlasma - count: 35 + count: 27 #DeltaV - Was 35 minGroupSize: 4 maxGroupSize: 8 - !type:OreDunGen replacement: IronRock entity: IronRockUranium - count: 35 + count: 27 #DeltaV - Was 35 minGroupSize: 4 maxGroupSize: 8 - !type:OreDunGen replacement: IronRock entity: IronRockArtifactFragment - count: 25 + count: 15 #DeltaV - Was 25 minGroupSize: 1 maxGroupSize: 3 - !type:OreDunGen replacement: IronRock entity: IronRockDiamond - count: 15 - minGroupSize: 1 - maxGroupSize: 2 + count: 16 + minGroupSize: 2 #DeltaV - Was 1 + maxGroupSize: 3 #DeltaV - Was 2 - !type:OreDunGen # DeltaV replacement: IronRock entity: IronRockBluespace From d8f0e1a118d03b04f8c2b0b4e2b7afc4b778ebe3 Mon Sep 17 00:00:00 2001 From: Jessica Harvey Date: Tue, 7 Jul 2026 21:39:49 -0700 Subject: [PATCH 3/7] Add ore scanner compatible rocks that match DV asteroid rock graphics --- .../Procedural/Magnet/asteroid_ore_gens.yml | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml b/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml index 3283c25a946..f97864be085 100644 --- a/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml +++ b/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml @@ -3,8 +3,8 @@ weights: OreIron: 1.0 OreQuartz: 1.0 - OreCoal: 0.58 # DeltaV: was 0.33, added 0.25 from salt - #OreSalt: 0.25 # DeltaV: removed salt, added weight to coal + OreCoal: 0.33 + OreSalt: 0.25 OreGold: 0.25 OreSilver: 0.25 OrePlasma: 0.20 @@ -14,81 +14,81 @@ - type: oreDunGen id: OreIron - replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. - entity: AsteroidRockTin - count: 5 + replacement: AsteroidAltRock #DeltaV - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. + entity: AsteroidAltRockTin #DeltaV - was AsteroidRockTin + count: 7 #DeltaV - Was 5 minGroupSize: 5 maxGroupSize: 7 - type: oreDunGen id: OreQuartz - replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. - entity: AsteroidRockQuartz - count: 5 + replacement: AsteroidAltRock #DeltaV - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. + entity: AsteroidAltRockQuartz #DeltaV - was AsteroidRockQuartz + count: 7 #DeltaV - Was 5 minGroupSize: 5 maxGroupSize: 7 - type: oreDunGen id: OreCoal - replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. - entity: AsteroidRockCoal - count: 3 + replacement: AsteroidAltRock #DeltaV - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. + entity: AsteroidAltRockCoal #DeltaV - was AsteroidRockCoal + count: 4 #DeltaV - Was 3 minGroupSize: 5 maxGroupSize: 7 - type: oreDunGen id: OreSalt - replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. - entity: AsteroidRockSalt - count: 3 + replacement: AsteroidAltRock #DeltaV - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. + entity: AsteroidAltRockSalt #DeltaV - was AsteroidRockSalt + count: 4 #DeltaV - Was 3 minGroupSize: 5 maxGroupSize: 7 - type: oreDunGen id: OreGold - replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. - entity: AsteroidRockGold - count: 4 + replacement: AsteroidAltRock #DeltaV - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. + entity: AsteroidAltRockGold #DeltaV - was AsteroidRockGold + count: 6 #DeltaV - Was 4 minGroupSize: 5 maxGroupSize: 7 - type: oreDunGen id: OreSilver - replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. - entity: AsteroidRockSilver - count: 4 + replacement: AsteroidAltRock #DeltaV - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. + entity: AsteroidAltRockSilver #DeltaV - was AsteroidRockSilver + count: 6 #DeltaV - Was 4 minGroupSize: 5 maxGroupSize: 7 - type: oreDunGen id: OrePlasma - replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. - entity: AsteroidRockPlasma - count: 4 + replacement: AsteroidAltRock #DeltaV - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. + entity: AsteroidAltRockPlasma #DeltaV - was AsteroidRockPlasma + count: 6 #DeltaV - Was 4 minGroupSize: 5 maxGroupSize: 7 - type: oreDunGen id: OreUranium - replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. - entity: AsteroidRockUranium - count: 4 + replacement: AsteroidAltRock #DeltaV - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. + entity: AsteroidAltRockUranium #DeltaV - was AsteroidRockUranium + count: 6 #DeltaV - Was 4 minGroupSize: 5 maxGroupSize: 7 - type: oreDunGen id: OreBananium - replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. - entity: AsteroidRockBananium - count: 6 + replacement: AsteroidAltRock #DeltaV - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. + entity: AsteroidAltRockBananium #DeltaV - was AsteroidRockBananium + count: 4 #DeltaV - Was 6 minGroupSize: 3 maxGroupSize: 6 - type: oreDunGen id: OreArtifactFragment - replacement: AsteroidAltRock #Delta V - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. - entity: AsteroidRockArtifactFragment - count: 5 + replacement: AsteroidAltRock #DeltaV - Changed from AsteroidRock to AsteroidAltRock to work with our Mining Rock Spawner. + entity: AsteroidRockArtifactFragment #DeltaV - was AsteroidRockArtifactFragment + count: 7 #DeltaV - Was 6 minGroupSize: 1 maxGroupSize: 2 From 8cf67e7667dc8e9ccd13bd2cca7430f3ac644d02 Mon Sep 17 00:00:00 2001 From: Jessica Harvey Date: Wed, 8 Jul 2026 03:23:02 -0700 Subject: [PATCH 4/7] Magnet overhaul --- Content.Client/Salvage/UI/OfferingWindow.xaml | 63 +- .../Salvage/UI/OfferingWindow.xaml.cs | 7 +- .../UI/SalvageMagnetBoundUserInterface.cs | 97 +- .../_DV/Salvage/UI/MagnetOfferingWindow.xaml | 2 + .../Salvage/UI/MagnetOfferingWindow.xaml.cs | 62 + .../UI/MagnetOfferingWindowReleaseButton.xaml | 8 + .../MagnetOfferingWindowReleaseButton.xaml.cs | 89 + .../Procedural/DungeonSystem.Rooms.cs | 8 +- .../Salvage/Magnet/SalvageMagnetComponent.cs | 2 +- .../Magnet/SalvageMagnetDataComponent.cs | 9 +- .../Salvage/SalvageSystem.Magnet.cs | 40 +- Content.Server/Salvage/SalvageSystem.cs | 1 + .../Salvage/SalvageSystem.MagnetRelease.cs | 45 + .../Procedural/DungeonRoomPrototype.cs | 8 + .../Salvage/Magnet/AsteroidOffering.cs | 2 - .../Salvage/Magnet/DebrisOffering.cs | 6 +- .../Salvage/Magnet/ISalvageMagnetOffering.cs | 5 +- .../SalvageMagnetBoundUserInterfaceState.cs | 2 + .../Salvage/Magnet/SalvageOffering.cs | 2 - .../Salvage/SharedSalvageSystem.Magnet.cs | 74 +- .../_DV/Salvage/Magnet/MagnetReleaseEvent.cs | 9 + .../en-US/_DV/salvage/salvage-magnet.ftl | 19 + .../DV-asteroid-large-01-asteroidwreck.yml | 2644 +++++++ .../DV-asteroid-large-02-asteroidwreck.yml | 2599 +++++++ .../DV-asteroid-large-03-asteroidwreck.yml | 3516 +++++++++ ...-asteroid-mining-chemlab-asteroidwreck.yml | 4303 +++++++++++ .../DV-atlas-atmos-asteroidwreck.yml | 4612 ++++++++++++ ...DV-atlas-conference-room-asteroidwreck.yml | 4445 ++++++++++++ .../DV-atlas-jailcells-asteroidwreck.yml | 3272 +++++++++ .../DV-atlas-perma-asteroidwreck.yml | 2254 ++++++ .../DV-atlas-salvage-asteroidwreck.yml | 1747 +++++ .../DV-bone-cave-asteroidwreck.yml | 562 ++ .../DV-crystal-cave-asteroidwreck.yml | 667 ++ .../DV-engineering-chunk-asteroidwreck.yml | 6253 ++++++++++++++++ .../DV-hauling-shuttle-asteroidwreck.yml | 1854 +++++ ...large-asteroid-mining-01-asteroidwreck.yml | 1691 +++++ .../DV-meatball-asteroidwreck.yml | 1988 +++++ ...V-med-asteroid-mining-01-asteroidwreck.yml | 1167 +++ .../DV-med-chunk-01-asteroidwreck.yml | 2807 +++++++ .../DV-med-crashed-shuttle-asteroidwreck.yml | 1532 ++++ .../DV-med-dock-asteroidwreck.yml | 933 +++ .../DV-med-library-asteroidwreck.yml | 1553 ++++ .../DV-med-pet-hospital-asteroidwreck.yml | 2501 +++++++ .../DV-med-vault-01-asteroidwreck.yml | 1804 +++++ .../DV-medium-01-asteroidwreck.yml | 1930 +++++ .../DV-mining-outpost-01-asteroidwreck.yml | 2104 ++++++ .../DV-outpost-arm-debriswreck.yml | 1860 +++++ .../DV-syndi-hideout-asteroidwreck.yml | 1776 +++++ .../DV-tick-colony-asteroidwreck.yml | 918 +++ .../DV-tick-nest-asteroidwreck.yml | 774 ++ .../DV-vegan-meatball-asteroidwreck.yml | 1921 +++++ .../DV-wh-salvage-asteroidwreck.yml | 3070 ++++++++ .../DV-animalfarm-debriswreck.yml | 1213 ++++ .../DV-atlas-atmos-debriswreck.yml | 4089 +++++++++++ .../DV-atlas-cargo-debriswreck.yml | 3606 +++++++++ .../DV-atlas-conference-room-debriswreck.yml | 3878 ++++++++++ .../DV-atlas-dorms-debriswreck.yml | 2541 +++++++ .../DebrisWrecks/DV-atlas-epi-debriswreck.yml | 3757 ++++++++++ .../DV-atlas-jailcells-debriswreck.yml | 2815 ++++++++ .../DV-atlas-medical-debriswreck.yml | 3793 ++++++++++ .../DV-atlas-perma-debriswreck.yml | 1796 +++++ .../DV-atlas-salvage-debriswreck.yml | 1372 ++++ .../DebrisWrecks/DV-cargo-01-debriswreck.yml | 1191 +++ .../DV-hauling-shuttle-debriswreck.yml | 1388 ++++ .../DV-large-engineer-chunk-debriswreck.yml | 3556 +++++++++ .../DV-laundromat-chunk-debriswreck.yml | 6418 +++++++++++++++++ .../DV-med-chunk-01-debriswreck.yml | 2419 +++++++ .../DV-med-pirate-debriswreck.yml | 971 +++ ...d-ruined-emergency-shuttle-debriswreck.yml | 981 +++ .../DV-med-service-chunk-01-debriswreck.yml | 2916 ++++++++ .../DV-med-silent-orchestra-debriswreck.yml | 1155 +++ .../DV-med-vault-01-debriswreck.yml | 1516 ++++ .../DebrisWrecks/DV-medium-01-debriswreck.yml | 1555 ++++ .../DV-mining-outpost-01-debriswreck.yml | 1830 +++++ .../DV-outpost-arm-debriswreck.yml | 1872 +++++ .../DV-research-outpost-01-debriswreck.yml | 4888 +++++++++++++ .../DV-ruin-cargo-salvage-debriswreck.yml | 4414 ++++++++++++ .../DV-security-chunk-debriswreck.yml | 1957 +++++ .../DV-solar-farm-debriswreck.yml | 1537 ++++ .../DV-stationstation-debriswreck.yml | 4464 ++++++++++++ .../Spawners/Random/Salvage/tables_loot.yml | 44 +- .../Prototypes/Procedural/Magnet/asteroid.yml | 79 +- .../Procedural/Magnet/space_debris.yml | 81 +- .../Magnet/space_debris_templates.yml | 160 +- .../Procedural/biome_ore_templates.yml | 20 +- .../Random/Salvage/arcana_spawners.yml | 49 + .../Entities/Structures/Walls/mountain.yml | 173 +- .../Magnet/asteroid_wreck_templates.yml | 337 + .../Magnet/debris_wreck_templates.yml | 298 + Resources/Prototypes/tags.yml | 3 + 90 files changed, 144577 insertions(+), 172 deletions(-) create mode 100644 Content.Client/_DV/Salvage/UI/MagnetOfferingWindow.xaml create mode 100644 Content.Client/_DV/Salvage/UI/MagnetOfferingWindow.xaml.cs create mode 100644 Content.Client/_DV/Salvage/UI/MagnetOfferingWindowReleaseButton.xaml create mode 100644 Content.Client/_DV/Salvage/UI/MagnetOfferingWindowReleaseButton.xaml.cs create mode 100644 Content.Server/_DV/Salvage/SalvageSystem.MagnetRelease.cs create mode 100644 Content.Shared/_DV/Salvage/Magnet/MagnetReleaseEvent.cs create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-asteroid-large-01-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-asteroid-large-02-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-asteroid-large-03-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-asteroid-mining-chemlab-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-atlas-atmos-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-atlas-conference-room-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-atlas-jailcells-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-atlas-perma-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-atlas-salvage-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-bone-cave-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-crystal-cave-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-engineering-chunk-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-hauling-shuttle-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-large-asteroid-mining-01-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-meatball-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-med-asteroid-mining-01-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-med-chunk-01-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-med-crashed-shuttle-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-med-dock-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-med-library-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-med-pet-hospital-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-med-vault-01-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-medium-01-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-mining-outpost-01-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-outpost-arm-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-syndi-hideout-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-tick-colony-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-tick-nest-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-vegan-meatball-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/AsteroidWrecks/DV-wh-salvage-asteroidwreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-animalfarm-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-atlas-atmos-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-atlas-cargo-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-atlas-conference-room-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-atlas-dorms-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-atlas-epi-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-atlas-jailcells-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-atlas-medical-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-atlas-perma-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-atlas-salvage-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-cargo-01-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-hauling-shuttle-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-large-engineer-chunk-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-laundromat-chunk-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-med-chunk-01-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-med-pirate-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-med-ruined-emergency-shuttle-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-med-service-chunk-01-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-med-silent-orchestra-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-med-vault-01-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-medium-01-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-mining-outpost-01-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-outpost-arm-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-research-outpost-01-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-ruin-cargo-salvage-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-security-chunk-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-solar-farm-debriswreck.yml create mode 100644 Resources/Maps/_DV/Salvage/DebrisWrecks/DV-stationstation-debriswreck.yml create mode 100644 Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/Salvage/arcana_spawners.yml create mode 100644 Resources/Prototypes/_DV/Procedural/Magnet/asteroid_wreck_templates.yml create mode 100644 Resources/Prototypes/_DV/Procedural/Magnet/debris_wreck_templates.yml diff --git a/Content.Client/Salvage/UI/OfferingWindow.xaml b/Content.Client/Salvage/UI/OfferingWindow.xaml index 63b41aa652a..361194cfe5f 100644 --- a/Content.Client/Salvage/UI/OfferingWindow.xaml +++ b/Content.Client/Salvage/UI/OfferingWindow.xaml @@ -2,35 +2,44 @@ xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" MinSize="800 360"> - -