From bf009ee60a7d34004f1f05e988a589e5681f0967 Mon Sep 17 00:00:00 2001
From: EmoGarbage404 <98561806+EmoGarbage404@users.noreply.github.com>
Date: Thu, 12 May 2022 22:20:43 -0400
Subject: [PATCH] Skeleton Sprite Fix (#8126)

---
 Resources/Prototypes/Damage/modifier_sets.yml |   2 +-
 .../Entities/Mobs/Species/skeleton.yml        |  19 +-----------------
 .../Mobs/Species/Skeleton/parts.rsi/full.png  | Bin 6363 -> 979 bytes
 .../Species/Skeleton/parts.rsi/head_f.png     | Bin 793 -> 957 bytes
 .../Species/Skeleton/parts.rsi/head_m.png     | Bin 793 -> 957 bytes
 5 files changed, 2 insertions(+), 19 deletions(-)

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 e457b7018e04a86fc0ea456cf18b8324dd3436a7..96ce76eb0b6cf954d10195cc7295e732294f69f0 100644
GIT binary patch
delta 588
zcmV-S0<-<wG1CW-BNYLJX+uL$Nkc;*aB^>EX>4Tx04R~ORR?tee`>h3!~g&S3Q0sk
zR9J=WRxwY)P!Rq!?!-T!CN2z(1pa}8I_RK(frZI*sAHL6YzO0HNc;x`2N}c!7bXZA
zk`4?I0VgIPxHvr*@A;?|dar_umozO`-raZKyYF6sfBR!w(_QG;rl9AG{H1mr?c~#8
zONjS@m=0S)1;e#<f1Tv1q=81Q4ghG>>PRIG=z?GYaBNd#&eH&Zr)Lju;}M>oJpe%F
zJgo&{gS!9#_D_zme{uvj=fcWb0D!mgNGBA(35kVD`9b;)j}LHtb+fu=bZk>piv=+q
zwnVj9h}48E#FQwNG%%V>q<=FOlfAGs7986Y;(f62;<6E{e+eDi6js*4<K4aVZS8Dh
z*NCI*wK3@RrT?=j#ji0zmD9e@tDgFS!$c?sx?Vf*nHcb!%2XutSL4{G=rk*V)pwee
zng4}lL2D3E)ju)7v4sHC1fPv1t4j6yQhv(&Z|k&8m7bqY$2LXr#tHOuBpJF1NnWad
zGZw=OUS|#=e=BRD>$S0K#KVMMd>T?PH|NR(bO6ybRDEvFW%b5f2IQWX%DBj1uBnxt
zo*e@K5{bRwHCVz}_RCP+Z&ijIW6Mz84z*e<YXPM)Hyr<yjEv}wO0zbA-!e7;lB7Cz
zNqQ>*5F{~<?jr*LFmwI~{ay-yuo8>%eK<EL>7VZYDx+6@&jAs74&0W?Upn{co#ukh
a9QXj)mC<jP7Y|kd0000<MNUMnLSTZtW)Ro_

literal 6363
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

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 ee8bd9978bac14783ed867cf4ae5ebb5595a480a..af813d888ac80f26418510a790e15a69cf28bccc 100644
GIT binary patch
delta 533
zcmV+w0_y#l2E7Ncv;lwgNkl<Zc%1FpF^l3r6bJDCd52hqz!X#4SWF}N3U+qW`elY)
zzlKQ4wCU^?g8hUvsf3U+NWji?bIrx`?zYM7nPqqXKL|`f=e>E#Oz{RF`qIAne$g1?
z`tf$V^`7TL#y7^ex~^T<b*`>!cc09sk8g}|)>>z+bzRrp#$$gaaliQf8LbF?aBHoL
z<Ji@8?cz9g*4j~$Fvk3`@V_6Q_&<CSQA$B6g(OL^*=zs+P1E>H<*jKNv~3F^1f-PS
z^L!uj;VjFZgCKZXEEYH(kC@G7IGs)if&lyd{^6TZmSxYA$>d20f$Q~(x~?&uPH{e;
zvD@vu;(H}*jB$TjYX~9Gwk^^$9d#!*#<(boZtr=XzspHPL_|bHL_|bHL_|dNq5PNo
z0l@e@`ge`rx5!6tPv6DAZ;`*HJwNdYuC)g6yCW>6L=;8;{3?&o_XYcoaG!(L+AIFx
z0`!Csw{cmP$n)HHs=@L+M_HDy<}#Fb0ot~`jg?a9{}q2@&{{(&^=d9d4Za}pYqN1$
zYe*?^I2>@fT)Y$TQ4|G=qCgmiSg+S_YSDY$5b29h6a`kR6{M6X%Mw*p`Aj$1a=C<3
z3Qf}>NfK05<$Vfx6`&V}AzofyZVMmdDC&!!rYYw0Il?e}bVwp1A|fIpA|fK9&*LYf
XI9IQ-z%&gK00000NkvXXu0mjft9uJN

delta 367
zcmdnXK9g<37RLGjPZ!6KiaBp@8RoSZ2(Vt5ufhI7bX#e1q450nBrdM`$JH4x?r^=+
zFsaX^QDIBhw1bUrp4n%rYJ8A?GgZ@u;o|;p%W4B$mi^qdO6#kI|4e<Q%NBj7^JCAP
zex85$yq;3|zuns=2rvbCaVTcA{}8s@!apsQlVQWPH0`whDVK_B>zA-yWmz)i!ZzI=
zLy0!VbC#uyxBkq3_dVe4JSC&b_lav=y*Lez1(zoY&g@zg@ox6Aolm@7kieIaO<&j<
zp3lD+KTBUJIQIJVxfk>MPrTk`r~m)n>G_c^?`lfx58SG8sG276c%ksatvbR9Yg@nD
z9S`82>A$Qvz(4&!8SAZWwlQZGZ;N#Q$GclvWnbCtmu0&df4n<aaBksit5U`4HPS}U
z(t6ju4vA+f?d~yTtG%zkdZBK@`bx%UG08kVhWlj^PWmEc$9Vdty!}!Uj)x3D;OXk;
Jvd$@?2>=47sl@;Q

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 ee8bd9978bac14783ed867cf4ae5ebb5595a480a..af813d888ac80f26418510a790e15a69cf28bccc 100644
GIT binary patch
delta 533
zcmV+w0_y#l2E7Ncv;lwgNkl<Zc%1FpF^l3r6bJDCd52hqz!X#4SWF}N3U+qW`elY)
zzlKQ4wCU^?g8hUvsf3U+NWji?bIrx`?zYM7nPqqXKL|`f=e>E#Oz{RF`qIAne$g1?
z`tf$V^`7TL#y7^ex~^T<b*`>!cc09sk8g}|)>>z+bzRrp#$$gaaliQf8LbF?aBHoL
z<Ji@8?cz9g*4j~$Fvk3`@V_6Q_&<CSQA$B6g(OL^*=zs+P1E>H<*jKNv~3F^1f-PS
z^L!uj;VjFZgCKZXEEYH(kC@G7IGs)if&lyd{^6TZmSxYA$>d20f$Q~(x~?&uPH{e;
zvD@vu;(H}*jB$TjYX~9Gwk^^$9d#!*#<(boZtr=XzspHPL_|bHL_|bHL_|dNq5PNo
z0l@e@`ge`rx5!6tPv6DAZ;`*HJwNdYuC)g6yCW>6L=;8;{3?&o_XYcoaG!(L+AIFx
z0`!Csw{cmP$n)HHs=@L+M_HDy<}#Fb0ot~`jg?a9{}q2@&{{(&^=d9d4Za}pYqN1$
zYe*?^I2>@fT)Y$TQ4|G=qCgmiSg+S_YSDY$5b29h6a`kR6{M6X%Mw*p`Aj$1a=C<3
z3Qf}>NfK05<$Vfx6`&V}AzofyZVMmdDC&!!rYYw0Il?e}bVwp1A|fIpA|fK9&*LYf
XI9IQ-z%&gK00000NkvXXu0mjft9uJN

delta 367
zcmdnXK9g<37RLGjPZ!6KiaBp@8RoSZ2(Vt5ufhI7bX#e1q450nBrdM`$JH4x?r^=+
zFsaX^QDIBhw1bUrp4n%rYJ8A?GgZ@u;o|;p%W4B$mi^qdO6#kI|4e<Q%NBj7^JCAP
zex85$yq;3|zuns=2rvbCaVTcA{}8s@!apsQlVQWPH0`whDVK_B>zA-yWmz)i!ZzI=
zLy0!VbC#uyxBkq3_dVe4JSC&b_lav=y*Lez1(zoY&g@zg@ox6Aolm@7kieIaO<&j<
zp3lD+KTBUJIQIJVxfk>MPrTk`r~m)n>G_c^?`lfx58SG8sG276c%ksatvbR9Yg@nD
z9S`82>A$Qvz(4&!8SAZWwlQZGZ;N#Q$GclvWnbCtmu0&df4n<aaBksit5U`4HPS}U
z(t6ju4vA+f?d~yTtG%zkdZBK@`bx%UG08kVhWlj^PWmEc$9Vdty!}!Uj)x3D;OXk;
Jvd$@?2>=47sl@;Q