From 86d22a7cb6c278537ea7f9b9e05f0b9860ea16c7 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 23 Sep 2023 04:24:58 -0400
Subject: [PATCH] skeleton fixes (#20373)

---
 .../Entities/Mobs/Player/skeleton.yml         | 23 ++++--------------
 .../Prototypes/Entities/Mobs/Species/base.yml |  2 --
 .../Entities/Mobs/Species/skeleton.yml        | 24 ++++++++-----------
 3 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
index 96abe01b6c..acddca8173 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
@@ -3,24 +3,11 @@
   parent: BaseMobSkeletonPerson
   id: MobSkeletonPerson
   components:
-    - type: InteractionPopup
-      successChance: 1
-      interactSuccessString: hugging-success-generic
-      interactSuccessSound: /Audio/Effects/thudswoosh.ogg
-      messagePerceivedByOthers: hugging-success-generic-others
-    - type: Input
-      context: "human"
-    - type: MobMover
-    - type: InputMover
-    - type: Alerts
-    - type: Actions
-    - type: Eye
-    - type: CameraRecoil
-    - type: Examiner
-    - type: CanHostGuardian
-    - type: NpcFactionMember
-      factions:
-        - NanoTrasen
+  - type: InteractionPopup
+    successChance: 1
+    interactSuccessString: hugging-success-generic
+    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
+    messagePerceivedByOthers: hugging-success-generic-others
 
 - type: entity
   name: Skeleton Pirate
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 0a10a12d59..4777c7db13 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -250,8 +250,6 @@
     - RatvarianLanguage
     - PressureImmunity
     - Muted
-    - ForcedSleep
-    - TemporaryBlindness
     - Pacified
     - StaminaModifier
   - type: Blindable
diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index 5bdc6f1d58..15e83b0908 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -1,7 +1,9 @@
 - type: entity
   save: false
   name: Urist McSkelly
-  parent: BaseMobSpeciesOrganic
+  parent:
+  - MobFlammable
+  - BaseMobSpecies
   id: BaseMobSkeletonPerson
   abstract: true
   components:
@@ -17,19 +19,13 @@
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Skeleton
-  - type: Barotrauma #no space damage.
-    damage:
-      types:
-        Blunt: 0
-  - type: Bloodstream
-    maxBleedAmount: 0
-    bloodReagent: Milk
-    bloodlossDamage: #no bloodloss damage. overriding base components
-      types:
-        Bloodloss: 0
-    bloodlossHealDamage:
-      types:
-        Bloodloss: 0
+  - type: DamageVisuals
+    damageOverlayGroups:
+      Brute:
+        sprite: Mobs/Effects/brute_damage.rsi
+        color: "#555555AA"
+      Burn:
+        sprite: Mobs/Effects/burn_damage.rsi
   - type: MobState
   - type: MobThresholds
     thresholds:
-- 
2.51.2