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
..
Actions	Minor dependency and variable cleanup. (#36730)	2025-04-19 18:11:34 +02:00
Admin	Remove baby jail (#34443)	2025-01-15 22:08:15 +01:00
Alerts	Remove calls to FormattedMessage obsolete methods (#31706)	2024-09-01 13:00:53 +02:00
Atmos/GasTank	Reapply "Remove some BUI boilerplate" (#30214) (#30219)	2024-07-21 14:48:13 +10:00
Bwoink	фиксы ахелпа	2025-04-12 00:52:19 +03:00
Character	Role subtypes (#35359)	2025-04-16 19:04:48 +02:00
Chat	Merge remote-tracking branch 'space-wizards/master'	2025-04-19 00:46:30 +03:00
CloseWindow	Make escape key work as expected with multiple open inventories (#35040)	2025-02-25 17:40:39 +01:00
Crafting
DamageOverlays	Changed Damage Overlay to check Burn Damage (#34535)	2025-03-03 12:11:58 +01:00
DecalPlacer	Use ECS prototype-reload events (#22613)	2023-12-23 01:13:45 +11:00
Emotes	фикс апстрима	2025-04-03 03:17:38 +03:00
EscapeMenu	Провиль и привязка через лобби.	2024-10-11 23:44:48 +03:00
Gameplay
Ghost	Merge remote-tracking branch 'space-wizards/master'	2025-03-25 11:30:01 +03:00
Guidebook	Make guidebook remember where you left off (#31375)	2024-08-27 01:06:54 +02:00
Hands	Fix for inspecting entities in hand (#33642)	2024-11-30 17:14:39 +01:00
Hotbar	Make two inventories not dance around as much when opening/closing them (#35041)	2025-04-19 10:40:49 -04:00
Info	Fixes the ShowRulesCommand and the client not syncing rules correctly (#28752)	2024-06-15 00:41:25 -04:00
Inventory	Fix inventory GUI for non-inventory entities (#31306)	2024-08-22 13:05:17 -04:00
MenuBar	фикс апстрима	2025-04-03 03:17:38 +03:00
Objectives/Controls	Wrap objective briefing text (#24244)	2024-01-19 09:25:40 +11:00
Sandbox	Sloth's subfloor vismask adventure (#35347)	2025-03-21 00:57:04 +11:00
Storage	Make two inventories not dance around as much when opening/closing them (#35041)	2025-04-19 10:40:49 -04:00
Viewport	Various UI warnings cleanup (#36169)	2025-04-10 20:47:05 +10:00
Vote
ProgressColorSystem.cs	Add a toggle for colorblind friendly progress bar colors (#25318)	2024-03-09 12:43:19 +01:00