Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream
# Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Content.Client/Clothing/ClientClothingSystem.cs # Content.Client/Hands/Systems/HandsSystem.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Shared/Hands/Components/HandsComponent.cs # Content.Shared/Inventory/InventoryComponent.cs # Content.Shared/Storage/StorageComponent.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Entities/Mobs/Player/human.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/oasis.yml # Resources/Prototypes/Maps/packed.yml # Resources/Prototypes/Maps/saltern.yml
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
- type: body
|
||||
id: Aghost
|
||||
name: "aGhost"
|
||||
name: "aghost"
|
||||
root: torso
|
||||
slots:
|
||||
torso:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
- type: body
|
||||
id: Arachnid
|
||||
name: "Arachnid"
|
||||
name: "arachnid"
|
||||
root: torso
|
||||
slots:
|
||||
head:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
- type: body
|
||||
id: Moth
|
||||
name: "Moth"
|
||||
name: "moth"
|
||||
root: torso
|
||||
slots:
|
||||
head:
|
||||
|
||||
Reference in New Issue
Block a user