diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 0e9ea58a4a..8268113ca1 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -122,7 +122,7 @@ - type: damageModifierSet id: Skeleton coefficients: - Blunt: 2.5 + Blunt: 2.0 Slash: 1.5 Piercing: 1.2 Cold: 0.0 diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml index 9896bab23f..40bf594ed1 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml @@ -70,10 +70,6 @@ color: "#ffffff" sprite: Mobs/Species/Skeleton/parts.rsi state: head_m - - map: [ "enum.HumanoidVisualLayers.Eyes" ] - color: "#008800" - sprite: Mobs/Customization/eyes.rsi - state: eyes - map: [ "enum.HumanoidVisualLayers.RArm" ] color: "#ffffff" sprite: Mobs/Species/Skeleton/parts.rsi @@ -126,7 +122,6 @@ - map: [ "shoes" ] - map: [ "ears" ] - map: [ "outerClothing" ] - - map: [ "eyes" ] - map: [ "belt" ] - map: [ "neck" ] - map: [ "back" ] @@ -226,6 +221,7 @@ Burn: sprite: Mobs/Effects/burn_damage.rsi - type: CombatMode + canDisarm: true - type: Climbing - type: Cuffable - type: CharacterInfo @@ -278,10 +274,6 @@ color: "#b8b8b8" sprite: Mobs/Species/Skeleton/parts.rsi state: head_m - - map: [ "enum.HumanoidVisualLayers.Eyes" ] - color: "#008800" - sprite: Mobs/Customization/eyes.rsi - state: eyes - map: [ "enum.HumanoidVisualLayers.RArm" ] color: "#b8b8b8" sprite: Mobs/Species/Skeleton/parts.rsi @@ -334,18 +326,9 @@ - map: [ "shoes" ] - map: [ "ears" ] - map: [ "outerClothing" ] - - map: [ "eyes" ] - map: [ "belt" ] - map: [ "neck" ] - map: [ "back" ] - - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - state: shaved - sprite: Mobs/Customization/human_facial_hair.rsi - color: '#FFFFFF80' - - map: [ "enum.HumanoidVisualLayers.Hair" ] - state: bald - sprite: Mobs/Customization/human_hair.rsi - color: '#FFFFFF80' - map: [ "mask" ] - map: [ "head" ] - map: [ "pocket1" ] diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/full.png index e457b7018e..96ce76eb0b 100644 Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/full.png and b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/full.png differ diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_f.png index ee8bd9978b..af813d888a 100644 Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_f.png and b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_f.png differ diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_m.png index ee8bd9978b..af813d888a 100644 Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_m.png and b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_m.png differ