Ed e216eeae20 Merge remote-tracking branch 'space-station-14/master' into ed-25-05-2024-upstream ...

# Conflicts:
#	Content.Server/Atmos/Components/FlammableComponent.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

2024-05-25 18:49:49 +03:00

..

Audio

Minecraft update (#157)

2024-05-19 00:26:52 +03:00

Changelog

Automatic changelog update

2024-05-24 14:45:49 +00:00

ConfigPresets

New event: Approaching unknown shuttle (#24490)

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

Credits

Update Credits (#28124)

2024-05-19 03:33:41 +02: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

Chromium slime (#174)

2024-05-25 17:41:29 +03:00

Maps

Merge remote-tracking branch 'space-station-14/master' into ed-25-05-2024-upstream

2024-05-25 18:49:49 +03:00

Prototypes

Merge remote-tracking branch 'space-station-14/master' into ed-25-05-2024-upstream

2024-05-25 18:49:49 +03:00

ServerInfo

Bloodgrass gatherable entity + gatherable system cleanup + bugfix (#154)

2024-05-18 15:16:20 +03:00

Textures

Chromium slime (#174)

2024-05-25 17:41:29 +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 'space-station-14/master' into ed-25-05-2024-upstream

2024-05-25 18:49:49 +03:00

toolshedEngineCommandPerms.yml

Fix missing toolshed command perms and tests (#19470)

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