From 8dd76b3a9a91be36f207c7959fe94cd43b0b137b Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Fri, 3 Jan 2025 18:05:33 -0600
Subject: [PATCH 01/11] inverted stun baton

---
 .../Stunnable/Systems/StunbatonSystem.cs      |  8 +++
 .../Stunnable/StunbatonComponent.cs           |  7 +++
 .../Entities/Objects/Weapons/Melee/sword.yml  | 52 ++++++++++++++++++-
 3 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Stunnable/Systems/StunbatonSystem.cs b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
index 97dd2c7e7359bb..47386c4b48aa0a 100644
--- a/Content.Server/Stunnable/Systems/StunbatonSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
@@ -35,6 +35,14 @@ public override void Initialize()
 
         private void OnStaminaHitAttempt(Entity<StunbatonComponent> entity, ref StaminaDamageOnHitAttemptEvent args)
         {
+            // Impstation
+            if (entity.Comp.Inverted && _itemToggle.IsActivated(entity.Owner))
+            {
+                args.Cancelled = true;
+            }
+            else if (entity.Comp.Inverted)  // Uses else so that the next if statement can call battery drain when stun gets canceled (e.g. baton is on)
+                return;
+
             if (!_itemToggle.IsActivated(entity.Owner) ||
             !TryComp<BatteryComponent>(entity.Owner, out var battery) || !_battery.TryUseCharge(entity.Owner, entity.Comp.EnergyPerUse, battery))
             {
diff --git a/Content.Shared/Stunnable/StunbatonComponent.cs b/Content.Shared/Stunnable/StunbatonComponent.cs
index 1df009f780b45f..0192bdccb23eb6 100644
--- a/Content.Shared/Stunnable/StunbatonComponent.cs
+++ b/Content.Shared/Stunnable/StunbatonComponent.cs
@@ -15,4 +15,11 @@ public sealed partial class StunbatonComponent : Component
 
     [DataField("sparksSound")]
     public SoundSpecifier SparksSound = new SoundCollectionSpecifier("sparks");
+
+    // Impstation
+    /// <summary>
+    /// Should this stun when turned off, instead of when on?
+    /// </summary>
+    [DataField]
+    public bool Inverted = false;
 }
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 29c4df3749c811..503d0de3893368 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -94,12 +94,18 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/energykatana.rsi
+    layers: # imp
+    - state: off-icon
+      map: [ "enum.ToggleVisuals.Layer" ]
   - type: MeleeWeapon
     wideAnimationRotation: -60
     damage:
       types:
-        Slash: 30
+        Slash: 5 # imp
+    angle: 60 # imp
+    animation: WeaponArcSlash # imp
   - type: Item
+    heldPrefix: off # imp
     sprite: Objects/Weapons/Melee/energykatana.rsi
   - type: EnergyKatana
   - type: DashAbility
@@ -110,12 +116,54 @@
     rechargeDuration: 20
   - type: Clothing
     sprite: Objects/Weapons/Melee/energykatana.rsi
+    quickEquip: false # imp
     slots:
     - Back
     - Belt
   - type: Reflect
-  - type: ThrowingAngle # imp
+   # imp edits #
+  - type: ThrowingAngle
     angle: 300
+  - type: ItemToggle
+    predictable: false
+    soundActivate:
+      collection: sparks
+      params:
+        variation: 0.250
+    soundDeactivate:
+      collection: sparks
+      params:
+        variation: 0.250
+    soundFailToActivate:
+      path: /Audio/Machines/button.ogg
+      params:
+        variation: 0.250
+  - type: StaminaDamageOnHit
+    damage: 30
+    sound: /Audio/Weapons/egloves.ogg
+  - type: UseDelay
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+      types:
+        Slash: 30
+    activatedSoundOnHit:
+        path: /Audio/Weapons/bladeslice.ogg
+    deactivatedSoundOnHit:
+        path: /Audio/Weapons/bladeslice.ogg
+  - type: Stunbaton
+    energyPerUse: 100
+    inverted: true
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+     enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: {state: on-icon}
+          False: {state: off-icon}
+    # end imp edits #
 
 - type: entity
   name: machete

From 576c93eb4576ea0235c65f1be5b132c0cb996d1b Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Fri, 3 Jan 2025 18:05:49 -0600
Subject: [PATCH 02/11] basic .rsi

---
 .../Weapons/Melee/energykatana.rsi/meta.json   |  17 ++++++++++++++---
 .../{icon.png => off-icon.png}                 | Bin
 .../{inhand-left.png => off-inhand-left.png}   | Bin
 .../{inhand-right.png => off-inhand-right.png} | Bin
 .../Weapons/Melee/energykatana.rsi/on-icon.png | Bin 0 -> 403 bytes
 .../Melee/energykatana.rsi/on-inhand-left.png  | Bin 0 -> 576 bytes
 .../Melee/energykatana.rsi/on-inhand-right.png | Bin 0 -> 560 bytes
 7 files changed, 14 insertions(+), 3 deletions(-)
 rename Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/{icon.png => off-icon.png} (100%)
 rename Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/{inhand-left.png => off-inhand-left.png} (100%)
 rename Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/{inhand-right.png => off-inhand-right.png} (100%)
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
index de27e15fb759de..444d4706d03895 100644
--- a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
@@ -8,18 +8,29 @@
   },
   "states": [
     {
-      "name": "icon"
+      "name": "off-icon"
+    },
+    {
+      "name": "on-icon"
     },
     {
       "name": "equipped-BELT",
       "directions": 4
     },
     {
-      "name": "inhand-left",
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
       "directions": 4
     },
     {
-      "name": "inhand-right",
+      "name": "on-inhand-right",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-icon.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png
rename to Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-icon.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png
rename to Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png
rename to Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-icon.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..62ba976b34330e5699ee911ef450df92870261ed
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800046Nkl<ZSP5hN
z|NlS3Kmw+Lv>asjr~^hrVBkYQR!;hVaB%Q|<wYhlQws(meu)9gjf^s~QvZ=1F?-%r
zMv!YjAp;U$yLK&@Pb(KP!b(C|G=M^5$DR!gFh{{0L~{qgEP(kO<`9th<3~?v778pd
zi(xd(=de%!iGv&kqG{m}3<rQL0$C2Sj5W>yY_T6OEr0+m90E@RU>k4{aEE*q2CF!A
z`UIG!Mu-sQ0GPW#4w3bE&tSM#g=!8V$pQErLT;8N%K_LN0?IY-KE41;ky3V0C3`6@
z)dMG1=RG!H2aw_rsyF~vm?<sO|DR;`m*HWXJ<$%KssmtALyALa;sBUKTJGq8qXs=h
zK-oBbpCChx$`wYe1rf{uN@<V<ATwI3AP!-GMhz&(FfiN%8&8!G0GR|!2Vhfi5U>yd
xNy8jR6$cPwISx0CHp@pt09Vo&6{lYa001)9rQj-}iBJFl002ovPDHLkV1oXTk9Yt8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..39f26b42fc23191670f44c02367063f57751ca45
GIT binary patch
literal 576
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}E=laSW+od^^j~`-p)=+v0nA
zR<esa9{4srcvSVT&8n;U(G!1xIV|-}lV2$Gm6ZwZx#}t~$4|g=;%t`kr%$Xayw{sd
zkD2u)s$%n!%vtZN@2mSxU+=YXA_M0HOytnYp|f6x*Xi_3-nj=%?asIdipVsrc6+;P
zar0vrlb#HDIb+3V-D~89t?o>jA$~EF!*0`6CYG`_8}EPHRjhdS{Er*5b1px>YkqZi
ze87HlS^dJ=4CA93DkixxLVMru73oSBl1{qkxna)x_w)BnlARvr{<z`hfmYvs{@brS
z-ED2oUcF`UCu%Qa=HpEtwtUUn%IA6N&BCvrejV~ke&?KixA)-jO6!Zd)_QAC9a9Y3
za=J8ZzhAW;180Ln(b{O8;?UgE>+zxMuDCL(IN(MGP7GfUO`OfhezWFg;ejhZ7cQL=
zJB{Py<g@0Pnz7LmC%32X+g-NXa?P2XyKDL7`ySt@=Huj9{CDoOEW5I+>F-Z#_Fq;q
zW?OnmLG1bLQ`^GQyLz{C|5p+*)Zf{}*dWMQxa05iE3aZ4m-Kq)#H;>%0F1z`R<{?a
zUTgg)zR-lhfJMMaF1*BbX0+DjaK`_x8nO%yFMe$)6jq7t@qFhm+ptIQW^!O#p~EaI
n2En9i9feu8pm_SB^npK9f9IuwFyl$Ul)>QX>gTe~DWM4f$4Bxy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a365e772831904f5c7f0510d8e18b824333bcba
GIT binary patch
literal 560
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEpds;uuoF`1aOruOkj3Y!5zO
z;tuQH(ea>3gF{TOOnc>;WKA*cFuSG%)gK&Ti>5BEWXsKEIhe(|@wV4TMi)zFdmhC}
zJM&I_T0Ya)toYd+{foNiG>$eii7a4X)o@_s3TS{ceI_0#Du20s-JF}dq;LJIo%eiK
zg>=g)sk5Exhc8E+Jf*-JH|0;Gz?3$Yi3z!m9YI?()sCK*=QVNq^5B`1p#APAmdU%<
zDU^KQf92cXS@VKKTEE8JHl4NO{LYT6yLJEmPl!^O!}wu}Psh>LzFqtFe(GzT;oEc2
zllw^FfA`uLzLI~r%^Yk8f_F>gzOwHX5%|IC)hNyTz@B60zM^j{&Q-6!md&ZAU>NT<
zU7~3J*~Gb1d<{O!?GY?GtN!uA&osS1J}6#6@)d~rK|rHC_VjZ(#ktE;BCox%V=cbi
zA|jtF+{D_vX8XR2-Fy%3N=$royxR6^rNqjA=hk^$)jJ;jt>(kBnfLhP_Y|)y;^Sg#
z5&6xwME=K5+pv{f>}~=KO(!z8oql@fd#{6X$gfUw|6;9g!qe}ZQI=w8nk8WNn@#N|
zhil(630a1NvEO)2ZgTjtF>r{qmz8(P*<br4Ihk2urBO>v`Capd2*cx@j0%|!Cw89S
j$9UwS2hbx5Z3pC)-8OA}rC}@zObHC0u6{1-oD!M<f12yy

literal 0
HcmV?d00001


From 0da78b7690a7a0d7cb3eba2cedaf2b8d387aeab7 Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Fri, 3 Jan 2025 20:20:39 -0600
Subject: [PATCH 03/11] animate .rsi

---
 .../Weapons/Melee/energykatana.rsi/meta.json  |  66 +++++++++++++++++-
 .../Melee/energykatana.rsi/on-icon.png        | Bin 403 -> 778 bytes
 .../Melee/energykatana.rsi/on-inhand-left.png | Bin 576 -> 1106 bytes
 .../energykatana.rsi/on-inhand-right.png      | Bin 560 -> 1001 bytes
 4 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
index 444d4706d03895..56a26eca36d5ca 100644
--- a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
@@ -11,7 +11,15 @@
       "name": "off-icon"
     },
     {
-      "name": "on-icon"
+      "name": "on-icon",
+      "delays": [
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ]
+	  ]
     },
     {
       "name": "equipped-BELT",
@@ -23,7 +31,33 @@
     },
     {
       "name": "on-inhand-left",
-      "directions": 4
+      "directions": 4,
+      "delays": [
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
       "name": "off-inhand-right",
@@ -31,7 +65,33 @@
     },
     {
       "name": "on-inhand-right",
-      "directions": 4
+      "directions": 4,
+      "delays": [
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
       "name": "equipped-BACKPACK",
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-icon.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-icon.png
index 62ba976b34330e5699ee911ef450df92870261ed..f200ccef479db2991c222355f7a48ee82941c35d 100644
GIT binary patch
literal 778
zcmV+l1NHogP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008fNkl<Zc%1E;
zF-sd^7{`C7?V^L2W)N#E9(DCFVu(;^p-ZMB$xtxRAyE1q`T+|40G$fi40H&HQ;;BZ
zszf4~DK3UYgbrz?gKlyia(A3DDHn6^y;7eaguo5?{qK37_r1V9AP9mW2oINq#Jru&
zW^LQHiTZON{1d75G_jdEZ402=Z!9F{ZGVWb#V-axV)3b+T2E6hmknid!$7y+a9bgl
z%h>?2nK>%e9dBjaK&k@h_Im|zaVzfz0XXZND+%E*fG+=|{)>KjYCY|RQW-?2|5gD2
zD%Bm%I_JjYcdu-KHxU;iO8>1bFbFTm<r4sEhX;faWY89f+CQ)Z`blIirU7;<TqZIX
zq=>d7RQdxI;B@Qw3c$pg2I9NZzuNslR6ep)`U7o&e$0|J1;o!Pv+YFYg4ObKVl#96
z{__(caFC!|K&5}I6<gX~Sp?!h9pH8K1wh~+hB02lgyA2%WtX;BrkoIQpk7E_)Bf}_
zP>^v85QaaLJ!{*x*Oozpm?bL-G+X(`RY?A~z>g9A%b^v(_rqQx3aRTla4Sgd@PH5d
zvlMHSYps0aC@jBW7&kg1h(FL%U=*AayJMEDZm~A`42Ty#ey;=I1nK?5I|*Cu7Q*#!
z1o4OV*cx`459$bjVr_B_=(h5Wjw-*?5#H7q<X8UR-o<xfyL9OlVC*v>p#MF+r^TA{
z-6hHbI3e6_i0sCP_%~Yl#<!^bf*=TjAP9mW2=@ow@8@;<Wj;Xn`+41dnGewYeqOg<
z<^u*@l=*-@WIjOV17tqn1~MPuaF_S<{+oV~^8sebN}g^VADJa<vz2e`MD6zz+I+y$
z_DT|HjuJ${d_dqrm?diy=m5?CYChmD{?H5HgxCc3{uN~P^NErIjOtf9A22KkL^B`Y
zWRUp)pFc@&?|c4<DC7XnN-sO&CXkGBM!@m!>GBJLAPD!7zZoD;ydY%kPXGV_07*qo
IM6N<$f&;i}vj6}9

literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800046Nkl<ZSP5hN
z|NlS3Kmw+Lv>asjr~^hrVBkYQR!;hVaB%Q|<wYhlQws(meu)9gjf^s~QvZ=1F?-%r
zMv!YjAp;U$yLK&@Pb(KP!b(C|G=M^5$DR!gFh{{0L~{qgEP(kO<`9th<3~?v778pd
zi(xd(=de%!iGv&kqG{m}3<rQL0$C2Sj5W>yY_T6OEr0+m90E@RU>k4{aEE*q2CF!A
z`UIG!Mu-sQ0GPW#4w3bE&tSM#g=!8V$pQErLT;8N%K_LN0?IY-KE41;ky3V0C3`6@
z)dMG1=RG!H2aw_rsyF~vm?<sO|DR;`m*HWXJ<$%KssmtALyALa;sBUKTJGq8qXs=h
zK-oBbpCChx$`wYe1rf{uN@<V<ATwI3AP!-GMhz&(FfiN%8&8!G0GR|!2Vhfi5U>yd
xNy8jR6$cPwISx0CHp@pt09Vo&6{lYa001)9rQj-}iBJFl002ovPDHLkV1oXTk9Yt8

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-left.png
index 39f26b42fc23191670f44c02367063f57751ca45..a3286c07bbacd9e9bad73fc91a6b5a191c72d914 100644
GIT binary patch
literal 1106
zcmY*Xc~H^`6vo*m$zv>S&Gn)++;lx#$0HR9M>A|=9W0GeQggJ;D|J)QI9y9vuVhr*
z@M1R0EGy5zBw;7VvGGDhQ)9t_ywEWee~4VN_*c7c<{jVr{&??w^U9)75#}bgCLj>V
z9C;}WZOBE34nAs#Lm^3HAkdNTkYR|c_@*r(Jl#IRp0d;FbPavN+jBhURCnU<h%TyW
z|F>ZD3k<EI!s^+os0cxgJpREns^P&C@3@OZ@6!0sp;WLn8rkLIw`!7<-8!0zzU1aN
zrsFo#t7NLH^&Xpap<VN=Hr3fM@~hc&2&8l^Zz5)>QWLLcV7LaD+L83wC6^=yV9HjP
zpA6JXnBZJUeu!>SlYXtlSxV5O?^k&c3DXG$al@zD?hJCLj=Ge}G6;leE@nA>1}8|M
zpZ#YG7}r?bzlo2Y$+Lcj@@ygH>F6RO`I4u9wYo5mIS_?+1Uh8ZL}PGGHmri*c=LJ<
z>3p1S)l<uRC%!$!T7nE1J@jHu%qfGEkU!to-1VpkB9D@MD){q`n)w=uJBloy>y#W=
z2tf!-rbP=$?W13qGlgd+%+$K0^zsFk{QWNio{UU=uoW&FYB%4eJ)x9va}C{fSxQc!
zq+2FeGcFfmHV%;`RQ%V(M64;o(s6S44)f!2Xp$i1-fUofBuPA0_)WcH!04-Jpv2m0
zm7h9Glkju7rXlyKjMW+ZWtUyVSvnx&g=K(_YlW}iD@Dd2(4%&PpptVbz^0I~`NyLi
z!$nn4+M0kXP_yOMx?v5i$ug#n*8{OvP$pP$5o9KZhCQFb5$)yt2yF5@O9m=q**7Av
zukT6cR!Z8(0{^pxq140KZ1#<_7%A@~q#*ReJCV5v?{KRP9><lxEjoRy3QE)ol94k~
z>GRq$8}+WjjbT>P_q|lCI#{7W!^_9-dqJdY3FNzZXV!UBEN1)ZWAk}I&AEBo0AKgA
zp~DVA9^fd3my;t^z1dicE9#B4YWypWg8ivV*_*aPaS{-~09F$<BLgT(tiD*1@oV=!
zbw!R#7V|k162RC_cOqTx*M|{-3zov!egs%`0C~TU=Ub-<neVFWU;O_yAW+&1Ej4t$
zbsB)}v71|NGi}>!GMToM))$tN;pI;J4Bzojy$+w{kEO8!hKf)`U^UAU(z?2zMv&vz
zw;FMisb+_a8g4y=^Xmy1r27ZEsq@uV{ufw$9~s=NTzo}{dK35-ug=$;As<=hVzV3-
zij9mn@@*&}1Y}D_#n5=31ZcCV|H25)BtC5BFb+m{hMBGqJ2dz*ivqqbP(|-GVwyO6
z3*7pXYsRSkb-{q%&G3O^Bc=V|wI3ADu<nA&(UU|sFKwSrdti)QVCFz#N*&^yDDcgT
zfU+k5wzGgM(D9rH-4%z()$zC8MO$2MX-Bkg<Vaf|mKpIX`T2f`{|GB(Fl+X2E`IVB
Tc7+6XJroNWjtYAnnppfV9>qQ%

literal 576
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}E=laSW+od^^j~`-p)=+v0nA
zR<esa9{4srcvSVT&8n;U(G!1xIV|-}lV2$Gm6ZwZx#}t~$4|g=;%t`kr%$Xayw{sd
zkD2u)s$%n!%vtZN@2mSxU+=YXA_M0HOytnYp|f6x*Xi_3-nj=%?asIdipVsrc6+;P
zar0vrlb#HDIb+3V-D~89t?o>jA$~EF!*0`6CYG`_8}EPHRjhdS{Er*5b1px>YkqZi
ze87HlS^dJ=4CA93DkixxLVMru73oSBl1{qkxna)x_w)BnlARvr{<z`hfmYvs{@brS
z-ED2oUcF`UCu%Qa=HpEtwtUUn%IA6N&BCvrejV~ke&?KixA)-jO6!Zd)_QAC9a9Y3
za=J8ZzhAW;180Ln(b{O8;?UgE>+zxMuDCL(IN(MGP7GfUO`OfhezWFg;ejhZ7cQL=
zJB{Py<g@0Pnz7LmC%32X+g-NXa?P2XyKDL7`ySt@=Huj9{CDoOEW5I+>F-Z#_Fq;q
zW?OnmLG1bLQ`^GQyLz{C|5p+*)Zf{}*dWMQxa05iE3aZ4m-Kq)#H;>%0F1z`R<{?a
zUTgg)zR-lhfJMMaF1*BbX0+DjaK`_x8nO%yFMe$)6jq7t@qFhm+ptIQW^!O#p~EaI
n2En9i9feu8pm_SB^npK9f9IuwFyl$Ul)>QX>gTe~DWM4f$4Bxy

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png
index 6a365e772831904f5c7f0510d8e18b824333bcba..cf18f5feccc35e55379ede605975eaaa51c3b4cc 100644
GIT binary patch
literal 1001
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVBX;A;uumf=k4A7-qMLO$3OPl
zPunHZ<;>~%bb()Mvs*#IMvhD8t{Ylt?0O*|AYdiR^_P8DM9Hp=dVNcqS6>igVqMsp
zpncRa%4*B(nD%>~Ld9mYs^`5Ay}#ab(v0us)72k+dNL7c8v?{IUyV{dSr-=<<9n`J
z=kMz4_M)zVL2E;WRx7@^{VjBD=%kCSH<v`MRtXfDStImf_iO&IzYl<fzP)IFw|}3u
z=dFA9-u*7`cDV2R-^pL-$io>+;wSm&vHX4XTm0YCl8!=8_L~aZ^X^?+y>@yWP&n!L
zbh%x%6PCUdmbIBbRb?`_<Nr^88{2swedt^Aap}v+<&&(~I3E?Pxtj4$Zj0mn*!>->
z6V@In^n4}fGD+=P`PY(9$q(oEDDZ`=91Z(h(kAKI-uAa~U45eSQ(h&{+11LyYu!HA
z2CkKRd#Clm%J}J9-tU$_l4x6f?{r+f`216SjzPzP3cN3_o%HRx%G)3B*b8@D$}%x8
z`t=zo+<LlBb4fktCjXS<x%+O3?>#Ttt#)gRuG?kvL%aA9LB`OqdP!}&_TQp!?XgEU
z_x6N|H}1=g58IvjQu@1Yyh-ivI?c8P@lCEk9slZ2cdstHALM#Jvwq9<-t%^My?1?|
z?mcN+Opn9;P4|l#bKdp(=&pTV_C{adZf^g+{dMQxv!B>kw&bl^{_oc>Z-4h*sB?SP
z%)>WIYad?!TFQ*%2nL2fFYcATs@}{}d%N!VcHf9O+5Y#p)u%~Je}3!o_sjAx9-PQp
zJ4wcN#+2^jw=aLc6gOG}VeGcB-Z23zwA;qIVgZ<CEuD1%A{4{GJU81u!TP&Jr93Qr
z_pRIi+1`7)?e%>N%HBDBxU$~+*7v*ok2cJ+eZPO*{`dbw{MkJ#Z-0+#`ZsHd?ESyM
z$cgHG=H^#_FLk%ct-hl5<@cYhuD$p>Ch_*pjoXf9{Bn!<&WPfZZO@)P^YLH0EWW0G
z$9;CUz$rD>zoJU^=YP5TrCLtrrtGvO{QdUcyA(~i<~Qz3v@d7W(O;)_zg})>qUWWS
zC6ALn|9tWL<@`v7o8f&vYu>+ld+$W%jjw5Lzs&w#+|%53`E%CX{Mc8^=jSEe*zjui
zi)l;kMUEuytv;OaYw`5j;^$vgZF5X#`Q5AdRnHqK9}?5_PuMem*YBIlPJJ=dUU#n}
zZhgGmy&pj@x5lrlRbGCT$8NXS+e?p}fIisqmA&le9U0Bk(32qlc)I$ztaD0e0ss#f
B_uT*h

literal 560
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEpds;uuoF`1aOruOkj3Y!5zO
z;tuQH(ea>3gF{TOOnc>;WKA*cFuSG%)gK&Ti>5BEWXsKEIhe(|@wV4TMi)zFdmhC}
zJM&I_T0Ya)toYd+{foNiG>$eii7a4X)o@_s3TS{ceI_0#Du20s-JF}dq;LJIo%eiK
zg>=g)sk5Exhc8E+Jf*-JH|0;Gz?3$Yi3z!m9YI?()sCK*=QVNq^5B`1p#APAmdU%<
zDU^KQf92cXS@VKKTEE8JHl4NO{LYT6yLJEmPl!^O!}wu}Psh>LzFqtFe(GzT;oEc2
zllw^FfA`uLzLI~r%^Yk8f_F>gzOwHX5%|IC)hNyTz@B60zM^j{&Q-6!md&ZAU>NT<
zU7~3J*~Gb1d<{O!?GY?GtN!uA&osS1J}6#6@)d~rK|rHC_VjZ(#ktE;BCox%V=cbi
zA|jtF+{D_vX8XR2-Fy%3N=$royxR6^rNqjA=hk^$)jJ;jt>(kBnfLhP_Y|)y;^Sg#
z5&6xwME=K5+pv{f>}~=KO(!z8oql@fd#{6X$gfUw|6;9g!qe}ZQI=w8nk8WNn@#N|
zhil(630a1NvEO)2ZgTjtF>r{qmz8(P*<br4Ihk2urBO>v`Capd2*cx@j0%|!Cw89S
j$9UwS2hbx5Z3pC)-8OA}rC}@zObHC0u6{1-oD!M<f12yy


From fbd38ec941684d78d30cccaa6609be96616e7a4c Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Fri, 3 Jan 2025 22:17:55 -0600
Subject: [PATCH 04/11] imp .rsi

---
 .../Entities/Objects/Weapons/Melee/sword.yml  |   6 +-
 .../Weapons/Melee/energykatana.rsi/icon.png   | Bin 0 -> 403 bytes
 .../Weapons/Melee/energykatana.rsi/meta.json  |   5 +-
 .../energykatana.rsi/equipped-BACKPACK.png    | Bin 0 -> 496 bytes
 .../Melee/energykatana.rsi/equipped-BELT.png  | Bin 0 -> 557 bytes
 .../Weapons/Melee/energykatana.rsi/icon.png   | Bin 0 -> 403 bytes
 .../Weapons/Melee/energykatana.rsi/meta.json  | 104 ++++++++++++++++++
 .../Melee/energykatana.rsi/off-icon.png       | Bin 0 -> 403 bytes
 .../energykatana.rsi/off-inhand-left.png      | Bin 0 -> 576 bytes
 .../energykatana.rsi/off-inhand-right.png     | Bin 0 -> 560 bytes
 .../Melee/energykatana.rsi/on-icon.png        | Bin 0 -> 778 bytes
 .../Melee/energykatana.rsi/on-inhand-left.png | Bin 0 -> 1106 bytes
 .../energykatana.rsi/on-inhand-right.png      | Bin 0 -> 1001 bytes
 13 files changed, 111 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png
 create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/equipped-BACKPACK.png
 create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/icon.png
 create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/meta.json
 create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-icon.png
 create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-inhand-left.png
 create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-inhand-right.png
 create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-icon.png
 create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-inhand-left.png
 create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 503d0de3893368..e9e713f6462cbb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -93,7 +93,7 @@
   description: A katana infused with strong energy.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Melee/energykatana.rsi
+    sprite: _Impstation/Objects/Weapons/Melee/energykatana.rsi # imp
     layers: # imp
     - state: off-icon
       map: [ "enum.ToggleVisuals.Layer" ]
@@ -106,7 +106,7 @@
     animation: WeaponArcSlash # imp
   - type: Item
     heldPrefix: off # imp
-    sprite: Objects/Weapons/Melee/energykatana.rsi
+    sprite: _Impstation/Objects/Weapons/Melee/energykatana.rsi # imp
   - type: EnergyKatana
   - type: DashAbility
   - type: LimitedCharges
@@ -115,7 +115,7 @@
   - type: AutoRecharge
     rechargeDuration: 20
   - type: Clothing
-    sprite: Objects/Weapons/Melee/energykatana.rsi
+    sprite: _Impstation/Objects/Weapons/Melee/energykatana.rsi # imp
     quickEquip: false # imp
     slots:
     - Back
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..62ba976b34330e5699ee911ef450df92870261ed
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800046Nkl<ZSP5hN
z|NlS3Kmw+Lv>asjr~^hrVBkYQR!;hVaB%Q|<wYhlQws(meu)9gjf^s~QvZ=1F?-%r
zMv!YjAp;U$yLK&@Pb(KP!b(C|G=M^5$DR!gFh{{0L~{qgEP(kO<`9th<3~?v778pd
zi(xd(=de%!iGv&kqG{m}3<rQL0$C2Sj5W>yY_T6OEr0+m90E@RU>k4{aEE*q2CF!A
z`UIG!Mu-sQ0GPW#4w3bE&tSM#g=!8V$pQErLT;8N%K_LN0?IY-KE41;ky3V0C3`6@
z)dMG1=RG!H2aw_rsyF~vm?<sO|DR;`m*HWXJ<$%KssmtALyALa;sBUKTJGq8qXs=h
zK-oBbpCChx$`wYe1rf{uN@<V<ATwI3AP!-GMhz&(FfiN%8&8!G0GR|!2Vhfi5U>yd
xNy8jR6$cPwISx0CHp@pt09Vo&6{lYa001)9rQj-}iBJFl002ovPDHLkV1oXTk9Yt8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
index 56a26eca36d5ca..a0b646eb8cdb94 100644
--- a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
@@ -1,12 +1,15 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff and modified by Jackal298",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff and modified by Jackal298, 'on-' states by iaada (github).",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
+    {
+      "name": "icon"
+    },
     {
       "name": "off-icon"
     },
diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/equipped-BACKPACK.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba554a95b5a9cada40674b406373d34e338751bd
GIT binary patch
literal 496
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVBGHM;uuoF_;%JtFBU@)*Tpxu
z!!~IoZJe6$JZX7r>r$V5#fYDrO;i7Gn40jk{fA)Kw5}Z0AFSHjD+H#gb`~x=`9?A#
zEp76iz28%eZl1JxenWwQk;8$3$&tx=_u|S8POYsgXI)RerF-G)RbOKPpVgWCl|4)q
z^}i#m?ROW<k2g+lbY}d&+ed0?=&Yr-%haO|GDSRCdp7s`2Mgc4^tb<$<}cpprEIyO
zWT$^$-(7#}3;~8e8|M|>{N1qlJH!5>-s9IkZ@yf3X~z1C&fC;xzTcI%udwpc8J?-R
zWg8dHykBp1<d4!E$NAy+KTAzsTII0O^!oS8o94#6r}jMivG;a*xq017-}3xMudllv
zO*2}5<0`X8W*kG;Kfy~Cd+Tja>{4G5oB5e3pyae^{-P`Ywj1h*RfGH{(7?a~^(KVb
zD8dxgd|iEM-s;jt*-ceX*KFMz#(S)Uo$*EJ=4+3lPx5unj18N&MQ7gR%8hT1&-#~l
z;_!l(eU3J8Q$BENtUqASFUvlk)rmJ-H`uOmUVM-u4_|}OiYXqd9NKeZHePy`Ej#Z;
g6UgSqTO2jaObN47)Pm~kfHBG7>FVdQ&MBb@03}@3TL1t6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..abdef910aa969186d13623da053ea6b728501680
GIT binary patch
literal 557
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEp3g;uuoF_;%KQufqW%$MTQF
zPT>pEdGz4P{*#XsN-i8UOc7;2y0Sl@K&VFe`kn?W4!gz&PZSn)On&r8Z6g03)n?yI
zPv$IJ{&&+Ir}ux~mDhd0Gkb#Y^NNWKoD<NHgC>*r+O(jo2NFE9B$@fQMhP%pxOcBG
zY_kK)fkSr|F}JMT=hwg6Q^YmxeAB7!cHM+R>5d#m|NP|I({~~j*dBa+s=FhrX7yaw
z&F->O->R}PL|(A^@#Un#tw%W*FNv9QZJc`A_v6${7rr!hr!lzr-?HZ`XR&v@Di(F&
z%B~}f8Iq<;tN-no=8?i^vS6v?o+vh*?|It4r(IZ))5N6WfE`(~n5=e|x|Oy5NRh?V
zf6>fNnZ~6&N4kSfDy`Yc^W#TVxyEsCM+0_+zQ+fgC*0t3l+DyJOt-2KNmDgBo0$>X
zbGC88Lwlx|xq%|50@@R1a&}3ryv46ta&`Sx0h>JASzD_(IX-CY3lMAi{$Yc|VTTiY
zYg-a$m^_>PF75w0TiJWhzkPRmmBX0$zUunJO2+fNk#R=n8RTtFT?uP)-|&I!yz4v(
z_Di1Z_1k_KY={@TyX*hq<D%!q=brKTVZOnW<KAI?ri0(#ZkJf{H`A+rli;5jTPoZd
ea=MoNV3iVG-2MLNPB&mOVDNPHb6Mw<&;$U<l=681

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/icon.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..62ba976b34330e5699ee911ef450df92870261ed
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800046Nkl<ZSP5hN
z|NlS3Kmw+Lv>asjr~^hrVBkYQR!;hVaB%Q|<wYhlQws(meu)9gjf^s~QvZ=1F?-%r
zMv!YjAp;U$yLK&@Pb(KP!b(C|G=M^5$DR!gFh{{0L~{qgEP(kO<`9th<3~?v778pd
zi(xd(=de%!iGv&kqG{m}3<rQL0$C2Sj5W>yY_T6OEr0+m90E@RU>k4{aEE*q2CF!A
z`UIG!Mu-sQ0GPW#4w3bE&tSM#g=!8V$pQErLT;8N%K_LN0?IY-KE41;ky3V0C3`6@
z)dMG1=RG!H2aw_rsyF~vm?<sO|DR;`m*HWXJ<$%KssmtALyALa;sBUKTJGq8qXs=h
zK-oBbpCChx$`wYe1rf{uN@<V<ATwI3AP!-GMhz&(FfiN%8&8!G0GR|!2Vhfi5U>yd
xNy8jR6$cPwISx0CHp@pt09Vo&6{lYa001)9rQj-}iBJFl002ovPDHLkV1oXTk9Yt8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/meta.json
new file mode 100644
index 00000000000000..a0b646eb8cdb94
--- /dev/null
+++ b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/meta.json
@@ -0,0 +1,104 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff and modified by Jackal298, 'on-' states by iaada (github).",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "off-icon"
+    },
+    {
+      "name": "on-icon",
+      "delays": [
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ]
+	  ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.6,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-icon.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..62ba976b34330e5699ee911ef450df92870261ed
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800046Nkl<ZSP5hN
z|NlS3Kmw+Lv>asjr~^hrVBkYQR!;hVaB%Q|<wYhlQws(meu)9gjf^s~QvZ=1F?-%r
zMv!YjAp;U$yLK&@Pb(KP!b(C|G=M^5$DR!gFh{{0L~{qgEP(kO<`9th<3~?v778pd
zi(xd(=de%!iGv&kqG{m}3<rQL0$C2Sj5W>yY_T6OEr0+m90E@RU>k4{aEE*q2CF!A
z`UIG!Mu-sQ0GPW#4w3bE&tSM#g=!8V$pQErLT;8N%K_LN0?IY-KE41;ky3V0C3`6@
z)dMG1=RG!H2aw_rsyF~vm?<sO|DR;`m*HWXJ<$%KssmtALyALa;sBUKTJGq8qXs=h
zK-oBbpCChx$`wYe1rf{uN@<V<ATwI3AP!-GMhz&(FfiN%8&8!G0GR|!2Vhfi5U>yd
xNy8jR6$cPwISx0CHp@pt09Vo&6{lYa001)9rQj-}iBJFl002ovPDHLkV1oXTk9Yt8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-inhand-left.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..39f26b42fc23191670f44c02367063f57751ca45
GIT binary patch
literal 576
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}E=laSW+od^^j~`-p)=+v0nA
zR<esa9{4srcvSVT&8n;U(G!1xIV|-}lV2$Gm6ZwZx#}t~$4|g=;%t`kr%$Xayw{sd
zkD2u)s$%n!%vtZN@2mSxU+=YXA_M0HOytnYp|f6x*Xi_3-nj=%?asIdipVsrc6+;P
zar0vrlb#HDIb+3V-D~89t?o>jA$~EF!*0`6CYG`_8}EPHRjhdS{Er*5b1px>YkqZi
ze87HlS^dJ=4CA93DkixxLVMru73oSBl1{qkxna)x_w)BnlARvr{<z`hfmYvs{@brS
z-ED2oUcF`UCu%Qa=HpEtwtUUn%IA6N&BCvrejV~ke&?KixA)-jO6!Zd)_QAC9a9Y3
za=J8ZzhAW;180Ln(b{O8;?UgE>+zxMuDCL(IN(MGP7GfUO`OfhezWFg;ejhZ7cQL=
zJB{Py<g@0Pnz7LmC%32X+g-NXa?P2XyKDL7`ySt@=Huj9{CDoOEW5I+>F-Z#_Fq;q
zW?OnmLG1bLQ`^GQyLz{C|5p+*)Zf{}*dWMQxa05iE3aZ4m-Kq)#H;>%0F1z`R<{?a
zUTgg)zR-lhfJMMaF1*BbX0+DjaK`_x8nO%yFMe$)6jq7t@qFhm+ptIQW^!O#p~EaI
n2En9i9feu8pm_SB^npK9f9IuwFyl$Ul)>QX>gTe~DWM4f$4Bxy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-inhand-right.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a365e772831904f5c7f0510d8e18b824333bcba
GIT binary patch
literal 560
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEpds;uuoF`1aOruOkj3Y!5zO
z;tuQH(ea>3gF{TOOnc>;WKA*cFuSG%)gK&Ti>5BEWXsKEIhe(|@wV4TMi)zFdmhC}
zJM&I_T0Ya)toYd+{foNiG>$eii7a4X)o@_s3TS{ceI_0#Du20s-JF}dq;LJIo%eiK
zg>=g)sk5Exhc8E+Jf*-JH|0;Gz?3$Yi3z!m9YI?()sCK*=QVNq^5B`1p#APAmdU%<
zDU^KQf92cXS@VKKTEE8JHl4NO{LYT6yLJEmPl!^O!}wu}Psh>LzFqtFe(GzT;oEc2
zllw^FfA`uLzLI~r%^Yk8f_F>gzOwHX5%|IC)hNyTz@B60zM^j{&Q-6!md&ZAU>NT<
zU7~3J*~Gb1d<{O!?GY?GtN!uA&osS1J}6#6@)d~rK|rHC_VjZ(#ktE;BCox%V=cbi
zA|jtF+{D_vX8XR2-Fy%3N=$royxR6^rNqjA=hk^$)jJ;jt>(kBnfLhP_Y|)y;^Sg#
z5&6xwME=K5+pv{f>}~=KO(!z8oql@fd#{6X$gfUw|6;9g!qe}ZQI=w8nk8WNn@#N|
zhil(630a1NvEO)2ZgTjtF>r{qmz8(P*<br4Ihk2urBO>v`Capd2*cx@j0%|!Cw89S
j$9UwS2hbx5Z3pC)-8OA}rC}@zObHC0u6{1-oD!M<f12yy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-icon.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f200ccef479db2991c222355f7a48ee82941c35d
GIT binary patch
literal 778
zcmV+l1NHogP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008fNkl<Zc%1E;
zF-sd^7{`C7?V^L2W)N#E9(DCFVu(;^p-ZMB$xtxRAyE1q`T+|40G$fi40H&HQ;;BZ
zszf4~DK3UYgbrz?gKlyia(A3DDHn6^y;7eaguo5?{qK37_r1V9AP9mW2oINq#Jru&
zW^LQHiTZON{1d75G_jdEZ402=Z!9F{ZGVWb#V-axV)3b+T2E6hmknid!$7y+a9bgl
z%h>?2nK>%e9dBjaK&k@h_Im|zaVzfz0XXZND+%E*fG+=|{)>KjYCY|RQW-?2|5gD2
zD%Bm%I_JjYcdu-KHxU;iO8>1bFbFTm<r4sEhX;faWY89f+CQ)Z`blIirU7;<TqZIX
zq=>d7RQdxI;B@Qw3c$pg2I9NZzuNslR6ep)`U7o&e$0|J1;o!Pv+YFYg4ObKVl#96
z{__(caFC!|K&5}I6<gX~Sp?!h9pH8K1wh~+hB02lgyA2%WtX;BrkoIQpk7E_)Bf}_
zP>^v85QaaLJ!{*x*Oozpm?bL-G+X(`RY?A~z>g9A%b^v(_rqQx3aRTla4Sgd@PH5d
zvlMHSYps0aC@jBW7&kg1h(FL%U=*AayJMEDZm~A`42Ty#ey;=I1nK?5I|*Cu7Q*#!
z1o4OV*cx`459$bjVr_B_=(h5Wjw-*?5#H7q<X8UR-o<xfyL9OlVC*v>p#MF+r^TA{
z-6hHbI3e6_i0sCP_%~Yl#<!^bf*=TjAP9mW2=@ow@8@;<Wj;Xn`+41dnGewYeqOg<
z<^u*@l=*-@WIjOV17tqn1~MPuaF_S<{+oV~^8sebN}g^VADJa<vz2e`MD6zz+I+y$
z_DT|HjuJ${d_dqrm?diy=m5?CYChmD{?H5HgxCc3{uN~P^NErIjOtf9A22KkL^B`Y
zWRUp)pFc@&?|c4<DC7XnN-sO&CXkGBM!@m!>GBJLAPD!7zZoD;ydY%kPXGV_07*qo
IM6N<$f&;i}vj6}9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-inhand-left.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3286c07bbacd9e9bad73fc91a6b5a191c72d914
GIT binary patch
literal 1106
zcmY*Xc~H^`6vo*m$zv>S&Gn)++;lx#$0HR9M>A|=9W0GeQggJ;D|J)QI9y9vuVhr*
z@M1R0EGy5zBw;7VvGGDhQ)9t_ywEWee~4VN_*c7c<{jVr{&??w^U9)75#}bgCLj>V
z9C;}WZOBE34nAs#Lm^3HAkdNTkYR|c_@*r(Jl#IRp0d;FbPavN+jBhURCnU<h%TyW
z|F>ZD3k<EI!s^+os0cxgJpREns^P&C@3@OZ@6!0sp;WLn8rkLIw`!7<-8!0zzU1aN
zrsFo#t7NLH^&Xpap<VN=Hr3fM@~hc&2&8l^Zz5)>QWLLcV7LaD+L83wC6^=yV9HjP
zpA6JXnBZJUeu!>SlYXtlSxV5O?^k&c3DXG$al@zD?hJCLj=Ge}G6;leE@nA>1}8|M
zpZ#YG7}r?bzlo2Y$+Lcj@@ygH>F6RO`I4u9wYo5mIS_?+1Uh8ZL}PGGHmri*c=LJ<
z>3p1S)l<uRC%!$!T7nE1J@jHu%qfGEkU!to-1VpkB9D@MD){q`n)w=uJBloy>y#W=
z2tf!-rbP=$?W13qGlgd+%+$K0^zsFk{QWNio{UU=uoW&FYB%4eJ)x9va}C{fSxQc!
zq+2FeGcFfmHV%;`RQ%V(M64;o(s6S44)f!2Xp$i1-fUofBuPA0_)WcH!04-Jpv2m0
zm7h9Glkju7rXlyKjMW+ZWtUyVSvnx&g=K(_YlW}iD@Dd2(4%&PpptVbz^0I~`NyLi
z!$nn4+M0kXP_yOMx?v5i$ug#n*8{OvP$pP$5o9KZhCQFb5$)yt2yF5@O9m=q**7Av
zukT6cR!Z8(0{^pxq140KZ1#<_7%A@~q#*ReJCV5v?{KRP9><lxEjoRy3QE)ol94k~
z>GRq$8}+WjjbT>P_q|lCI#{7W!^_9-dqJdY3FNzZXV!UBEN1)ZWAk}I&AEBo0AKgA
zp~DVA9^fd3my;t^z1dicE9#B4YWypWg8ivV*_*aPaS{-~09F$<BLgT(tiD*1@oV=!
zbw!R#7V|k162RC_cOqTx*M|{-3zov!egs%`0C~TU=Ub-<neVFWU;O_yAW+&1Ej4t$
zbsB)}v71|NGi}>!GMToM))$tN;pI;J4Bzojy$+w{kEO8!hKf)`U^UAU(z?2zMv&vz
zw;FMisb+_a8g4y=^Xmy1r27ZEsq@uV{ufw$9~s=NTzo}{dK35-ug=$;As<=hVzV3-
zij9mn@@*&}1Y}D_#n5=31ZcCV|H25)BtC5BFb+m{hMBGqJ2dz*ivqqbP(|-GVwyO6
z3*7pXYsRSkb-{q%&G3O^Bc=V|wI3ADu<nA&(UU|sFKwSrdti)QVCFz#N*&^yDDcgT
zfU+k5wzGgM(D9rH-4%z()$zC8MO$2MX-Bkg<Vaf|mKpIX`T2f`{|GB(Fl+X2E`IVB
Tc7+6XJroNWjtYAnnppfV9>qQ%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf18f5feccc35e55379ede605975eaaa51c3b4cc
GIT binary patch
literal 1001
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVBX;A;uumf=k4A7-qMLO$3OPl
zPunHZ<;>~%bb()Mvs*#IMvhD8t{Ylt?0O*|AYdiR^_P8DM9Hp=dVNcqS6>igVqMsp
zpncRa%4*B(nD%>~Ld9mYs^`5Ay}#ab(v0us)72k+dNL7c8v?{IUyV{dSr-=<<9n`J
z=kMz4_M)zVL2E;WRx7@^{VjBD=%kCSH<v`MRtXfDStImf_iO&IzYl<fzP)IFw|}3u
z=dFA9-u*7`cDV2R-^pL-$io>+;wSm&vHX4XTm0YCl8!=8_L~aZ^X^?+y>@yWP&n!L
zbh%x%6PCUdmbIBbRb?`_<Nr^88{2swedt^Aap}v+<&&(~I3E?Pxtj4$Zj0mn*!>->
z6V@In^n4}fGD+=P`PY(9$q(oEDDZ`=91Z(h(kAKI-uAa~U45eSQ(h&{+11LyYu!HA
z2CkKRd#Clm%J}J9-tU$_l4x6f?{r+f`216SjzPzP3cN3_o%HRx%G)3B*b8@D$}%x8
z`t=zo+<LlBb4fktCjXS<x%+O3?>#Ttt#)gRuG?kvL%aA9LB`OqdP!}&_TQp!?XgEU
z_x6N|H}1=g58IvjQu@1Yyh-ivI?c8P@lCEk9slZ2cdstHALM#Jvwq9<-t%^My?1?|
z?mcN+Opn9;P4|l#bKdp(=&pTV_C{adZf^g+{dMQxv!B>kw&bl^{_oc>Z-4h*sB?SP
z%)>WIYad?!TFQ*%2nL2fFYcATs@}{}d%N!VcHf9O+5Y#p)u%~Je}3!o_sjAx9-PQp
zJ4wcN#+2^jw=aLc6gOG}VeGcB-Z23zwA;qIVgZ<CEuD1%A{4{GJU81u!TP&Jr93Qr
z_pRIi+1`7)?e%>N%HBDBxU$~+*7v*ok2cJ+eZPO*{`dbw{MkJ#Z-0+#`ZsHd?ESyM
z$cgHG=H^#_FLk%ct-hl5<@cYhuD$p>Ch_*pjoXf9{Bn!<&WPfZZO@)P^YLH0EWW0G
z$9;CUz$rD>zoJU^=YP5TrCLtrrtGvO{QdUcyA(~i<~Qz3v@d7W(O;)_zg})>qUWWS
zC6ALn|9tWL<@`v7o8f&vYu>+ld+$W%jjw5Lzs&w#+|%53`E%CX{Mc8^=jSEe*zjui
zi)l;kMUEuytv;OaYw`5j;^$vgZF5X#`Q5AdRnHqK9}?5_PuMem*YBIlPJJ=dUU#n}
zZhgGmy&pj@x5lrlRbGCT$8NXS+e?p}fIisqmA&le9U0Bk(32qlc)I$ztaD0e0ss#f
B_uT*h

literal 0
HcmV?d00001


From dd2f0768c265f656288042306e6f29386fe31af5 Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Fri, 3 Jan 2025 22:34:04 -0600
Subject: [PATCH 05/11] revert .rsi

---
 .../Weapons/Melee/energykatana.rsi/meta.json  |  80 +-----------------
 .../Melee/energykatana.rsi/off-icon.png       | Bin 403 -> 0 bytes
 .../Melee/energykatana.rsi/on-icon.png        | Bin 778 -> 0 bytes
 .../Melee/energykatana.rsi/on-inhand-left.png | Bin 1106 -> 0 bytes
 .../energykatana.rsi/on-inhand-right.png      | Bin 1001 -> 0 bytes
 5 files changed, 3 insertions(+), 77 deletions(-)
 delete mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-icon.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-icon.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-left.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
index a0b646eb8cdb94..de27e15fb759de 100644
--- a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff and modified by Jackal298, 'on-' states by iaada (github).",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff and modified by Jackal298",
   "size": {
     "x": 32,
     "y": 32
@@ -10,92 +10,18 @@
     {
       "name": "icon"
     },
-    {
-      "name": "off-icon"
-    },
-    {
-      "name": "on-icon",
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ]
-	  ]
-    },
     {
       "name": "equipped-BELT",
       "directions": 4
     },
     {
-      "name": "off-inhand-left",
+      "name": "inhand-left",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "off-inhand-right",
+      "name": "inhand-right",
       "directions": 4
     },
-    {
-      "name": "on-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
     {
       "name": "equipped-BACKPACK",
       "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-icon.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-icon.png
deleted file mode 100644
index 62ba976b34330e5699ee911ef450df92870261ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800046Nkl<ZSP5hN
z|NlS3Kmw+Lv>asjr~^hrVBkYQR!;hVaB%Q|<wYhlQws(meu)9gjf^s~QvZ=1F?-%r
zMv!YjAp;U$yLK&@Pb(KP!b(C|G=M^5$DR!gFh{{0L~{qgEP(kO<`9th<3~?v778pd
zi(xd(=de%!iGv&kqG{m}3<rQL0$C2Sj5W>yY_T6OEr0+m90E@RU>k4{aEE*q2CF!A
z`UIG!Mu-sQ0GPW#4w3bE&tSM#g=!8V$pQErLT;8N%K_LN0?IY-KE41;ky3V0C3`6@
z)dMG1=RG!H2aw_rsyF~vm?<sO|DR;`m*HWXJ<$%KssmtALyALa;sBUKTJGq8qXs=h
zK-oBbpCChx$`wYe1rf{uN@<V<ATwI3AP!-GMhz&(FfiN%8&8!G0GR|!2Vhfi5U>yd
xNy8jR6$cPwISx0CHp@pt09Vo&6{lYa001)9rQj-}iBJFl002ovPDHLkV1oXTk9Yt8

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-icon.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-icon.png
deleted file mode 100644
index f200ccef479db2991c222355f7a48ee82941c35d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 778
zcmV+l1NHogP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008fNkl<Zc%1E;
zF-sd^7{`C7?V^L2W)N#E9(DCFVu(;^p-ZMB$xtxRAyE1q`T+|40G$fi40H&HQ;;BZ
zszf4~DK3UYgbrz?gKlyia(A3DDHn6^y;7eaguo5?{qK37_r1V9AP9mW2oINq#Jru&
zW^LQHiTZON{1d75G_jdEZ402=Z!9F{ZGVWb#V-axV)3b+T2E6hmknid!$7y+a9bgl
z%h>?2nK>%e9dBjaK&k@h_Im|zaVzfz0XXZND+%E*fG+=|{)>KjYCY|RQW-?2|5gD2
zD%Bm%I_JjYcdu-KHxU;iO8>1bFbFTm<r4sEhX;faWY89f+CQ)Z`blIirU7;<TqZIX
zq=>d7RQdxI;B@Qw3c$pg2I9NZzuNslR6ep)`U7o&e$0|J1;o!Pv+YFYg4ObKVl#96
z{__(caFC!|K&5}I6<gX~Sp?!h9pH8K1wh~+hB02lgyA2%WtX;BrkoIQpk7E_)Bf}_
zP>^v85QaaLJ!{*x*Oozpm?bL-G+X(`RY?A~z>g9A%b^v(_rqQx3aRTla4Sgd@PH5d
zvlMHSYps0aC@jBW7&kg1h(FL%U=*AayJMEDZm~A`42Ty#ey;=I1nK?5I|*Cu7Q*#!
z1o4OV*cx`459$bjVr_B_=(h5Wjw-*?5#H7q<X8UR-o<xfyL9OlVC*v>p#MF+r^TA{
z-6hHbI3e6_i0sCP_%~Yl#<!^bf*=TjAP9mW2=@ow@8@;<Wj;Xn`+41dnGewYeqOg<
z<^u*@l=*-@WIjOV17tqn1~MPuaF_S<{+oV~^8sebN}g^VADJa<vz2e`MD6zz+I+y$
z_DT|HjuJ${d_dqrm?diy=m5?CYChmD{?H5HgxCc3{uN~P^NErIjOtf9A22KkL^B`Y
zWRUp)pFc@&?|c4<DC7XnN-sO&CXkGBM!@m!>GBJLAPD!7zZoD;ydY%kPXGV_07*qo
IM6N<$f&;i}vj6}9

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-left.png
deleted file mode 100644
index a3286c07bbacd9e9bad73fc91a6b5a191c72d914..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1106
zcmY*Xc~H^`6vo*m$zv>S&Gn)++;lx#$0HR9M>A|=9W0GeQggJ;D|J)QI9y9vuVhr*
z@M1R0EGy5zBw;7VvGGDhQ)9t_ywEWee~4VN_*c7c<{jVr{&??w^U9)75#}bgCLj>V
z9C;}WZOBE34nAs#Lm^3HAkdNTkYR|c_@*r(Jl#IRp0d;FbPavN+jBhURCnU<h%TyW
z|F>ZD3k<EI!s^+os0cxgJpREns^P&C@3@OZ@6!0sp;WLn8rkLIw`!7<-8!0zzU1aN
zrsFo#t7NLH^&Xpap<VN=Hr3fM@~hc&2&8l^Zz5)>QWLLcV7LaD+L83wC6^=yV9HjP
zpA6JXnBZJUeu!>SlYXtlSxV5O?^k&c3DXG$al@zD?hJCLj=Ge}G6;leE@nA>1}8|M
zpZ#YG7}r?bzlo2Y$+Lcj@@ygH>F6RO`I4u9wYo5mIS_?+1Uh8ZL}PGGHmri*c=LJ<
z>3p1S)l<uRC%!$!T7nE1J@jHu%qfGEkU!to-1VpkB9D@MD){q`n)w=uJBloy>y#W=
z2tf!-rbP=$?W13qGlgd+%+$K0^zsFk{QWNio{UU=uoW&FYB%4eJ)x9va}C{fSxQc!
zq+2FeGcFfmHV%;`RQ%V(M64;o(s6S44)f!2Xp$i1-fUofBuPA0_)WcH!04-Jpv2m0
zm7h9Glkju7rXlyKjMW+ZWtUyVSvnx&g=K(_YlW}iD@Dd2(4%&PpptVbz^0I~`NyLi
z!$nn4+M0kXP_yOMx?v5i$ug#n*8{OvP$pP$5o9KZhCQFb5$)yt2yF5@O9m=q**7Av
zukT6cR!Z8(0{^pxq140KZ1#<_7%A@~q#*ReJCV5v?{KRP9><lxEjoRy3QE)ol94k~
z>GRq$8}+WjjbT>P_q|lCI#{7W!^_9-dqJdY3FNzZXV!UBEN1)ZWAk}I&AEBo0AKgA
zp~DVA9^fd3my;t^z1dicE9#B4YWypWg8ivV*_*aPaS{-~09F$<BLgT(tiD*1@oV=!
zbw!R#7V|k162RC_cOqTx*M|{-3zov!egs%`0C~TU=Ub-<neVFWU;O_yAW+&1Ej4t$
zbsB)}v71|NGi}>!GMToM))$tN;pI;J4Bzojy$+w{kEO8!hKf)`U^UAU(z?2zMv&vz
zw;FMisb+_a8g4y=^Xmy1r27ZEsq@uV{ufw$9~s=NTzo}{dK35-ug=$;As<=hVzV3-
zij9mn@@*&}1Y}D_#n5=31ZcCV|H25)BtC5BFb+m{hMBGqJ2dz*ivqqbP(|-GVwyO6
z3*7pXYsRSkb-{q%&G3O^Bc=V|wI3ADu<nA&(UU|sFKwSrdti)QVCFz#N*&^yDDcgT
zfU+k5wzGgM(D9rH-4%z()$zC8MO$2MX-Bkg<Vaf|mKpIX`T2f`{|GB(Fl+X2E`IVB
Tc7+6XJroNWjtYAnnppfV9>qQ%

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png
deleted file mode 100644
index cf18f5feccc35e55379ede605975eaaa51c3b4cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1001
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVBX;A;uumf=k4A7-qMLO$3OPl
zPunHZ<;>~%bb()Mvs*#IMvhD8t{Ylt?0O*|AYdiR^_P8DM9Hp=dVNcqS6>igVqMsp
zpncRa%4*B(nD%>~Ld9mYs^`5Ay}#ab(v0us)72k+dNL7c8v?{IUyV{dSr-=<<9n`J
z=kMz4_M)zVL2E;WRx7@^{VjBD=%kCSH<v`MRtXfDStImf_iO&IzYl<fzP)IFw|}3u
z=dFA9-u*7`cDV2R-^pL-$io>+;wSm&vHX4XTm0YCl8!=8_L~aZ^X^?+y>@yWP&n!L
zbh%x%6PCUdmbIBbRb?`_<Nr^88{2swedt^Aap}v+<&&(~I3E?Pxtj4$Zj0mn*!>->
z6V@In^n4}fGD+=P`PY(9$q(oEDDZ`=91Z(h(kAKI-uAa~U45eSQ(h&{+11LyYu!HA
z2CkKRd#Clm%J}J9-tU$_l4x6f?{r+f`216SjzPzP3cN3_o%HRx%G)3B*b8@D$}%x8
z`t=zo+<LlBb4fktCjXS<x%+O3?>#Ttt#)gRuG?kvL%aA9LB`OqdP!}&_TQp!?XgEU
z_x6N|H}1=g58IvjQu@1Yyh-ivI?c8P@lCEk9slZ2cdstHALM#Jvwq9<-t%^My?1?|
z?mcN+Opn9;P4|l#bKdp(=&pTV_C{adZf^g+{dMQxv!B>kw&bl^{_oc>Z-4h*sB?SP
z%)>WIYad?!TFQ*%2nL2fFYcATs@}{}d%N!VcHf9O+5Y#p)u%~Je}3!o_sjAx9-PQp
zJ4wcN#+2^jw=aLc6gOG}VeGcB-Z23zwA;qIVgZ<CEuD1%A{4{GJU81u!TP&Jr93Qr
z_pRIi+1`7)?e%>N%HBDBxU$~+*7v*ok2cJ+eZPO*{`dbw{MkJ#Z-0+#`ZsHd?ESyM
z$cgHG=H^#_FLk%ct-hl5<@cYhuD$p>Ch_*pjoXf9{Bn!<&WPfZZO@)P^YLH0EWW0G
z$9;CUz$rD>zoJU^=YP5TrCLtrrtGvO{QdUcyA(~i<~Qz3v@d7W(O;)_zg})>qUWWS
zC6ALn|9tWL<@`v7o8f&vYu>+ld+$W%jjw5Lzs&w#+|%53`E%CX{Mc8^=jSEe*zjui
zi)l;kMUEuytv;OaYw`5j;^$vgZF5X#`Q5AdRnHqK9}?5_PuMem*YBIlPJJ=dUU#n}
zZhgGmy&pj@x5lrlRbGCT$8NXS+e?p}fIisqmA&le9U0Bk(32qlc)I$ztaD0e0ss#f
B_uT*h


From 52f23d101e280d789a86397f2f1dda5269c43ffc Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Fri, 3 Jan 2025 23:52:53 -0600
Subject: [PATCH 06/11] imp sword

---
 .../Entities/Objects/Weapons/Melee/sword.yml  | 58 ++------------
 .../Entities/Objects/Weapons/Melee/sword.yml  | 77 +++++++++++++++++++
 2 files changed, 82 insertions(+), 53 deletions(-)
 create mode 100644 Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index e9e713f6462cbb..29c4df3749c811 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -93,20 +93,14 @@
   description: A katana infused with strong energy.
   components:
   - type: Sprite
-    sprite: _Impstation/Objects/Weapons/Melee/energykatana.rsi # imp
-    layers: # imp
-    - state: off-icon
-      map: [ "enum.ToggleVisuals.Layer" ]
+    sprite: Objects/Weapons/Melee/energykatana.rsi
   - type: MeleeWeapon
     wideAnimationRotation: -60
     damage:
       types:
-        Slash: 5 # imp
-    angle: 60 # imp
-    animation: WeaponArcSlash # imp
+        Slash: 30
   - type: Item
-    heldPrefix: off # imp
-    sprite: _Impstation/Objects/Weapons/Melee/energykatana.rsi # imp
+    sprite: Objects/Weapons/Melee/energykatana.rsi
   - type: EnergyKatana
   - type: DashAbility
   - type: LimitedCharges
@@ -115,55 +109,13 @@
   - type: AutoRecharge
     rechargeDuration: 20
   - type: Clothing
-    sprite: _Impstation/Objects/Weapons/Melee/energykatana.rsi # imp
-    quickEquip: false # imp
+    sprite: Objects/Weapons/Melee/energykatana.rsi
     slots:
     - Back
     - Belt
   - type: Reflect
-   # imp edits #
-  - type: ThrowingAngle
+  - type: ThrowingAngle # imp
     angle: 300
-  - type: ItemToggle
-    predictable: false
-    soundActivate:
-      collection: sparks
-      params:
-        variation: 0.250
-    soundDeactivate:
-      collection: sparks
-      params:
-        variation: 0.250
-    soundFailToActivate:
-      path: /Audio/Machines/button.ogg
-      params:
-        variation: 0.250
-  - type: StaminaDamageOnHit
-    damage: 30
-    sound: /Audio/Weapons/egloves.ogg
-  - type: UseDelay
-  - type: ItemToggleMeleeWeapon
-    activatedDamage:
-      types:
-        Slash: 30
-    activatedSoundOnHit:
-        path: /Audio/Weapons/bladeslice.ogg
-    deactivatedSoundOnHit:
-        path: /Audio/Weapons/bladeslice.ogg
-  - type: Stunbaton
-    energyPerUse: 100
-    inverted: true
-  - type: Battery
-    maxCharge: 1000
-    startingCharge: 1000
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-     enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
-          True: {state: on-icon}
-          False: {state: off-icon}
-    # end imp edits #
 
 - type: entity
   name: machete
diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml
new file mode 100644
index 00000000000000..93865b6373bf6d
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml
@@ -0,0 +1,77 @@
+- type: entity
+  name: energy katana
+  suffix: stun
+  parent: Katana
+  id: EnergyKatanaStun
+  description: A katana infused with strong energy. Few possess the strength to contain it.
+  components:
+  - type: StaminaDamageOnHit
+    damage: 30
+    sound: /Audio/Weapons/egloves.ogg
+  - type: MeleeWeapon
+    wideAnimationRotation: -60
+    damage:
+      types:
+        Slash: 5
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+      types:
+        Slash: 30
+    activatedSoundOnHit:
+        path: /Audio/Weapons/bladeslice.ogg
+    deactivatedSoundOnHit:
+        path: /Audio/Weapons/bladeslice.ogg
+  - type: Stunbaton
+    energyPerUse: 100
+    inverted: true
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: Sprite
+    sprite: _Impstation/Objects/Weapons/Melee/energykatana.rsi
+    layers:
+    - state: off-icon
+      map: [ "enum.ToggleVisuals.Layer" ]
+    angle: 60
+    animation: WeaponArcSlash
+  - type: Item
+    heldPrefix: off
+    sprite: _Impstation/Objects/Weapons/Melee/energykatana.rsi
+  - type: Clothing
+    sprite: _Impstation/Objects/Weapons/Melee/energykatana.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - Belt
+  - type: EnergyKatana
+  - type: DashAbility
+  - type: LimitedCharges
+    maxCharges: 3
+    charges: 3
+  - type: AutoRecharge
+    rechargeDuration: 20
+  - type: Reflect
+  - type: ThrowingAngle
+    angle: 300
+  - type: ItemToggle
+    predictable: false
+    soundActivate:
+      collection: sparks
+      params:
+        variation: 0.250
+    soundDeactivate:
+      collection: sparks
+      params:
+        variation: 0.250
+    soundFailToActivate:
+      path: /Audio/Machines/button.ogg
+      params:
+        variation: 0.250
+  - type: UseDelay
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+     enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: {state: on-icon}
+          False: {state: off-icon}

From 8e6fc7089a9b388d4208359a117cd5d47823c3bd Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Sat, 4 Jan 2025 00:31:38 -0600
Subject: [PATCH 07/11] rgb sword

---
 .../Weapons/Melee/energykatana.rsi/icon.png   | Bin 403 -> 0 bytes
 .../Weapons/Melee/energykatana.rsi/meta.json  |  71 +-----------------
 .../Melee/energykatana.rsi/off-icon.png       | Bin 403 -> 391 bytes
 .../energykatana.rsi/off-inhand-left.png      | Bin 576 -> 452 bytes
 .../energykatana.rsi/off-inhand-right.png     | Bin 560 -> 456 bytes
 .../Melee/energykatana.rsi/on-icon.png        | Bin 778 -> 369 bytes
 .../energykatana.rsi/on-inhand-right.png      | Bin 1001 -> 436 bytes
 7 files changed, 4 insertions(+), 67 deletions(-)
 delete mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/icon.png

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/icon.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/icon.png
deleted file mode 100644
index 62ba976b34330e5699ee911ef450df92870261ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800046Nkl<ZSP5hN
z|NlS3Kmw+Lv>asjr~^hrVBkYQR!;hVaB%Q|<wYhlQws(meu)9gjf^s~QvZ=1F?-%r
zMv!YjAp;U$yLK&@Pb(KP!b(C|G=M^5$DR!gFh{{0L~{qgEP(kO<`9th<3~?v778pd
zi(xd(=de%!iGv&kqG{m}3<rQL0$C2Sj5W>yY_T6OEr0+m90E@RU>k4{aEE*q2CF!A
z`UIG!Mu-sQ0GPW#4w3bE&tSM#g=!8V$pQErLT;8N%K_LN0?IY-KE41;ky3V0C3`6@
z)dMG1=RG!H2aw_rsyF~vm?<sO|DR;`m*HWXJ<$%KssmtALyALa;sBUKTJGq8qXs=h
zK-oBbpCChx$`wYe1rf{uN@<V<ATwI3AP!-GMhz&(FfiN%8&8!G0GR|!2Vhfi5U>yd
xNy8jR6$cPwISx0CHp@pt09Vo&6{lYa001)9rQj-}iBJFl002ovPDHLkV1oXTk9Yt8

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/meta.json
index a0b646eb8cdb94..ebe2f0bbbd70c5 100644
--- a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/meta.json
+++ b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/meta.json
@@ -1,28 +1,17 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff and modified by Jackal298, 'on-' states by iaada (github).",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a9451f4d22f233d328b63490c2bcf64a640e42ff and modified by Jackal298, recolor by iaada (github).",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-    {
-      "name": "icon"
-    },
     {
       "name": "off-icon"
     },
     {
-      "name": "on-icon",
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ]
-	  ]
+      "name": "on-icon"
     },
     {
       "name": "equipped-BELT",
@@ -34,33 +23,7 @@
     },
     {
       "name": "on-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "off-inhand-right",
@@ -68,33 +31,7 @@
     },
     {
       "name": "on-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "equipped-BACKPACK",
diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-icon.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-icon.png
index 62ba976b34330e5699ee911ef450df92870261ed..dd15a421db3150044d27cf4c5aec23875dd8f1b4 100644
GIT binary patch
delta 364
zcmV-y0h9id1BU~UB!5mxL_t(oh3(a`O2beT#_|6VJ2?~zLaD8LT_qvlTcqe*?C1mN
zW4L4ztGfh>E**-9Q)wTeTT7vnDB`4W9PE{9BHT)@MaTzPE;rm?&dEt2Po6xhPPJCi
zFbq{y`RfZ{&G!OI#q!DuAk|t$7ZGReNC0ZvTk3lOaU6@Y!+%8(Q;J5Tp#Y^~nQpIx
zK^c&9fQfl>0|A(fr%n(e!ut2c#lw9s_(ZvaBme;2UWdteDiXC6AjBOc(Sp=X26Fod
zz+l)X3rK1U(xOM_0wA=szOjivU(cc<R)7TLB?<ZM$Xd1F$D5-MNd0C+saWRWX$D{o
z5fL(Znd%qE3T3c&{|sOa$qZnsxN~`;qvkHn!#gWT<^U60h%<mmfhz?PkioFeY<$X_
z9LQ2ruxwu07l1;WFA(1gxSsFH?2BeIO{O9SC*tfsmnTo2f0TDVukdtcC#V7d0000<
KMNUMnLSTX{IHMf^

delta 376
zcmV-;0f+vF1Cs-gB!5~-L_t(o31j^K|3AY(0;Ykq9Ax*X14ct&;6p%GPWpdvaPWZT
zMJ6*-3kD&6i2=)vj54xP|B)Rrd)`z=kZV980}@}mb}g7sD;F}tN<vsPfI?%(o(&8z
zN5LFKa|ggIfcYHe5RmxeM^9-M3M?>-VKmI=uuuSrgB%5-X@B7m3<rQL0$C2Sj5W>y
zY_T6OEr0+m90E@RU>k4{aEE*q2CF!A`UIG!Mu-sQ0GPW#4w3bE&tSM#g=!8V$pQEr
zLT;8N%K_LN0?IY-KE41;ky3V0C3`6@)dMG1=RG!H2aw_rsyF~vm?<sO|DR;`m*HWX
zJ<$%KssmtALve~jXyO2vLt5_WfTIRIL_pa%eV-shjmi~9tOXIw07_|)1t2q8svr(w
zfJO}{$1pJ51RGD45CEA3O9x<6aS*T&0ZGFgM->MUV>u2tjW)|iLjYIO7!{{q2mk;w
W)}`PoqKQxd0000<MNUMnLSTYY^NlnB

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-inhand-left.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-inhand-left.png
index 39f26b42fc23191670f44c02367063f57751ca45..35cb582c16ec901f50c9584cc9d631dc608b8585 100644
GIT binary patch
delta 427
zcmV;c0aX6L1jGZ7BYy#lNkl<Zc%1Fpu}Z^G6b9hGl3j3;kc=HN`vQ(GE*YGgk}0_7
z8M=#;w4F0#adGqooHKN^h#&|KZo+Z8Aq0zQa_>zp{NGk6x#yhQX88|5L_|bHL_|b1
zAwlSi=`&7DAJCU-K8|DKL(ncwvbyLYw;0E<*!UG_l_r@4p?@#UA?V=5AnF^tTWY;I
zlg-a`JVgCZtLr(c?+@U1t>w8k3@WtQH~>`1%9+NMUInK~CZAvLPB-35nq-nDnRrr2
zw8^LcQtF`7&8au~c6|u|_?g{I_QqAM51ac=HU9Y}PYPKqpX<*qG_H732mrL}KUDj{
zhSY-qHyUqqy?=fpA|fIpA|fIpB65Q5g@*Qdqc2nhp)a<IP;q?oyknzu?SX;H45P;#
z0H7>OBcX(9be~@#SUq9?`qt|lV~I&~5ND_7owK_Cw09APG!GaYfD&zT*)1;Wtgi1M
zOzk3A%gl}qEfv$d2-ZWxuAyZ!lAmv1j4feIE;Y5iizG1m0LI=$7<~W$vwR{N&o8df
Vxl8t)UqAo=002ovPDHLkV1kBI#+Cp8

delta 552
zcmX@Ye1K(way=8fr;B4q1>@UUhTcaEB-$3=)3cIY)bYT#>A|C_e{EJ>&5xe=3(R4u
zZ<_o<p|7k=aL-j&fjNExmJ?^Qls|o9UE#gnWO~f3FHsenmt@X*UwvQQclvs-jT0F-
zCtxCnRt}x@I=oJ&XY$THU}|^9J+NLxrfId?+g*#BAG?_JWXQ`ID?aO9BQI=qXUYum
zi<umDo31jkl&#r#|J$x&#k1#s+>o7f`T1S*tGnX^_M6M<7uIGNAJtGX$&C@(`+l!T
zSGtgN(ml@&bKbw7zi*Q4^f33w4L1+8`u6kRe&y+IYjgJMEsH-<dl@qyZ~Cz1Yt~ji
z&-znu7JmKo>yTISJLmMfy$6q1T3^())?0h(m}1zL)1_hi{i^jCI2#;_)<)|Thvt@E
zj}KjU#g$3L0XH&mV)%M!;%r9tn>9BJ4_x`VaOsrTX&fgfpEb|ajE$B!xjlW~?y}vM
zYtH1{UCUoD-}m@NH6JI>;=gmJW!aToO@Dt{v;VS^G27Bh3S!S^pV}6d-qpLE`@fQi
zq5jS$#s)#g!X1C7UwIYdxTM!RCtmgE0|o}BtyZ@esa|XSC%({x!GJ};NG`m@b!N2I
z<#5LTt{Soo4ljOfDHK+T?eTo)FWaz3@MdygTcN`&D+a+N#cCaeS+=0K`l0lJKU06_
UrGhZyNen>X>FVdQ&MBb@0P8sL$N&HU

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-inhand-right.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/off-inhand-right.png
index 6a365e772831904f5c7f0510d8e18b824333bcba..9338415aca0b24df0562952e7b4ff18ed1d9d79e 100644
GIT binary patch
delta 430
zcmV;f0a5<21jqxBB!7=dL_t(|obB2_OT$1I2Jokn%|Q?Z3CUP6uA(@WPA)DtI5#0v
zzd$}i_u?c?=L}t39Q^{$9lAO=3GTw{bPz(p{JFa{<@wFI_wJsiS>6{QA|fIpA|fI>
zB0=cOf6tt_I7lCqQUcTqVXyMSG@iFB(xV{sMTgLdQc8l*mw%yzVC2$eLFfyXi5N@N
zfhOl1)vmfsBs#r7^tuB8Y&M(vYY$lCOGJ4l0FEYz)`u?#aej7*m;8CqL9`a-nRrr2
z8qWvwp)51@t9eog0L+qi05JMS=wNNUWyT9ug8+c_YJ%U<Q|-MxDWtj{K%*LUS^MAW
zAb@rU@4B9dh<}KPh=_=Yh={18YS-0uw|F|8_S<<X4^8N~0aqa?rR3^*Y<#cQ4Tm7~
z<uiLguz17W?Y*@wu?~3qI0gW0<Au?EIu+9)*q9qg<GFnQd|A7=W~`{GxdGh>U9Tn>
zuRp9^Tr*z0>D++JM(94)Hi_~~cC(vW?eabwq1HFEIVU$@g0sVzm>aOc`R45V6VW00
Y0|dgiOf?$yG5`Po07*qoM6N<$f(ug4ivR!s

delta 535
zcmX@Xyn$tcO8s|F7srqa#<#b2dmV8QVSDiL5_eelj*bUS8XRJJW!fv(Bx{OkhuJkH
zsQ%yxTQqfPC0lMT%fT$xjkmo%GP+nY+w&+++L?Fa)AE_VX2s9u=wH-5r*X8INn`;7
ztA+z3S3m=t=`-;_QTfa5>*n0tC4K8x?Y!r^Dx_QLPf4BaR6l$<>f|W}-nc1$8U?1b
zu}n<Jb?gY*qN#TDygaXo)0YR&oCNK6Ke0^Sy-uOz`~EB6{?3{gB+~jd=C<jq9p`s;
zT-~kv_kTi^!W_mAQ+zs(w)XAXxA#+D>kQwXgPz<+3je#;#_*N=%WdXhI}p5EBKMVj
zuZX}8R<A~B-Us#e96R?FeOqy^di}L*PBjI?c(>^iMf=Yt&Yj|G@L6t;V9{Cij~9NX
z>HYCR@eGo`K+F#U8s)L4pUWxEU6vAg?TsC4@#Pi~`CQ>9*5)<a_g(DfdvI4`;-ll$
zwpS}9R{lG;&g-h)@#t?gAC}e6yvHBEr+8fv9~WDT$ZxhK@;`pshOOjccN1V}I+3yM
z^wT@vdmWTRes!Ar7i)bJo_^<yvJ^wpECI9MY-%?-T>G9$$TA#^{l;r@lf##dfkULd
zth`Ik{@N$W$;=8Xjap*L@0vG67#{CrRLFEVvGe>s#v>0sfId-ZJ0P#@wrQilD-B~&
P1|aZs^>bP0l+XkKpz`Wb

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-icon.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-icon.png
index f200ccef479db2991c222355f7a48ee82941c35d..665c53dd15203175f4926bb7e67129da421029a7 100644
GIT binary patch
literal 369
zcmV-%0gnEOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003vNkl<ZScUD=
zu}Z^G6oBFXNHdnwOr^HIMMKxD4n-0d7r{~A$4L-$6Ktuvbm#+=_929pij&2`slsvb
zN@${7<X(%AAF^aQU(UUOva+&m*J?L4NfK36{`vvfi8@`vT4QSqkXE~?S;WQVxd62H
zb~WmB>G%8MZMX<xR*|Nu0)({&qwx@fG9d2&llgK30a(nJUJxQeW%Ffrc+}~Bp?pDd
z0D#eW$YQ>f;~-FgsMqrb$sIva2J-d^na(D-fD|4<QP=CW7|3C@3ULg$*@zWj6LMPs
z`Ry-jbp+pKHgXlmgtZ1Qug?J15D~%2WxA`^72x6E2*4WR3}Ci+ABMWWT5)=EW(9E$
zFxf)90Zi{A3gjTu*@VZ%69I@<z)z5y!N48B29bpTR8&RWjV~)J`^S9%U5E3-2(m)(
P00000NkvXXu0mjfDe0rd

literal 778
zcmV+l1NHogP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008fNkl<Zc%1E;
zF-sd^7{`C7?V^L2W)N#E9(DCFVu(;^p-ZMB$xtxRAyE1q`T+|40G$fi40H&HQ;;BZ
zszf4~DK3UYgbrz?gKlyia(A3DDHn6^y;7eaguo5?{qK37_r1V9AP9mW2oINq#Jru&
zW^LQHiTZON{1d75G_jdEZ402=Z!9F{ZGVWb#V-axV)3b+T2E6hmknid!$7y+a9bgl
z%h>?2nK>%e9dBjaK&k@h_Im|zaVzfz0XXZND+%E*fG+=|{)>KjYCY|RQW-?2|5gD2
zD%Bm%I_JjYcdu-KHxU;iO8>1bFbFTm<r4sEhX;faWY89f+CQ)Z`blIirU7;<TqZIX
zq=>d7RQdxI;B@Qw3c$pg2I9NZzuNslR6ep)`U7o&e$0|J1;o!Pv+YFYg4ObKVl#96
z{__(caFC!|K&5}I6<gX~Sp?!h9pH8K1wh~+hB02lgyA2%WtX;BrkoIQpk7E_)Bf}_
zP>^v85QaaLJ!{*x*Oozpm?bL-G+X(`RY?A~z>g9A%b^v(_rqQx3aRTla4Sgd@PH5d
zvlMHSYps0aC@jBW7&kg1h(FL%U=*AayJMEDZm~A`42Ty#ey;=I1nK?5I|*Cu7Q*#!
z1o4OV*cx`459$bjVr_B_=(h5Wjw-*?5#H7q<X8UR-o<xfyL9OlVC*v>p#MF+r^TA{
z-6hHbI3e6_i0sCP_%~Yl#<!^bf*=TjAP9mW2=@ow@8@;<Wj;Xn`+41dnGewYeqOg<
z<^u*@l=*-@WIjOV17tqn1~MPuaF_S<{+oV~^8sebN}g^VADJa<vz2e`MD6zz+I+y$
z_DT|HjuJ${d_dqrm?diy=m5?CYChmD{?H5HgxCc3{uN~P^NErIjOtf9A22KkL^B`Y
zWRUp)pFc@&?|c4<DC7XnN-sO&CXkGBM!@m!>GBJLAPD!7zZoD;ydY%kPXGV_07*qo
IM6N<$f&;i}vj6}9

diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png b/Resources/Textures/_Impstation/Objects/Weapons/Melee/energykatana.rsi/on-inhand-right.png
index cf18f5feccc35e55379ede605975eaaa51c3b4cc..05e721d17965924f7057a04903a5235f35f4c829 100644
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004dNkl<Zc%1Fp
zy-LJD6b0a;#B!0bl8}^w_!he_AY5!038XO(lx>9I3k0^Y-N#WZT&z=EtAP*%^D{G>
zEa!vmGLt)JlQj1NL_|bHL_|bHXCz5u{qLH~5QUtAh$zr6gg><x=2<arlM_nPSZxTC
zh=?X>tV;>O$)VelG}dhtsk1}_7*gj&-wU@<q))3A-qvdXKwa0p*Us7CL+p)F0A~}#
z=;GT!++5${wJH}K#AthCv;j2Fip6{=+noJt4WIz<k`(~p^og*+`gqEmZ`ch20CrW0
zs{!|F0PU^^FldjyyuG(J2w+^{Q`Zv_5fKp)5fKp)5lz(Xx`yr+Z#J9LcAnZp6LxMO
zR0txX_YZgTX}yJ-8xRo{5#1Z3wjt}%q>f9H#=8Faf{(d@JS+73=M&F|0|4Ohc=Xa8
za<-|fxdGb<-Bl&tjq!GH%lYO*=LSMHLW3GIH_!lTf1&ELyr=AQZoq|L#kiOo@FDok
e+4m=+Ir#-iVx~N8nq}?)0000<MNUMnLSTZj<ilhD

literal 1001
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVBX;A;uumf=k4A7-qMLO$3OPl
zPunHZ<;>~%bb()Mvs*#IMvhD8t{Ylt?0O*|AYdiR^_P8DM9Hp=dVNcqS6>igVqMsp
zpncRa%4*B(nD%>~Ld9mYs^`5Ay}#ab(v0us)72k+dNL7c8v?{IUyV{dSr-=<<9n`J
z=kMz4_M)zVL2E;WRx7@^{VjBD=%kCSH<v`MRtXfDStImf_iO&IzYl<fzP)IFw|}3u
z=dFA9-u*7`cDV2R-^pL-$io>+;wSm&vHX4XTm0YCl8!=8_L~aZ^X^?+y>@yWP&n!L
zbh%x%6PCUdmbIBbRb?`_<Nr^88{2swedt^Aap}v+<&&(~I3E?Pxtj4$Zj0mn*!>->
z6V@In^n4}fGD+=P`PY(9$q(oEDDZ`=91Z(h(kAKI-uAa~U45eSQ(h&{+11LyYu!HA
z2CkKRd#Clm%J}J9-tU$_l4x6f?{r+f`216SjzPzP3cN3_o%HRx%G)3B*b8@D$}%x8
z`t=zo+<LlBb4fktCjXS<x%+O3?>#Ttt#)gRuG?kvL%aA9LB`OqdP!}&_TQp!?XgEU
z_x6N|H}1=g58IvjQu@1Yyh-ivI?c8P@lCEk9slZ2cdstHALM#Jvwq9<-t%^My?1?|
z?mcN+Opn9;P4|l#bKdp(=&pTV_C{adZf^g+{dMQxv!B>kw&bl^{_oc>Z-4h*sB?SP
z%)>WIYad?!TFQ*%2nL2fFYcATs@}{}d%N!VcHf9O+5Y#p)u%~Je}3!o_sjAx9-PQp
zJ4wcN#+2^jw=aLc6gOG}VeGcB-Z23zwA;qIVgZ<CEuD1%A{4{GJU81u!TP&Jr93Qr
z_pRIi+1`7)?e%>N%HBDBxU$~+*7v*ok2cJ+eZPO*{`dbw{MkJ#Z-0+#`ZsHd?ESyM
z$cgHG=H^#_FLk%ct-hl5<@cYhuD$p>Ch_*pjoXf9{Bn!<&WPfZZO@)P^YLH0EWW0G
z$9;CUz$rD>zoJU^=YP5TrCLtrrtGvO{QdUcyA(~i<~Qz3v@d7W(O;)_zg})>qUWWS
zC6ALn|9tWL<@`v7o8f&vYu>+ld+$W%jjw5Lzs&w#+|%53`E%CX{Mc8^=jSEe*zjui
zi)l;kMUEuytv;OaYw`5j;^$vgZF5X#`Q5AdRnHqK9}?5_PuMem*YBIlPJJ=dUU#n}
zZhgGmy&pj@x5lrlRbGCT$8NXS+e?p}fIisqmA&le9U0Bk(32qlc)I$ztaD0e0ss#f
B_uT*h


From ea113cfb3b725f14e45701a8eafd1be14ed6b8b3 Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Sat, 4 Jan 2025 00:38:50 -0600
Subject: [PATCH 08/11] ninja role gets a different sword

---
 Resources/Prototypes/Roles/Antags/ninja.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml
index 6a9a65bb13ec87..b5f9fab6f3fa64 100644
--- a/Resources/Prototypes/Roles/Antags/ninja.yml
+++ b/Resources/Prototypes/Roles/Antags/ninja.yml
@@ -22,7 +22,7 @@
     ears: ClothingHeadsetGrey
     pocket1: SpiderCharge
     pocket2: PinpointerStation
-    belt: EnergyKatana
+    belt: EnergyKatanaStun
   inhand:
     - JetpackBlackFilled
   storage:

From b9e68c9a1f1522cb6d6d28fd41b41e7c0dccc9d1 Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Sat, 4 Jan 2025 01:06:14 -0600
Subject: [PATCH 09/11] comment

---
 Resources/Prototypes/Roles/Antags/ninja.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml
index b5f9fab6f3fa64..b4a9d64c08d2bb 100644
--- a/Resources/Prototypes/Roles/Antags/ninja.yml
+++ b/Resources/Prototypes/Roles/Antags/ninja.yml
@@ -22,7 +22,7 @@
     ears: ClothingHeadsetGrey
     pocket1: SpiderCharge
     pocket2: PinpointerStation
-    belt: EnergyKatanaStun
+    belt: EnergyKatanaStun # imp
   inhand:
     - JetpackBlackFilled
   storage:

From eac8bc21eff719ac2356a7081f81aefb8aca7493 Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Sat, 4 Jan 2025 01:20:35 -0600
Subject: [PATCH 10/11] oops

---
 .../{off-inhand-left.png => inhand-left.png}        | Bin
 .../{off-inhand-right.png => inhand-right.png}      | Bin
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/{off-inhand-left.png => inhand-left.png} (100%)
 rename Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/{off-inhand-right.png => inhand-right.png} (100%)

diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-inhand-left.png
rename to Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/off-inhand-right.png
rename to Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/inhand-right.png

From 335e52da8e3d0cd8024e59dc11029ab7fb4613c8 Mon Sep 17 00:00:00 2001
From: aada <ss.adasts@gmail.com>
Date: Sat, 4 Jan 2025 01:48:19 -0600
Subject: [PATCH 11/11] add ItemToggleDamageOtherOnHit

---
 .../_Impstation/Entities/Objects/Weapons/Melee/sword.yml         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml
index 93865b6373bf6d..4564da1eac9d04 100644
--- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/sword.yml
@@ -53,6 +53,7 @@
   - type: Reflect
   - type: ThrowingAngle
     angle: 300
+  - type: ItemToggleDamageOtherOnHit
   - type: ItemToggle
     predictable: false
     soundActivate: