diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml index 3aaaea689d..b7e7c16727 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml @@ -23,21 +23,15 @@ templateId: CP14Human displacements: shoes: - layer: - sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi - state: shoes - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi + state: shoes pants: - layer: - sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi - state: pants - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi + state: pants - type: entity parent: CP14BaseSpeciesDummy @@ -50,18 +44,12 @@ templateId: CP14Human displacements: shoes: - layer: - sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi - state: shoes - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi + state: shoes pants: - layer: - sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi - state: pants - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV \ No newline at end of file + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi + state: pants \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml index bafbd574e1..5da037c719 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml @@ -22,97 +22,62 @@ - type: Bloodstream bloodReagent: CP14Blood - type: Hands - displacements: - Hands: - layer: + handDisplacement: + sizeMaps: + 32: sprite: _CP14/Mobs/Species/Goblin/displacement.rsi state: hands - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - type: Inventory templateId: CP14Human displacements: belt: - layer: - sprite: _CP14/Mobs/Species/Goblin/displacement.rsi - state: belt - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: belt cloak: - layer: - sprite: _CP14/Mobs/Species/Goblin/displacement.rsi - state: cloak - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: cloak eyes: - layer: - sprite: _CP14/Mobs/Species/Goblin/displacement.rsi - state: eyes - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: eyes gloves: - layer: - sprite: _CP14/Mobs/Species/Goblin/displacement.rsi - state: gloves - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: gloves head: - layer: - sprite: _CP14/Mobs/Species/Goblin/displacement.rsi - state: head - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV - layer48: - sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi - state: head - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: head + 48: + sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi + state: head mask: - layer: - sprite: _CP14/Mobs/Species/Goblin/displacement.rsi - state: mask - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: mask pants: - layer: - sprite: _CP14/Mobs/Species/Goblin/displacement.rsi - state: pants - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: pants shirt: - layer: - sprite: _CP14/Mobs/Species/Goblin/displacement.rsi - state: shirt - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: shirt shoes: - layer: - sprite: _CP14/Mobs/Species/Goblin/displacement.rsi - state: shoes - copyToShaderParameters: - layerKey: dummy - parameterTexture: displacementMap - parameterUV: displacementUV + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: shoes - type: entity parent: CP14BaseSpeciesDummy diff --git a/RobustToolbox b/RobustToolbox index 2e4275a7f3..fc1cca4f48 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 2e4275a7f3b2800e7fbe1da1e1909e8e349033bf +Subproject commit fc1cca4f48f2f2d3fbf41aa42b80b4e43b1095a4