rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/PDA
History
Vigers Ray e2aab392db Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Server/PDA/PdaSystem.cs
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Science/scientist.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/borg_types.yml
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png
2025-04-20 02:52:59 +03:00
..
Ringer cleanup RingerSystem (#36731) 2025-04-19 19:11:08 +02:00
PdaBorderColorComponent.cs Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
PdaBoundUserInterface.cs General storage fixes (#34845) 2025-02-17 19:24:34 +11:00
PdaMenu.xaml upstream 2024-09-16 12:40:23 +03:00
PdaMenu.xaml.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-04 06:17:03 +03:00
PdaNavigationButton.xaml Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
PdaNavigationButton.xaml.cs Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
PdaProgramItem.xaml Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
PdaProgramItem.xaml.cs Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
PdaSettingsButton.xaml Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
PdaSettingsButton.xaml.cs Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
PdaSystem.cs Add Chameleon PDA (#30514) 2025-01-02 19:23:28 +01:00
PdaVisualizerSystem.cs Add Chameleon PDA (#30514) 2025-01-02 19:23:28 +01:00
PdaVisualsComponent.cs Add Chameleon PDA (#30514) 2025-01-02 19:23:28 +01:00
PdaWindow.xaml add localization for pda footer text (#21749) 2023-11-21 20:06:43 -05:00
PdaWindow.xaml.cs Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00