VigersRay 31b2d24e30 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/MagicMirror/MagicMirrorComponent.cs # Resources/Prototypes/Catalog/Fills/Lockers/misc.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png # Resources/migration.yml		2024-07-31 03:54:09 +03:00
..
defib.rsi	Recolor the defibrillator (#29964)	2024-07-30 00:41:21 -04:00
firstaidkits.rsi	Fix license and copyright being swapped in firstaidkits.rsi (#4191)	2021-06-16 15:52:48 +02:00
handheldcrewmonitor.rsi	Revert "Remove handheld crew monitor (#24761)" (#25439)	2024-02-22 22:00:35 +11:00
healing_toolbox.rsi	1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467)	2023-08-30 18:06:15 -07:00
healthanalyzer.rsi	Remove the blue tint from the health analyzer (#26101)	2024-03-13 22:04:29 -04:00
hypospray.rsi	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
implanter.rsi	Added implanter sprite (#20758)	2023-10-18 13:18:54 -04:00
medical.rsi	Added Tourniquets to stop bleeds (#23198)	2024-02-09 17:57:42 -08:00
medipen.rsi	Updated (most) medipen sprites (#22789)	2023-12-20 22:30:58 -07:00
Morgue/bodybags.rsi	You can now see paper on crates (with color!) (#26834)	2024-04-14 13:39:02 +10: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
syndi_implanter.rsi	Darken syndicate implanter sprite (#23622)	2024-01-06 11:10:56 -05:00
syndihandheldcrewmonitor.rsi	Revert "Remove handheld crew monitor (#24761)" (#25439)	2024-02-22 22:00:35 +11:00
syndihypo.rsi	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00