Morb0 8a0a435965 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json		2024-01-05 00:55:19 +03:00
..
health.yml	Add health bar overlays for eye equipment (#21980)	2024-01-04 11:48:57 -05:00
hunger.yml	Task/food hud (#19312)	2023-09-23 16:14:06 +03:00
job.yml	Change job icon preference back to left	2023-08-29 07:01:40 +03:00
ssd.yml	SSD Indicator (#19701)	2023-09-11 15:52:56 +10:00