Merge remote-tracking branch 'upstream/stable' into ed-25-08-2025-upstream-sync
# Conflicts: # .github/CODEOWNERS # Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs # Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Explosion/EntitySystems/TriggerSystem.cs # Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs # Content.Shared/Lock/LockSystem.cs # Content.Shared/Nutrition/Components/FoodComponent.cs # Content.Shared/Speech/ListenEvent.cs # Resources/Prototypes/Entities/Effects/admin_triggers.yml
This commit is contained in:
@@ -4,6 +4,12 @@
|
||||
name: ruminant stomach
|
||||
categories: [ HideSpawnMenu ]
|
||||
components:
|
||||
- type: Stomach
|
||||
specialDigestible:
|
||||
tags:
|
||||
- Ruminant
|
||||
- Wheat
|
||||
- BananaPeel
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
stomach:
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
- type: body
|
||||
id: MothershipCoreBody
|
||||
name: "core"
|
||||
root: torso
|
||||
slots:
|
||||
torso:
|
||||
part: TorsoBorg
|
||||
connections:
|
||||
- right2hand
|
||||
- right1hand
|
||||
- left1hand
|
||||
- left2hand
|
||||
left1hand:
|
||||
part: LeftArmBorg
|
||||
left2hand:
|
||||
part: LeftArmBorg
|
||||
right1hand:
|
||||
part: RightArmBorg
|
||||
right2hand:
|
||||
part: RightArmBorg
|
||||
Reference in New Issue
Block a user