diff --git a/Content.Server/Shuttles/Components/FTLComponent.cs b/Content.Server/Shuttles/Components/FTLComponent.cs index 105b9eae6d7..e8bcbb459e1 100644 --- a/Content.Server/Shuttles/Components/FTLComponent.cs +++ b/Content.Server/Shuttles/Components/FTLComponent.cs @@ -46,7 +46,7 @@ public sealed partial class FTLComponent : Component public string? PriorityTag; [ViewVariables(VVAccess.ReadWrite), DataField("soundTravel")] - public SoundSpecifier? TravelSound = new SoundPathSpecifier("/Audio/Effects/Shuttle/hyperspace_progress.ogg") + public SoundSpecifier? TravelSound = new SoundPathSpecifier("/Audio/DeltaV/Effects/Shuttle/hyperspace_progress.ogg") // DeltaV - Replace FTL sound { Params = AudioParams.Default.WithVolume(-3f).WithLoop(true) }; diff --git a/Resources/Audio/DeltaV/Effects/Shuttle/attributions.yml b/Resources/Audio/DeltaV/Effects/Shuttle/attributions.yml new file mode 100644 index 00000000000..fd622f586f5 --- /dev/null +++ b/Resources/Audio/DeltaV/Effects/Shuttle/attributions.yml @@ -0,0 +1,5 @@ +- files: + - "hyperspace_progress.ogg" + license: "CC-BY-SA-4.0" + copyright: "@Vordenburg" + source: "https://github.com/Nyanotrasen/Nyanotrasen/commit/cbd7104306bc0b03004036f91459a7fa42bc5c0f" diff --git a/Resources/Audio/DeltaV/Effects/Shuttle/hyperspace_progress.ogg b/Resources/Audio/DeltaV/Effects/Shuttle/hyperspace_progress.ogg new file mode 100644 index 00000000000..7e2112f38e3 Binary files /dev/null and b/Resources/Audio/DeltaV/Effects/Shuttle/hyperspace_progress.ogg differ diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index bf62d310f2b..8f68284f8c2 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1756,3 +1756,11 @@ Entries: message: Warden requirements now include mandatory officer time and whitelist. id: 261 time: '2024-03-02T23:00:08.0000000+00:00' +- author: DebugOk + changes: + - type: Remove + message: The salvage shuttle has been completely removed + - type: Tweak + message: Salvage specialists now start with a mini jetpack in their locker + id: 262 + time: '2024-03-06T23:27:01.0000000+00:00' diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 4a072fc90fa..c00596103db 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -17,6 +17,7 @@ - id: SeismicCharge amount: 2 - id: ClothingShoesBootsWinterMiner #Delta V: Add departmental winter boots + - id: JetpackMiniFilled # DeltaV - Salv lost their shuttle - id: OreBag prob: 0.5 - id: Flare @@ -44,6 +45,7 @@ - id: SeismicCharge amount: 2 - id: ClothingShoesBootsWinterMiner #Delta V: Add departmental winter boots + - id: JetpackMiniFilled # DeltaV - Salv lost their shuttle - id: OreBag prob: 0.5 - id: Flare diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index f4892c0279a..209d0b8cc2d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -270,7 +270,7 @@ - type: entity id: BedsheetRD parent: BedsheetBase - name: RD's bedsheet + name: Mystagogue's bedsheet # DeltaV - Epistemics Department - Replace Research Director with Mystagogue description: It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml index 9d7f26cfab8..8148f7c048d 100644 --- a/Resources/Prototypes/Entities/Stations/base.yml +++ b/Resources/Prototypes/Entities/Stations/base.yml @@ -76,9 +76,9 @@ cargo: paths: - /Maps/Shuttles/cargo_core.yml - mining: - paths: - - /Maps/Shuttles/mining.yml +# mining: +# paths: +# - /Maps/Shuttles/mining.yml ruins: hide: true nameGrid: true diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index 53d268facf4..59fcc7cca5f 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml @@ -229,8 +229,10 @@ - type: entity id: PottedPlantRD #PottedPlant25 parent: PottedPlantBase - name: "RD's potted plant" - description: "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..." + # DeltaV - Epistemics Department - Replace Research Director with Mystagogue + name: Mystagogue's potted plant + description: "A gift from the botanical staff, presented after the Mystagogue's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..." + # End of modified code components: - type: Sprite state: plant-25 diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index c6f6e6c8ca0..5a71097006d 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -330,7 +330,7 @@ - type: stealTargetGroup id: PlantRD - name: RD's potted plant + name: Mystagogue's potted plant # DeltaV - Epistemics Department - Replace Research Director with Mystagogue sprite: sprite: Structures/Furniture/potted_plants.rsi state: plant-25