Morbo 612d79c8fa Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Links/UILinks.cs # Content.Server/Entry/EntryPoint.cs # Content.Server/IoC/ServerContentIoC.cs # Content.Shared/CCVar/CCVars.cs # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png		2022-12-03 07:09:10 +03:00
..
EntryPoint.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-12-03 07:09:10 +03:00
IgnoredComponents.cs	genericize ui fragments (#12810)	2022-12-02 16:46:58 -06:00