Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-08-05-2024-upstream

# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/lobbyscreens.yml
This commit is contained in:
Ed
2024-05-08 12:26:05 +03:00
585 changed files with 5719 additions and 3832 deletions

View File

@@ -0,0 +1,23 @@
- type: constructionGraph
id: SupplyBot
start: start
graph:
- node: start
edges:
- to: bot
steps:
- tag: ProximitySensor
icon:
sprite: Objects/Misc/proximity_sensor.rsi
state: icon
name: proximity sensor
- tag: BorgHead
icon:
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: borg_head
name: borg head
doAfter: 1
- material: Steel
amount: 10
- node: bot
entity: MobSupplyBot