Morb0 8ba54ec466 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Audio/ContentAudioSystem.cs # Content.Client/Options/UI/Tabs/AudioTab.xaml # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs # Resources/Prototypes/Datasets/ion_storm.yml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png		2023-12-29 16:58:52 +03:00
..
Actions/Implants/implants.rsi	Implanters and Subdermal Implants (#11840)	2022-11-20 17:49:37 +11:00
Clothing	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-29 16:58:52 +03:00
Corvax	more new year lobby arts (#1689)	2023-12-28 00:33:46 +03:00
Decals	Tiles Corvax Stylization (#1431)	2023-09-19 12:21:53 +03:00
deprecated.rsi	Adds stair entities (with new sprites,) nukes stair decals (#20279)	2023-09-18 13:17:19 -06:00
Effects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-18 01:51:30 +03:00
Fluids	Puddles & spreader refactor (#15191)	2023-04-10 15:37:03 +10:00
Interface	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00
LobbyScreens	SSXIV Title Screen (#12592)	2022-11-14 13:09:38 -06:00
Logo	Custom app icon (#717)	2023-01-10 10:37:13 -08:00
Markers	Job Spawner icons cleanup (#20872)	2023-10-09 22:05:18 -04:00
Mobs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-29 16:58:52 +03:00
Objects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-29 16:58:52 +03:00
Parallaxes	Origin Station Update 04.12.2023 (parallax gas ginat sprite) (#22135)	2023-12-04 16:05:33 -07:00
Shaders	Fix: Blindness radius when zooming (#23130)	2023-12-28 20:38:08 -05:00
Structures	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-29 16:58:52 +03:00
Template	Fixes reptilian "full" sprite + adds reptilian template to the raw sprites folder (#22112)	2023-12-08 17:29:54 -05:00
Tiles	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-10 10:43:49 +03:00