Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream

# Conflicts: # Resources/Changelog/Changelog.yml # Resources/Credits/GitHub.txt # Resources/Prototypes/Entities/Mobs/Player/silicon.yml
2024-11-06 16:53:24 +03:00
parent ae27cf7e08 24e6b9f42c
commit 955145a9a5
207 changed files with 2180 additions and 1314 deletions
--- a/Resources/Textures/Interface/Actions/actions_ai.rsi/job_view.png
+++ b/Resources/Textures/Interface/Actions/actions_ai.rsi/job_view.png
--- a/Resources/Textures/Interface/Actions/actions_ai.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_ai.rsi/meta.json
@@ -28,9 +28,6 @@
 		{
 			"name": "mass_scanner"
 		},
-		{
-			"name": "job_view"
-		},
 		{
 			"name": "comms_console"
 		},