]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Coordinates Disks & Shuttle FTL Travel (#23240)
authorSlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Mon, 1 Apr 2024 04:50:00 +0000 (06:50 +0200)
committerGitHub <noreply@github.com>
Mon, 1 Apr 2024 04:50:00 +0000 (15:50 +1100)
commitbed9e9ac6a068495ff70f09eb852a9c7a156d632
treec9e78fb03b9a75ef50177a4932be69e59c5def26
parentcc35f16839c290dc79f942d6b18c76a334e74a2c
Coordinates Disks & Shuttle FTL Travel (#23240)

* Adds the CentComm Disk and configures it to work with direct-use shuttles

* Added functionality for drone shuttles (i.e. cargo shuttle)

* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.

* Added the disk to HoP's locker

* Removed leftover logs & comments

* Fix for integration test

* Apply suggestions from code review (formatting & proper DataField)

Co-authored-by: 0x6273 <0x40@keemail.me>
* Fix integration test & changes based on code review

* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks

* Check pods & non-evac shuttles for CentCom travel, even in FTL

* Import

* Remove CentCom travel restrictions & pod disk consoles

* Major changes that changes the coordinates disk system to work with salvage expeditions

* Missed CC diskcase removal

* Fix build

* Review suggestions and changes

* Major additional changes after merge

* Minor tag miss

* Integration test fix

* review

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
24 files changed:
Content.Client/Shuttles/UI/MapScreen.xaml.cs
Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
Content.Server/Salvage/SalvageSystem.Expeditions.cs
Content.Server/Salvage/SalvageSystem.cs
Content.Server/Salvage/SpawnSalvageMissionJob.cs
Content.Server/Shuttles/Components/EscapePodComponent.cs
Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
Content.Shared/Shuttles/Components/FTLDestinationComponent.cs
Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs
Content.Shared/Shuttles/Components/ShuttleDestinationCoordinatesComponent.cs [new file with mode: 0644]
Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
Resources/Prototypes/Entities/Objects/Misc/cds.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Misc/diskcases.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
Resources/Prototypes/tags.yml
Resources/Textures/Objects/Misc/cd.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/cd.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Misc/diskcases.rsi/icon_base.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/diskcases.rsi/icon_cargo.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/diskcases.rsi/icon_cc.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/diskcases.rsi/meta.json [new file with mode: 0644]