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
This commit is contained in:
Ed
2024-11-06 16:53:24 +03:00
207 changed files with 2180 additions and 1314 deletions

View File

@@ -6576,7 +6576,7 @@ entities:
- uid: 2031
components:
- type: Transform
pos: 3.6114278,-10.732791
pos: 4.0109396,-12.223828
parent: 104
- uid: 2095
components:
@@ -10993,6 +10993,13 @@ entities:
- type: Transform
pos: 11.5,-6.5
parent: 104
- proto: HandLabeler
entities:
- uid: 1826
components:
- type: Transform
pos: 3.4542694,-10.616036
parent: 104
- proto: KitchenKnife
entities:
- uid: 1061