Ed 6174713383 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream ...

# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

2024-04-27 10:45:35 +03:00

..

Audio

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream

2024-04-27 10:45:35 +03:00

Changelog

Automatic changelog update

2024-04-27 06:31:35 +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 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream

2024-04-27 10:45:35 +03:00

Maps

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream

2024-04-27 10:45:35 +03:00

Prototypes

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream

2024-04-27 10:45:35 +03:00

ServerInfo

General slime improvements (#23425)

2024-04-22 03:03:03 -07:00

Textures

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream

2024-04-27 10:45:35 +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

Added hotkey and controller to re-open end of round scoreboard (#25884)

2024-04-26 14:39:56 +02: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

monkey reinforcement teleporters can now select between kobold or monkey with a verb (#25982)

2024-04-26 15:06:43 +02:00

toolshedEngineCommandPerms.yml

Fix missing toolshed command perms and tests (#19470)

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