Ed 5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml

2024-09-08 21:20:54 +03:00

..

Actions

Action stuff (#31305)

2024-08-25 22:43:31 +10:00

Admin

Fix baby jail (#29896)

2024-07-11 15:14:01 +10:00

Alerts

Remove calls to FormattedMessage obsolete methods (#31706)

2024-09-01 13:00:53 +02: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

Currency collect goal (#352)

2024-07-24 13:28:27 +03:00

Chat

Remove calls to FormattedMessage obsolete methods (#31706)

2024-09-01 13:00:53 +02: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

JobRequirement refactor (#30347)

2024-08-05 14:25:49 +10:00

Guidebook

Make guidebook remember where you left off (#31375)

2024-08-27 01:06:54 +02: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 inventory GUI for non-inventory entities (#31306)

2024-08-22 13:05:17 -04: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

Station AI overlay (#31335)

2024-08-22 23:13:47 -06: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

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