]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fff3fe2) | patch
Loadouts redux (#25715)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Tue, 16 Apr 2024 12:57:43 +0000 (22:57 +1000)
committerGitHub <noreply@github.com>
Tue, 16 Apr 2024 12:57:43 +0000 (22:57 +1000)
commit12766fe6e37bb600a53693cfa5392892bc100685
tree7243dc128d341d1355312288fb1fe8cf73526fe9tree | snapshot
parentfff3fe2a2461dfc61333b1875f8c5b7a9537c9e0commit | diff
Loadouts redux (#25715)

* Loadouts redux

* Loadout window mockup

* More workout

* rent

* validation

* Developments

* bcs

* More cleanup

* Rebuild working

* Fix model and loading

* obsession

* efcore

* We got a stew goin

* Cleanup

* Optional + SeniorEngineering fix

* Fixes

* Update science.yml

* add

add

* Automatic naming

* Update nukeops

* Coming together

* Right now

* stargate

* rejig the UI

* weh

* Loadouts tweaks

* Merge conflicts + ordering fix

* yerba mate

* chocolat

* More updates

* Add multi-selection support

* test

h

* fikss

* a

* add tech assistant and hazard suit

* huh

* Latest changes

* add medical loadouts

* and science

* finish security loadouts

* cargo

* service done

* added wildcards

* add command

* Move restrictions

* Finalising

* Fix existing work

* Localise next batch

* clothing fix

* Fix storage names

* review

* the scooping room

* Test fixes

* Xamlify

* Xamlify this too

* Update Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/Jobs/Security/detective.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* ben

* Margins

---------

Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: Mr. 27 <koolthunder019@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
155 files changed:
Content.Benchmarks/SpawnEquipDeleteBenchmark.cs diff | blob | history
Content.Client/IoC/ClientContentIoC.cs diff | blob | history
Content.Client/Lobby/LobbyState.cs diff | blob | history
Content.Client/Lobby/LobbyUIController.cs [new file with mode: 0644] blob
Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs [deleted file] blob | history
Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml [new file with mode: 0644] blob
Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs [new file with mode: 0644] blob
Content.Client/Lobby/UI/LobbyGui.xaml.cs diff | blob | history
Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs diff | blob | history
Content.Client/Preferences/ClientPreferencesManager.cs diff | blob | history
Content.Client/Preferences/UI/AntagPreferenceSelector.cs [new file with mode: 0644] blob
Content.Client/Preferences/UI/CharacterSetupGui.xaml diff | blob | history
Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs diff | blob | history
Content.Client/Preferences/UI/HighlightedContainer.xaml [new file with mode: 0644] blob
Content.Client/Preferences/UI/HighlightedContainer.xaml.cs [new file with mode: 0644] blob
Content.Client/Preferences/UI/HumanoidProfileEditor.Random.cs diff | blob | history
Content.Client/Preferences/UI/HumanoidProfileEditor.xaml diff | blob | history
Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs diff | blob | history
Content.Client/Preferences/UI/JobPrioritySelector.cs [new file with mode: 0644] blob
Content.Client/Preferences/UI/LoadoutContainer.xaml [new file with mode: 0644] blob
Content.Client/Preferences/UI/LoadoutContainer.xaml.cs [new file with mode: 0644] blob
Content.Client/Preferences/UI/LoadoutGroupContainer.xaml [new file with mode: 0644] blob
Content.Client/Preferences/UI/LoadoutGroupContainer.xaml.cs [new file with mode: 0644] blob
Content.Client/Preferences/UI/LoadoutWindow.xaml [new file with mode: 0644] blob
Content.Client/Preferences/UI/LoadoutWindow.xaml.cs [new file with mode: 0644] blob
Content.Client/Preferences/UI/RequirementsSelector.cs [new file with mode: 0644] blob
Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs diff | blob | history
Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs [new file with mode: 0644] blob
Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs diff | blob | history
Content.Server.Database/Migrations/Postgres/20240301130641_ClothingRemoval.Designer.cs [new file with mode: 0644] blob
Content.Server.Database/Migrations/Postgres/20240301130641_ClothingRemoval.cs [new file with mode: 0644] blob
Content.Server.Database/Migrations/Postgres/20240403072242_Loadouts.Designer.cs [new file with mode: 0644] blob
Content.Server.Database/Migrations/Postgres/20240403072242_Loadouts.cs [new file with mode: 0644] blob
Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs diff | blob | history
Content.Server.Database/Migrations/Sqlite/20240301130602_ClothingRemoval.Designer.cs [new file with mode: 0644] blob
Content.Server.Database/Migrations/Sqlite/20240301130602_ClothingRemoval.cs [new file with mode: 0644] blob
Content.Server.Database/Migrations/Sqlite/20240403072258_Loadouts.Designer.cs [new file with mode: 0644] blob
Content.Server.Database/Migrations/Sqlite/20240403072258_Loadouts.cs [new file with mode: 0644] blob
Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs diff | blob | history
Content.Server.Database/Model.cs diff | blob | history
Content.Server/Administration/Commands/SetOutfitCommand.cs diff | blob | history
Content.Server/Database/ServerDbBase.cs diff | blob | history
Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs diff | blob | history
Content.Server/GameTicking/Rules/PiratesRuleSystem.cs diff | blob | history
Content.Server/IoC/ServerContentIoC.cs diff | blob | history
Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs diff | blob | history
Content.Server/Preferences/Managers/ServerPreferencesManager.cs diff | blob | history
Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs diff | blob | history
Content.Server/Station/Systems/StationSpawningSystem.cs diff | blob | history
Content.Shared/Clothing/LoadoutSystem.cs diff | blob | history
Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs diff | blob | history
Content.Shared/Players/PlayTimeTracking/ISharedPlaytimeManager.cs [new file with mode: 0644] blob
Content.Shared/Preferences/BackpackPreference.cs [deleted file] blob | history
Content.Shared/Preferences/ClothingPreference.cs [deleted file] blob | history
Content.Shared/Preferences/HumanoidCharacterProfile.cs diff | blob | history
Content.Shared/Preferences/ICharacterProfile.cs diff | blob | history
Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs [new file with mode: 0644] blob
Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs [new file with mode: 0644] blob
Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs [new file with mode: 0644] blob
Content.Shared/Preferences/Loadouts/Effects/LoadoutEffectGroupPrototype.cs [new file with mode: 0644] blob
Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs [new file with mode: 0644] blob
Content.Shared/Preferences/Loadouts/Loadout.cs [new file with mode: 0644] blob
Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs [new file with mode: 0644] blob
Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs [new file with mode: 0644] blob
Content.Shared/Preferences/Loadouts/RoleLoadout.cs [new file with mode: 0644] blob
Content.Shared/Preferences/Loadouts/RoleLoadoutPrototype.cs [new file with mode: 0644] blob
Content.Shared/Roles/JobRequirements.cs diff | blob | history
Content.Shared/Roles/StartingGearPrototype.cs diff | blob | history
Content.Shared/Station/SharedStationSpawningSystem.cs diff | blob | history
Resources/Locale/en-US/job/loadouts.ftl [new file with mode: 0644] blob
Resources/Locale/en-US/preferences/loadout-groups.ftl [new file with mode: 0644] blob
Resources/Locale/en-US/preferences/loadouts.ftl [new file with mode: 0644] blob
Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl diff | blob | history
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml diff | blob | history
Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Command/captain.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Security/detective.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Security/warden.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/loadout_groups.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/role_loadouts.yml [new file with mode: 0644] blob
Resources/Prototypes/Roles/Antags/pirate.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/chef.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/clown.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/mime.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/musician.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Command/captain.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Medical/chemist.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Science/research_director.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Science/scientist.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Security/detective.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Security/security_officer.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Security/warden.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/nanotrasen.yml [deleted file] blob | history
Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/syndicate.yml [deleted file] blob | history
Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml diff | blob | history
Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml diff | blob | history
Форк Space Station 14 с переводами на русский