CatStation/Resources/Textures/Interface/Misc
Arthur Asimov f8d4eea0dc Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Resources/Prototypes/Datasets/Names/Operation_suffix.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/Science/Robotics.xml
2023-12-03 15:10:26 +03:00
..
crosshair_pointers.rsi New indicators for combat mode (#15427) 2023-05-06 15:06:42 +10:00
food_icons.rsi Task/food hud (#19312) 2023-09-23 16:14:06 +03:00
health_bar.rsi Fix all broken RSI files. 2021-03-09 22:06:17 +01:00
job_icons.rsi Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-12-03 15:10:26 +03:00
pointing.rsi Swept commits JSON genocide. (#2991) 2021-01-13 23:04:38 +11:00
program_icons.rsi [Resprite] Localizations (#1361) 2023-08-24 21:54:23 +03:00
progress_bar.rsi Swept commits JSON genocide. (#2991) 2021-01-13 23:04:38 +11:00
research_disciplines.rsi Arsenal tech discipline (#17400) 2023-06-18 15:56:49 -06:00
beakerlarge.png Chem guidebook (#17123) 2023-06-04 15:45:02 -05:00
buffering_smite_icon.png Adds twenty-one new smites, moves the explosion smite to the verb category. (#8456) 2022-05-27 00:41:18 -07:00