]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 98f5f47) | patch
Salvage magnet revamp (#23119)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Thu, 4 Jan 2024 03:25:32 +0000 (14:25 +1100)
committerGitHub <noreply@github.com>
Thu, 4 Jan 2024 03:25:32 +0000 (14:25 +1100)
commitbf79acd127483d64f96dc23f2e64c74ceb84303d
tree180c83ffecf5700aed0c3733460b75baf3348018tree | snapshot
parent98f5f47355c0a536a0ff8ce4379b2db71f966b1fcommit | diff
Salvage magnet revamp (#23119)

* Generic offering window

* More work

* weh

* Parity

* Progression meter

* magnet

* rona

* PG asteroid work

* code red

* Asteroid spawnings

* clams

* a

* Marker fixes

* More fixes

* Workings of biome asteroids

* A

* Fix this loading code

* a

* Fix masking

* weh

* Fixes

* Magnet claiming

* toe

* petogue

* magnet

* Bunch of fixes

* Fix default

* Fixes

* asteroids

* Fix offerings

* Localisation and a bunch of fixes

* a

* Fixes

* Preliminary draft

* Announcement fixes

* Fixes and bump spawn rate

* Fix asteroid spawns and UI

* More fixes

* Expeditions fix

* fix

* Gravity

* Fix announcement rounding

* a

* Offset tweak

* sus

* jankass

* Fix merge
66 files changed:
Content.Client/Entry/EntryPoint.cs diff | blob | history
Content.Client/Salvage/SalvageMagnetComponent.cs [deleted file] blob | history
Content.Client/Salvage/UI/OfferingWindow.xaml [moved from Content.Client/Salvage/UI/SalvageExpeditionWindow.xaml with 60% similarity] diff | blob | history
Content.Client/Salvage/UI/OfferingWindow.xaml.cs [new file with mode: 0644] blob
Content.Client/Salvage/UI/OfferingWindowOption.xaml [new file with mode: 0644] blob
Content.Client/Salvage/UI/OfferingWindowOption.xaml.cs [new file with mode: 0644] blob
Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs diff | blob | history
Content.Client/Salvage/UI/SalvageExpeditionWindow.xaml.cs [deleted file] blob | history
Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs [new file with mode: 0644] blob
Content.IntegrationTests/Tests/SalvageTest.cs diff | blob | history
Content.Server/Parallax/BiomeSystem.cs diff | blob | history
Content.Server/Physics/Controllers/MoverController.cs diff | blob | history
Content.Server/Procedural/DungeonJob.NoiseDunGen.cs [new file with mode: 0644] blob
Content.Server/Procedural/DungeonJob.PostGen.cs diff | blob | history
Content.Server/Procedural/DungeonJob.PostGenBiome.cs [new file with mode: 0644] blob
Content.Server/Procedural/DungeonJob.PrefabDunGen.cs [moved from Content.Server/Procedural/DungeonJob.Generator.cs with 100% similarity] blob | history
Content.Server/Procedural/DungeonJob.cs diff | blob | history
Content.Server/Procedural/DungeonSystem.cs diff | blob | history
Content.Server/Salvage/FultonSystem.cs diff | blob | history
Content.Server/Salvage/Magnet/SalvageMagnetComponent.cs [new file with mode: 0644] blob
Content.Server/Salvage/Magnet/SalvageMagnetDataComponent.cs [new file with mode: 0644] blob
Content.Server/Salvage/Magnet/SalvageMagnetTargetComponent.cs [new file with mode: 0644] blob
Content.Server/Salvage/Magnet/SalvageMobRestrictionsComponent.cs [new file with mode: 0644] blob
Content.Server/Salvage/SalvageGridComponent.cs [deleted file] blob | history
Content.Server/Salvage/SalvageMagnetComponent.cs [deleted file] blob | history
Content.Server/Salvage/SalvageMapPrototype.cs [deleted file] blob | history
Content.Server/Salvage/SalvageMobRestrictionsComponent.cs [deleted file] blob | history
Content.Server/Salvage/SalvageMobRestrictionsGridComponent.cs [deleted file] blob | history
Content.Server/Salvage/SalvageMobRestrictionsSystem.cs [deleted file] blob | history
Content.Server/Salvage/SalvageRulerCommand.cs diff | blob | history
Content.Server/Salvage/SalvageSystem.Magnet.cs [new file with mode: 0644] blob
Content.Server/Salvage/SalvageSystem.cs diff | blob | history
Content.Server/Shuttles/DroneConsoleComponent.cs [moved from Content.Server/Shuttle/Components/DroneConsoleComponent.cs with 91% similarity] diff | blob | history
Content.Server/Shuttles/Systems/ShuttleConsoleSystem.Drone.cs diff | blob | history
Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs diff | blob | history
Content.Server/Shuttles/Systems/SpaceGarbageSystem.cs diff | blob | history
Content.Server/Station/Systems/StationSystem.cs diff | blob | history
Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs diff | blob | history
Content.Shared/CCVar/CCVars.cs diff | blob | history
Content.Shared/Parallax/Biomes/BiomeComponent.cs diff | blob | history
Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs diff | blob | history
Content.Shared/Procedural/Dungeon.cs diff | blob | history
Content.Shared/Procedural/DungeonGenerators/NoiseDunGen.cs [new file with mode: 0644] blob
Content.Shared/Procedural/PostGeneration/BiomeMarkerLayerPostGen.cs [new file with mode: 0644] blob
Content.Shared/Procedural/PostGeneration/BiomePostGen.cs [new file with mode: 0644] blob
Content.Shared/Salvage/Magnet/AsteroidOffering.cs [new file with mode: 0644] blob
Content.Shared/Salvage/Magnet/ISalvageMagnetOffering.cs [new file with mode: 0644] blob
Content.Shared/Salvage/Magnet/MagnetClaimOfferEvent.cs [new file with mode: 0644] blob
Content.Shared/Salvage/Magnet/SalvageMagnetBoundUserInterfaceState.cs [new file with mode: 0644] blob
Content.Shared/Salvage/Magnet/SalvageMagnetUiKey.cs [new file with mode: 0644] blob
Content.Shared/Salvage/Magnet/SalvageOffering.cs [new file with mode: 0644] blob
Content.Shared/Salvage/SalvageMapPrototype.cs [new file with mode: 0644] blob
Content.Shared/Salvage/SharedSalvageMagnetComponent.cs [deleted file] blob | history
Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs [new file with mode: 0644] blob
Content.Shared/Salvage/SharedSalvageSystem.cs diff | blob | history
Resources/Locale/en-US/procedural/expeditions.ftl diff | blob | history
Resources/Locale/en-US/salvage/salvage-magnet.ftl [new file with mode: 0644] blob
Resources/Locale/en-US/salvage/salvage-system.ftl [deleted file] blob | history
Resources/Prototypes/Entities/Stations/base.yml diff | blob | history
Resources/Prototypes/Entities/Stations/nanotrasen.yml diff | blob | history
Resources/Prototypes/Entities/Structures/Machines/salvage.yml diff | blob | history
Resources/Prototypes/Entities/Structures/Walls/asteroid.yml diff | blob | history
Resources/Prototypes/Maps/salvage.yml diff | blob | history
Resources/Prototypes/Procedural/Magnet/asteroid.yml [new file with mode: 0644] blob
Resources/Prototypes/Procedural/biome_ore_templates.yml diff | blob | history
Resources/Prototypes/Procedural/biome_templates.yml diff | blob | history
Форк Space Station 14 с переводами на русский