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
..
defib.rsi	Defibrillator (#15922)	2023-05-03 10:10:19 +10:00
firstaidkits.rsi	Fix license and copyright being swapped in firstaidkits.rsi (#4191)	2021-06-16 15:52:48 +02:00
handheldcrewmonitor.rsi	Add handheld crew monitor (#6404)	2022-02-04 14:17:16 -07:00
healing_toolbox.rsi	1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467)	2023-08-30 18:06:15 -07:00
healthanalyzer.rsi	[Sprites] guitar back and some resprites (#16611)	2023-06-15 21:55:06 +10:00
hypospray.rsi	[Resprite] Hypospray & Antique gun (#422)	2022-09-25 17:11:45 -07:00
medical.rsi	fix transparency (#19934)	2023-09-09 01:44:35 -06:00
medipen.rsi	Brute and Burn auto-injectors (#18401)	2023-08-06 12:38:25 +10:00
Morgue/bodybags.rsi	Rollerbeds (#5681)	2021-12-29 15:57:20 +11:00
mouth_swab.rsi	replace incorrectly licensed sprites (#13463)	2023-01-14 14:56:11 +11:00
Surgery	Adds more surgery tools and resprites existing (#3631)	2021-03-16 08:48:54 +01:00
syndihypo.rsi	Nuclear Operative Medic (#8274)	2022-05-22 21:32:08 +10:00