Morb0 775cbf088c Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Entities/Objects/Misc/books.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json		2024-05-23 13:06:49 +03:00
..
health.yml	add health icons to the secmed hud (#27483)	2024-05-09 18:35:29 -07:00
hunger.yml	Task/fix nightvision huds (#26726)	2024-04-05 01:05:01 +02:00
job.yml	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-23 13:06:49 +03:00
security.yml	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
ssd.yml	Invert status icon side (#2023)	2024-04-08 11:24:03 +03:00