Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
# Conflicts: # Content.Client/Parallax/ParallaxControl.cs # Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs # Content.Server/Labels/Label/LabelSystem.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Fluids/Components/EvaporationComponent.cs # Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs # README.md # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/Pools/deathmatch.yml # Resources/Prototypes/Maps/arenas.yml
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
tags:
|
||||
- ClothMade
|
||||
- Paper
|
||||
- Pill
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
stomach:
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
ents: []
|
||||
- type: StaticPrice
|
||||
price: 20
|
||||
- type: Gibbable
|
||||
- type: Tag
|
||||
tags:
|
||||
- Trash
|
||||
@@ -37,7 +36,7 @@
|
||||
id: HeadSkeleton
|
||||
name: "skull"
|
||||
description: Alas poor Yorick...
|
||||
parent: PartSkeleton
|
||||
parent: [ PartSkeleton, BaseMob ]
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Mobs/Species/Skeleton/parts.rsi
|
||||
@@ -47,10 +46,12 @@
|
||||
state: "skull_icon"
|
||||
- type: BodyPart
|
||||
partType: Head
|
||||
- type: BlockMovement
|
||||
- type: Input
|
||||
context: "human"
|
||||
- type: Speech
|
||||
speechVerb: Skeleton
|
||||
speechSounds: Alto
|
||||
- type: SkeletonAccent
|
||||
- type: Actions
|
||||
- type: Vocal
|
||||
|
||||
Reference in New Issue
Block a user