Morb0 611bfea5ff Merge remote-tracking branch 'upstream/master' into update-sposnors ... # Conflicts: # .github/workflows/publish.yml # Content.Packaging/ContentPackaging.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Resources/Audio/Weapons/Guns/Gunshots/license.txt # Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png		2023-11-08 03:00:51 +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 'upstream/master' into update-sposnors	2023-11-08 03:00:51 +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