Morb0 acf1ff4ec0 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Systems/ChatSystem.cs # Resources/Prototypes/AlertLevels/alert_levels.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Datasets/Names/fortunes.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Clothing/Neck/mantles.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Recipes/Lathes/clothing.yml # Resources/Prototypes/StatusIcon/faction.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json # Resources/Textures/Clothing/Mask/joy.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png # Resources/Textures/Objects/Tools/crowbar.rsi/meta.json # Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png # Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png # Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json		2024-08-12 13:18:43 +03:00
..
Actions	Add EntityWorldTargetAction (#29819)	2024-08-08 12:47:08 +03:00
Admin	Fix baby jail (#29896)	2024-07-11 15:14:01 +10:00
Alerts	Attempt to fix random test fail by undeleted AlertControl._spriteViewEntity (#29424)	2024-06-25 11:31:38 +10:00
Atmos/GasTank	Reapply "Remove some BUI boilerplate" (#30214) (#30219)	2024-07-21 14:48:13 +10:00
Bwoink	Add option for admins to disable bwoink (#25008)	2024-02-20 23:52:03 -07:00
Character	Character menu issuer localization (#29840)	2024-07-17 08:47:50 +03:00
Chat	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-06-17 23:51:01 +03:00
CloseWindow
Crafting
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
Ghost	JobRequirement refactor (#30347)	2024-08-05 14:25:49 +10:00
Guidebook	Open the guidebook when people with less than an hour playing join the round (#28774)	2024-06-09 12:26:48 -04: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	Fixes the ShowRulesCommand and the client not syncing rules correctly (#28752)	2024-06-15 00:41:25 -04:00
Inventory	Fix showing the inventory button on entities without any inventory slots (#29728)	2024-07-06 00:25:23 +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	Fix storage UI interactions (#28291)	2024-05-26 12:11:37 +10:00
Viewport	Replace xform.WorldPosition with xformSystem method for Setting/Getting (#30029)	2024-08-06 21:02:01 +10:00
Vote
ProgressColorSystem.cs	Add a toggle for colorblind friendly progress bar colors (#25318)	2024-03-09 12:43:19 +01:00