fish-station/Content.Shared/PDA
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 Predict and cleanup RingerComponent (#35907) 2025-04-19 15:55:05 +02:00
PdaComponent.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-04 06:17:03 +03:00
PdaMessagesUi.cs convert News read tab to PDA Cartridge (#18368) 2023-07-28 13:59:03 -06:00
PdaUpdateState.cs Отображение времени к прибытию эвак шаттла в КПК (#22) 2024-06-05 14:34:36 +03:00
PdaVisuals.cs Add Chameleon PDA (#30514) 2025-01-02 19:23:28 +01:00
SharedPdaSystem.cs Merge remote-tracking branch 'space-wizards/master' 2025-04-20 02:52:59 +03:00
SharedRingerSystem.cs cleanup RingerSystem (#36731) 2025-04-19 19:11:08 +02:00