Ed a899122d1b Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Recipes/Lathes/electronics.yml
#	Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png
#	Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png
#	Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png

2024-04-21 20:54:50 +03:00

..

Audio

Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up

2024-04-21 20:54:50 +03:00

Changelog

Automatic changelog update

2024-04-21 16:10:32 +00:00

ConfigPresets

Enable worldgen on WD (#23861)

2024-01-10 04:45:00 -07:00

Credits

Update Credits (#27192)

2024-04-21 04:13:08 +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

Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up

2024-04-21 20:54:50 +03:00

Maps

Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up

2024-04-21 20:54:50 +03:00

Prototypes

Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up

2024-04-21 20:54:50 +03:00

ServerInfo

SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)

2024-04-21 12:09:26 -04:00

Textures

Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up

2024-04-21 20:54:50 +03:00

clientCommandPerms.yml

Allow players to run saveconfig command. (#25200)

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

engineCommandPerms.yml

Add PVS command permissions (#26124)

2024-03-15 14:32:30 +11:00

keybinds.yml

biggest gridinv update OF ALL TIME (#25834)

2024-03-28 17:31:47 +11: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

SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)

2024-04-21 12:09:26 -04:00

toolshedEngineCommandPerms.yml

Fix missing toolshed command perms and tests (#19470)

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