Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml
This commit is contained in:
Ed
2025-05-27 12:21:14 +03:00
1165 changed files with 76878 additions and 44718 deletions

View File

@@ -27,14 +27,7 @@
specialDigestible:
tags:
- Trash
- Fruit
- ReptilianFood
- Meat
- Pill
- Crayon
- Paper
- VoxFood
- Vegetable
isSpecialDigestibleExclusive: false
- type: entity
parent: OrganHumanLiver

View File

@@ -94,3 +94,28 @@
- ReagentId: Blood
Quantity: 20
- type: entity
parent: PartAnimal
id: LeftHandSmartCorgi
name: corgi hand
categories: [ HideSpawnMenu ]
components:
- type: Sprite
layers:
- state: l_hand
- type: BodyPart
partType: Hand
symmetry: Left
- type: entity
parent: PartAnimal
id: RightHandSmartCorgi
name: corgi hand
categories: [ HideSpawnMenu ]
components:
- type: Sprite
layers:
- state: r_hand
- type: BodyPart
partType: Hand
symmetry: Right

View File

@@ -0,0 +1,28 @@
- type: body
id: SmartCorgi
name: corgi
root: torso
slots:
torso:
part: TorsoAnimal
connections:
- righthand
- lefthand
- legs
organs:
brain: OrganHumanBrain # feels strange but it is what it is
lungs: OrganAnimalLungs
stomach: OrganAnimalStomach
liver: OrganAnimalLiver
heart: OrganAnimalHeart
kidneys: OrganAnimalKidneys
lefthand:
part: LeftHandSmartCorgi
righthand:
part: RightHandSmartCorgi
legs:
part: LegsAnimal
connections:
- feet
feet:
part: FeetAnimal