Morb0 e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/aspid.yml # Resources/Prototypes/Maps/barratry.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/kettle.yml # Resources/Prototypes/Maps/origin.yml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json		2023-09-13 16:51:52 +03:00
..
cargo_telepad.rsi	Telepad revival (#16664)	2023-05-21 20:09:31 +10:00
catwalk.rsi
conveyor.rsi
conveyor_old.rsi
Decoration	Cobwebs (#19623)	2023-09-09 23:37:56 -04:00
dispensers.rsi	Improves bartending with some tweaks. (#14169)	2023-02-18 19:00:31 -06:00
Doors	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
Furniture	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-13 16:51:52 +03:00
Holo	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
Hydroponics
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	2023-09-13 16:51:52 +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	2023-08-06 18:52:31 +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	2023-08-29 05:58:14 +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	megafauna elimination mission and fish salv faction (#16720)	2023-05-25 22:23:20 +10:00
Storage	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-05 00:12:02 +03:00
Wallmounts	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-05 00:12:02 +03:00
Walls	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-22 08:22:56 +03:00
Web	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
Windows	[Resprite] Uranium windows (#1089)	2023-05-23 10:18:16 +03:00