Morb0 fd12440582 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/Species/slime.yml # Resources/Textures/Interface/Actions/meta.json # Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png # Resources/Textures/Interface/Alerts/human_alive.rsi/meta.json # Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing.png # Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png # Resources/Textures/Structures/Piping/disposal.rsi/meta.json		2024-01-03 13:37:55 +03:00
..
barricades.rsi	Ports /vg/station barricade sprites & slightly buffs them (#19840)	2023-09-16 05:50:48 -07:00
cargo_telepad.rsi	Telepad revival (#16664)	2023-05-21 20:09:31 +10:00
catwalk.rsi	Respriting the codebase (#4820)	2021-10-15 11:58:40 +02:00
conveyor.rsi	Respriting the codebase (#4820)	2021-10-15 11:58:40 +02:00
conveyor_old.rsi	Respriting the codebase (#4820)	2021-10-15 11:58:40 +02:00
Decoration	Automatic holiday sprites (#22929)	2023-12-24 23:52:43 -07:00
dispensers.rsi	Improves bartending with some tweaks. (#14169)	2023-02-18 19:00:31 -06:00
Doors	[Resprite] Centcom airlock (#1695)	2023-12-29 16:46:01 +03:00
Furniture	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00
Holo	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
Hydroponics	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
Lighting/LightPosts/small_light_post.rsi	Added light post sprites (#14533)	2023-03-23 12:12:33 -04:00
Machines	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-03 13:37:55 +03:00
Magic	Simple Magic Spellbook System (#7823)	2022-05-29 16:29:10 +10:00
meat_spike.rsi	[Resprite] Kitchen (#473)	2022-10-18 20:07:05 -07:00
monitors.rsi	[QOL] Removed unnecessary delays in some old texture meta.json files (#15378)	2023-04-16 23:50:37 -06:00
Piping	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-03 13:37:55 +03:00
plastic_flaps.rsi	Add buildable plastic flaps (#6583)	2022-02-21 22:01:58 -07:00
Power	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-02 23:07:58 +03:00
Shuttles	Fix the remaining invalid RSIs (#13113)	2022-12-20 11:49:18 -06:00
smalldispensers.rsi	Improves bartending with some tweaks. (#14169)	2023-02-18 19:00:31 -06:00
Specific	Anomaly Cores (#21306)	2023-10-31 19:20:52 -04:00
stairs.rsi	[Resprite] TG Stairs (#1472)	2023-10-01 13:26:36 +03:00
Storage	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-29 16:58:52 +03:00
Wallmounts	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-03 13:37:55 +03:00
Walls	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-21 03:03:30 +03:00
Web	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
Windows	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00