From 73515de7ead6773ca085eb6adaffb01f06572262 Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Wed, 8 Jan 2025 01:36:37 -0600
Subject: [PATCH] reparent

---
 .../Entities/Clothing/Hands/gloves.yml        | 28 +------------------
 .../Entities/Objects/Weapons/Melee/sword.yml  | 28 +++++++++----------
 2 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Hands/gloves.yml
index 21e9cf4847858f..08835f498e2e20 100644
--- a/Resources/Prototypes/_Impstation/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Hands/gloves.yml
@@ -15,36 +15,10 @@
   - type: FingerprintMask
 
 - type: entity
-  parent: [ClothingHandsBase, BaseToggleClothing, BaseMajorContraband]
+  parent: ClothingHandsGlovesSpaceNinja
   id: ClothingHandsGlovesSpaceNinjaWeak
-  name: space ninja gloves
   suffix: weak stun
-  description: These black nano-enhanced gloves insulate from electricity and provide fire resistance.
   components:
-  - type: Sprite
-    sprite: Clothing/Hands/Gloves/spaceninja.rsi
-    layers:
-    - state: icon
-      map: [ "enum.ToggleVisuals.Layer" ]
-  - type: Clothing
-    sprite: Clothing/Hands/Gloves/spaceninja.rsi
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
-          True: {state: icon-green}
-          False: {state: icon}
-  - type: Insulated
-  - type: Fiber
-    fiberMaterial: fibers-nanomachines
-  - type: FingerprintMask
-  - type: Thieving
-    stripTimeReduction: 1
-    stealthy: true
-  - type: ToggleClothing
-    action: ActionToggleNinjaGloves
-    disableOnUnequip: true
   - type: NinjaGloves
     abilities:
     - components:
diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml
index 6ed6b2164c028c..dfafa514f1f90f 100644
--- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml
@@ -1,13 +1,12 @@
 - type: entity
-  name: energy katana
-  suffix: stun
-  parent: Katana
+  parent: EnergyKatana
   id: EnergyKatanaStun
+  suffix: stun
   description: A katana infused with strong energy. Few possess the strength to contain it.
   components:
   - type: StaminaDamageOnHit
     damage: 30
-    sound: /Audio/Weapons/egloves.ogg
+    sound: /Audio/Weapons/bladeslice.ogg
   - type: MeleeWeapon
     wideAnimationRotation: -60
     damage:
@@ -43,16 +42,6 @@
     slots:
     - Back
     - Belt
-  - type: EnergyKatana
-  - type: DashAbility
-  - type: LimitedCharges
-    maxCharges: 3
-    charges: 3
-  - type: AutoRecharge
-    rechargeDuration: 20
-  - type: Reflect
-  - type: ThrowingAngle
-    angle: 300
   - type: ItemToggleDamageOtherOnHit
   - type: ItemToggle
     predictable: false
@@ -80,3 +69,14 @@
     stampedName: stamp-component-stamped-name-ninja
     stampedColor: "#21a52e"
     stampState: "paper_stamp-ninja"
+  # Inherited
+  # - type: EnergyKatana
+  # - type: DashAbility
+  # - type: LimitedCharges
+  #   maxCharges: 3
+  #   charges: 3
+  # - type: AutoRecharge
+  #   rechargeDuration: 20
+  # - type: Reflect
+  # - type: ThrowingAngle
+  #   angle: 300