Morb0 b704ef0d5e Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png # Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png # Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png # Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png		2024-05-09 13:28:43 +03:00
..
ControlExtensions	Filtering reagents (#18211)	2023-07-26 02:05:09 -06:00
Controls	Various item status fixes/tweaks (#27267)	2024-04-25 00:01:31 +10:00
Fragments	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
RichText	Ion law visuals (#22908)	2023-12-23 23:58:02 -07:00
Screens	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
Systems	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-09 13:28:43 +03:00
XamlExtensions	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
BoundKeyHelpers.cs	Use different chatbox placeholder when dependent keys unbound (#22747)	2023-12-22 11:39:29 -08:00
ButtonHelpers.cs	Add ButtonHelpers and the SetButtonDisabledRecursive helper.	2021-07-29 12:55:37 +02:00
IEntityControl.cs	Improve vv /c/enthover and add keybind (#20127)	2023-09-16 14:09:51 +10:00
StatsWindow.xaml	Cargo economy balance (#11123)	2022-09-15 11:53:17 +10:00
StatsWindow.xaml.cs	Cargo economy balance (#11123)	2022-09-15 11:53:17 +10:00
StatValuesEui.cs	Cargo economy balance (#11123)	2022-09-15 11:53:17 +10:00