Merge branch 'master' into prison-headset

Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs

@@ -99,7 +99,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
                     break;
                 case SalvageOffering salvage:
-                    option.Title = Loc.GetString($"salvage-map-proto-{salvage.SalvageMap.ID}");
+                    option.Title = Loc.GetString($"salvage-map-size-{salvage.SalvageMap.Size}"); // DeltaV - Replace map names with sizes
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();

Content.Shared/Salvage/SalvageMapPrototype.cs

@@ -12,4 +12,9 @@ public sealed class SalvageMapPrototype : IPrototype
     /// Relative directory path to the given map, i.e. `Maps/Salvage/template.yml`
     /// </summary>
     [DataField(required: true)] public ResPath MapPath;
+
+    /// <summary>
+    /// DeltaV - Used for getting the proper name for the map
+    /// </summary>
+    [DataField] public string Size { get; } = "unknown";
 }

Resources/Changelog/DeltaVChangelog.yml

@@ -1654,3 +1654,9 @@ Entries:
         using the Normal Vision trait.
   id: 246
   time: '2024-02-15T17:27:24.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Tweak
+      message: Glimmer Drain now requires 5 Normality Crystals to craft.
+  id: 247
+  time: '2024-02-17T03:38:14.0000000+00:00'

Resources/IgnoredPrototypes/ignoredPrototypes.yml

@@ -6,3 +6,10 @@
 #
 # - /Prototypes/Guidebook
 # - /Prototypes/Catalog/uplink_catalog.yml
+
+# 2024/02/15
+- /Prototypes/Maps/salvage.yml
+# Replaced by
+# /Prototypes/Nyanotrasen/Maps/salvage.yml
+# /Prototypes/DeltaV/Maps/salvage_modified.yml
+# /Prototypes/DeltaV/Maps/salvage.yml

Resources/Locale/en-US/deltav/salvage/salvage-magnet.ftl

@@ -0,0 +1,4 @@
+salvage-map-size-unknown = Unidentified Space Debris
+salvage-map-size-small = Small Space Debris
+salvage-map-size-medium = Medium Space Debris
+salvage-map-size-large = Large Space Debris

Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml

@@ -21,10 +21,7 @@
       food:
         reagents:
         - ReagentId: Ectoplasm
-          Quantity: 5
-  - type: Bloodstream
-    bloodReagent: Ectoplasm
-    bloodMaxVolume: 20
+          Quantity: 15
   - type: PotentialPsionic
   - type: Psionic
   - type: GlimmerSource

Resources/Prototypes/DeltaV/Maps/salvage.yml

@@ -0,0 +1,40 @@
+# "Medium"-class maps - Max size square: 15x15, indicated size: 7.5
+
+- type: salvageMap
+  id: AsteroidSyndiHideout
+  mapPath: /Maps/Salvage/DeltaV/DV-syndi-hideout.yml
+  size: medium
+
+# """Large""" maps
+
+- type: salvageMap
+  id: AsteroidChemlab
+  mapPath: /Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml
+  size: large
+
+- type: salvageMap
+  id: LaundromatChunk
+  mapPath: /Maps/Salvage/DeltaV/DV-laundromat-chunk.yml
+  size: large
+
+# Asteroids
+
+- type: salvageMap
+  id: AsteroidTickNest
+  mapPath: /Maps/Salvage/DeltaV/DV-tick-nest.yml
+
+- type: salvageMap
+  id: AsteroidMiningMed1
+  mapPath: /Maps/Salvage/DeltaV/DV-large-asteroid-mining-01.yml
+
+- type: salvageMap
+  id: AsteroidMiningLarge1
+  mapPath: /Maps/Salvage/DeltaV/DV-med-asteroid-mining-01.yml
+
+- type: salvageMap
+  id: AsteroidCrystalCave
+  mapPath: /Maps/Salvage/DeltaV/DV-crystal-cave.yml
+
+- type: salvageMap
+  id: AsteroidBoneCave
+  mapPath: /Maps/Salvage/DeltaV/DV-bone-cave.yml

Resources/Prototypes/DeltaV/Maps/salvage_modified.yml

@@ -0,0 +1,100 @@
+# Override for /Prototypes/Maps/salvage.yml
+
+# "Medium"-class maps - Max size square: 15x15, indicated size: 7.5
+
+- type: salvageMap
+  id: DVOutpostArm
+  mapPath: /Maps/Salvage/DeltaV/DV-outpost-arm.yml
+  size: medium
+
+- type: salvageMap
+  id: DVMedium1
+  mapPath: /Maps/Salvage/DeltaV/DV-medium-01.yml
+  size: medium
+
+- type: salvageMap
+  id: DVMediumVault1
+  mapPath: /Maps/Salvage/DeltaV/DV-med-vault-01.yml
+  size: medium
+
+- type: salvageMap
+  id: DVMediumOrchestra
+  mapPath: /Maps/Salvage/DeltaV/DV-med-silent-orchestra.yml
+  size: medium
+
+- type: salvageMap
+  id: DVMediumLibraryWreck
+  mapPath: /Maps/Salvage/DeltaV/DV-med-library.yml
+  size: medium
+
+- type: salvageMap
+  id: DVMediumCargoWreck
+  mapPath: /Maps/Salvage/DeltaV/DV-cargo-01.yml
+  size: medium
+
+- type: salvageMap
+  id: DVMediumPirateWreck
+  mapPath: /Maps/Salvage/DeltaV/DV-med-pirate.yml
+  size: medium
+
+- type: salvageMap
+  id: DVTickColony
+  mapPath: /Maps/Salvage/DeltaV/DV-tick-colony.yml
+  size: medium
+
+- type: salvageMap
+  id: DVCargoDock
+  mapPath: /Maps/Salvage/DeltaV/DV-med-dock.yml
+  size: medium
+
+- type: salvageMap
+  id: DVSpaceWaffleHome
+  mapPath: /Maps/Salvage/DeltaV/DV-wh-salvage.yml
+  size: medium
+
+- type: salvageMap
+  id: DVMediumShuttleWreck
+  mapPath: /Maps/Salvage/DeltaV/DV-med-ruined-emergency-shuttle.yml
+  size: medium
+
+- type: salvageMap
+  id: DVmediumPetHospital
+  mapPath: /Maps/Salvage/DeltaV/DV-med-pet-hospital.yml
+  size: medium
+
+- type: salvageMap
+  id: DVMediumCrashedShuttle
+  mapPath: /Maps/Salvage/DeltaV/DV-med-crashed-shuttle.yml
+  size: medium
+
+- type: salvageMap
+  id: DVMeatball
+  mapPath: /Maps/Salvage/DeltaV/DV-meatball.yml
+  size: medium
+
+- type: salvageMap
+  id: DVMediumHaulingShuttleWreck
+  mapPath: /Maps/Salvage/DeltaV/DV-hauling-shuttle.yml
+  size: medium
+
+# """Large""" maps
+
+- type: salvageMap
+  id: DVStationStation
+  mapPath: /Maps/Salvage/DeltaV/DV-stationstation.yml
+  size: large
+
+- type: salvageMap
+  id: DVAsteroidBase
+  mapPath: /Maps/Salvage/DeltaV/DV-asteroid-base.yml
+  size: large
+
+- type: salvageMap
+  id: DVRuinCargoBase
+  mapPath: /Maps/Salvage/DeltaV/DV-ruin-cargo-salvage.yml
+  size: large
+
+- type: salvageMap
+  id: DVSecurityChunk
+  mapPath: /Maps/Salvage/DeltaV/DV-security-chunk.yml
+  size: large