Ed dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream ...

# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml

2024-05-13 18:32:59 +03:00

..

Audio

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

2024-05-13 18:32:59 +03:00

Changelog

Automatic changelog update

2024-05-13 00:04:13 +00:00

ConfigPresets

New event: Approaching unknown shuttle (#24490)

2024-05-10 04:35:59 -07:00

Credits

Update Credits (#27938)

2024-05-11 21:23:48 -04:00

Fonts

Implement basic emoji support (#24039)

2024-01-29 15:32:13 +11:00

IgnoredPrototypes

Add a way for bulk abstracting prototypes (#24140)

2024-01-16 21:39:14 -08:00

Locale

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

2024-05-13 18:32:59 +03:00

Maps

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

2024-05-13 18:32:59 +03:00

Prototypes

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

2024-05-13 18:32:59 +03:00

ServerInfo

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

2024-05-13 18:32:59 +03:00

Textures

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

2024-05-13 18:32:59 +03:00

clientCommandPerms.yml

Allow players to run saveconfig command. (#25200)

2024-02-14 11:03:27 +11:00

engineCommandPerms.yml

Tippy, the helpful hint clown! (#26767)

2024-04-28 21:38:16 -07:00

keybinds.yml

Emotes Menu (#26702)

2024-04-28 21:38:23 -07:00

manifest.yml

Деревянная стена, стул, стол, удаление всех рецептов крафтов на G (#6)

2024-03-30 14:52:16 +03:00

map_attributions.txt

Add map Oasis (#25736)

2024-04-20 23:59:12 -06:00

mapping_actions.yml

Fix SCRAM implant not working while cuffed. Incidentally fix freedom implant working while dead/crit (#25978)

2024-03-18 23:35:46 +01:00

migration.yml

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-08-05-2024-upstream

2024-05-08 12:26:05 +03:00

toolshedEngineCommandPerms.yml

Fix missing toolshed command perms and tests (#19470)

2023-08-24 02:21:47 -07:00