juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream

Browse Source 
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
This commit is contained in:
Ed
2024-04-27 10:45:35 +03:00
parent 1840003e1c de85e6d518
commit 6174713383
471 changed files with 9993 additions and 9391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Resources/Prototypes/Body/Parts/vox.yml
View File

@@ -33,10 +33,10 @@
components:
- type: Sprite
sprite: Mobs/Species/Vox/parts.rsi
state: "torso_m"
state: "torso"
- type: Icon
sprite: Mobs/Species/Vox/parts.rsi
state: "torso_m"
state: "torso"
- type: BodyPart
partType: Torso
- type: Extractable
@@ -54,10 +54,10 @@
components:
- type: Sprite
sprite: Mobs/Species/Vox/parts.rsi
state: "head_m"
state: "head"
- type: Icon
sprite: Mobs/Species/Vox/parts.rsi
state: "head_m"
state: "head"
- type: BodyPart
partType: Head
vital: true