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
..
Abilities	Mime Powers (Vow + Invisible Wall) (#7653)	2022-04-28 20:41:03 -07:00
battery.rsi	Borgs (#18136)	2023-08-12 16:39:58 -05:00
bleed.rsi	de-mixels the bleeding alert (#18787)	2023-08-06 19:49:27 -04:00
breathing.rsi	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
Buckle	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
ensnared.rsi	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
essence_counter.rsi	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
Fire	Alerts System and UI (#2529)	2020-11-10 15:22:19 +11:00
Handcuffed	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
human_alive.rsi	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-01-15 19:48:27 +03:00
human_critical.rsi	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-01-15 19:48:27 +03:00
human_dead.rsi	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-01-15 19:48:27 +03:00
hunger.rsi	Improve hunger and thirst warning icons (#18390)	2023-07-29 12:19:09 -07:00
internals.rsi	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
ninja_power.rsi	ninja 2 electric boogaloo (#15534)	2023-09-10 16:20:27 +10:00
pacified.rsi	Refactor PacificationSystem (#18715)	2023-08-05 16:27:12 -05:00
pressure.rsi	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
Pull	[Resprite] Localizations (#1361)	2023-08-24 21:54:23 +03:00
stamina.rsi	Stamina damage (#9230)	2022-07-06 18:06:12 +10:00
temperature.rsi	Cleaned up all produce meta.jsons (#3943)	2021-05-08 09:09:35 +00:00
thirst.rsi	Improve hunger and thirst warning icons (#18390)	2023-07-29 12:19:09 -07:00
Weightless	Alert polish and brushup (#2863)	2021-01-14 20:41:56 +11:00
piloting.png	Pilot alert and console flavortext (#4946)	2021-11-02 00:26:37 +11:00