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
..
Actions	Action UI fixes (#27468)	2024-04-29 18:36:18 +10:00
Admin	Fix objects tab not showing nents (#23837)	2024-01-10 01:30:20 -07:00
Alerts	Fix AlertControl throwing an error if the sprite view entity is deleted multiple times (#27690)	2024-05-05 21:38:55 -04:00
Atmos/GasTank	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
Bwoink	Add option for admins to disable bwoink (#25008)	2024-02-20 23:52:03 -07:00
Character	Wrap objective briefing text (#24244)	2024-01-19 09:25:40 +11:00
Chat	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-27 15:23:56 +03:00
CloseWindow	Add EscapeContext keybind (#15301)	2023-04-13 18:10:44 -07:00
Crafting	Fix construction button not working (#12033)	2022-10-22 10:51:03 +11:00
DamageOverlays	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05:00
DecalPlacer	Use ECS prototype-reload events (#22613)	2023-12-23 01:13:45 +11:00
Emotes	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
EscapeMenu	Add UI click sounds (#22410)	2023-12-29 15:43:36 +11:00
Gameplay	Removes IOnStateChanged calls from GameplayStateLoadController (#14617)	2023-03-12 21:02:14 -04:00
Ghost	Add ghost role raffles (#26629)	2024-05-06 18:48:16 -07:00
Guidebook	Add UI click sounds (#22410)	2023-12-29 15:43:36 +11:00
Hands	Expand UseDelay to support multiple delays per entity; fix bible healing and bag pickup (#27234)	2024-04-25 22:25:52 -04:00
Hotbar	Various item status fixes/tweaks (#27267)	2024-04-25 00:01:31 +10:00
Info	Hud refactor (#7202)	2022-10-12 10:16:23 +02:00
Inventory	Various item status fixes/tweaks (#27267)	2024-04-25 00:01:31 +10:00
MenuBar	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
Objectives/Controls	Wrap objective briefing text (#24244)	2024-01-19 09:25:40 +11:00
Sandbox	prevent opening debug menus without perms (#25091)	2024-02-10 19:00:52 +11:00
Storage	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
Viewport	Adds the option to fit the viewport to vertical screenspace (#27061)	2024-04-20 16:46:02 +10:00
Vote	Fix lobby votes (#15041)	2023-04-02 01:00:48 +11:00
ProgressColorSystem.cs	Add a toggle for colorblind friendly progress bar colors (#25318)	2024-03-09 12:43:19 +01:00