From 44d849d3f63a366f94992c5ee56cd4d528842626 Mon Sep 17 00:00:00 2001
From: Lamrr <96937466+Lamrr@users.noreply.github.com>
Date: Tue, 11 Jan 2022 17:50:10 +1100
Subject: [PATCH] (Re)adds captain's sabre (#6101)

---
 .../Prototypes/Catalog/Fills/Items/belt.yml   |   9 ++++
 .../Catalog/Fills/Lockers/heads.yml           |   1 +
 .../Entities/Clothing/Belt/belts.yml          |  47 ------------------
 .../Belt/sheath.rsi/equipped-BELT.png         | Bin 0 -> 511 bytes
 .../Clothing/Belt/sheath.rsi/meta.json        |  28 +----------
 .../Clothing/Belt/sheath.rsi/sheath-bag.png   | Bin 202 -> 0 bytes
 .../Belt/sheath.rsi/sheath-carrot.png         | Bin 250 -> 0 bytes
 .../Belt/sheath.rsi/sheath-crowbar.png        | Bin 241 -> 0 bytes
 .../Belt/sheath.rsi/sheath-crowbarr.png       | Bin 263 -> 0 bytes
 .../Belt/sheath.rsi/sheath-equipped-BELT.png  | Bin 315 -> 0 bytes
 .../Belt/sheath.rsi/sheath-katana.png         | Bin 202 -> 0 bytes
 .../Clothing/Belt/sheath.rsi/sheath-knife.png | Bin 149 -> 0 bytes
 .../Clothing/Belt/sheath.rsi/sheath-mop.png   | Bin 304 -> 0 bytes
 .../Clothing/Belt/sheath.rsi/sheath-rod.png   | Bin 150 -> 0 bytes
 .../sheath.rsi/sheath-sabre-equipped-BELT.png | Bin 500 -> 609 bytes
 .../Clothing/Belt/sheath.rsi/sheath-sabre.png | Bin 291 -> 670 bytes
 .../Clothing/Belt/sheath.rsi/sheath.png       | Bin 277 -> 672 bytes
 .../Weapons/Melee/captain_sabre.rsi/icon.png  | Bin 447 -> 353 bytes
 .../Melee/captain_sabre.rsi/inhand-left.png   | Bin 340 -> 353 bytes
 .../Melee/captain_sabre.rsi/inhand-right.png  | Bin 321 -> 347 bytes
 .../Weapons/Melee/captain_sabre.rsi/meta.json |   2 +-
 21 files changed, 13 insertions(+), 74 deletions(-)
 create mode 100644 Resources/Textures/Clothing/Belt/sheath.rsi/equipped-BELT.png
 delete mode 100644 Resources/Textures/Clothing/Belt/sheath.rsi/sheath-bag.png
 delete mode 100644 Resources/Textures/Clothing/Belt/sheath.rsi/sheath-carrot.png
 delete mode 100644 Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbar.png
 delete mode 100644 Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbarr.png
 delete mode 100644 Resources/Textures/Clothing/Belt/sheath.rsi/sheath-equipped-BELT.png
 delete mode 100644 Resources/Textures/Clothing/Belt/sheath.rsi/sheath-katana.png
 delete mode 100644 Resources/Textures/Clothing/Belt/sheath.rsi/sheath-knife.png
 delete mode 100644 Resources/Textures/Clothing/Belt/sheath.rsi/sheath-mop.png
 delete mode 100644 Resources/Textures/Clothing/Belt/sheath.rsi/sheath-rod.png

diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 3ec8204e46..01a8e7e951 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -74,3 +74,12 @@
     - id: HydroponicsToolMiniHoe
     - id: HydroponicsToolSpade
     - id: RobustHarvestChemistryBottle
+
+- type: entity
+  id: ClothingBeltSheathFilled
+  parent: ClothingBeltSheath
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CaptainSabre
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 4310ce43f1..7f7f28b69c 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -61,6 +61,7 @@
         prob: 0.1
       - id: CigarGoldCase
         prob: 0.25
+      - id: ClothingBeltSheathFilled
 
 - type: entity
   id: LockerHeadOfPersonnelFilled
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 6da8411f77..f41ee76e5b 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -384,55 +384,8 @@
     whitelist:
       tags:
         - CaptainSabre
-        - Baguette
-        - Carrot
-        - Crowbar
-        - Katana
-        - Machete
-        - CombatKnife
-        - RodMetal1
-        - Spear
-      components:
-        - Mop
-  - type: StorageFill
-    contents:
-      - id: CaptainSabre
   - type: ItemMapper
     mapLayers:
-      sheath-bag:
-        whitelist:
-          tags:
-          - Baguette
-      sheath-carrot:
-        whitelist:
-          tags:
-          - Carrot
-      sheath-crowbar:
-        whitelist:
-          tags:
-          - Crowbar
-      sheath-crowbarr:
-        whitelist:
-          tags:
-          - CrowbarRed
-      sheath-katana:
-        whitelist:
-          tags:
-          - Katana
-      sheath-knife:
-        whitelist:
-          tags:
-          - Machete
-          - CombatKnife
-      sheath-mop:
-        whitelist:
-          components:
-          - Mop
-      sheath-rod:
-        whitelist:
-          tags:
-          - RodMetal1
-          - Spear
       sheath-sabre:
         whitelist:
           tags:
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/sheath.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea9b5643cad7be0fd2ffa35af7b73a779ff20305
GIT binary patch
literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005TNkl<Zc-rmS
zF-yZh7zW@st%@QQjDwWW!2~jv4xI!cPJ)B0lm8)u|G<t8?qUX=baaqz76hjZC5wYl
z2Zy4d1&gFu<#Ui0!9ip1Y-8VN4P5Tt%N>F51Bi%-h=_=Yh=}O7LdTJ`&3QuAK!N2-
z)Jfl_B?`bRmIVOTmKOm4n;TC!KApqe$rXyzZ`hulM`M3Q?DY#n^+bKsmU=e^02Ing
zU!LDSyZ``dQD_V$N#C@kake5ljzQ=+;+wX3xxDzMJ-WxtH*E<lS9u75<%*ZfYgu?k
z<zRb{4I_$Q5p}Z4F2vArB#K|PZCXb4fS*H9A?jpN@5ZRLn?@=E`0W0AXP~d3+d9#@
z`&v~irGd|_Z`vXUvjQR_A|fIpA|fIp8e_VuM5$T4t{P;jLhwynNeB~Z44~F-8p!1Z
zt(k$xN?dRAie>55;I~$n`#bPg^?9#Ymcqi+$2-FtlqP4e_t@yq=ji;>7~A8}Yv4#C
zad9-TTp6|FQ18ZwI$7*Kx1cqEz;Z{jT3c&3jl-w*ulf=)Nf+Pi)A=tU{3w9?>z)4M
zbu}ss`%C!tqN!F&srm8fU5tY^Xr!8o1`VPy@D6V}+UiG|kM;ln002ovPDHLkV1m+U
B@00)l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json b/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json
index 315422c42d..e549767f3a 100644
--- a/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json
@@ -1,44 +1,20 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-        "name": "sheath-equipped-BELT",
+        "name": "equipped-BELT",
         "directions": 4
     },
     {
         "name": "sheath-sabre-equipped-BELT",
         "directions": 4
     },
-    {
-        "name": "sheath-bag"
-    },
-    {
-        "name": "sheath-carrot"
-    },
-    {
-        "name": "sheath-crowbar"
-    },
-    {
-        "name": "sheath-crowbarr"
-    },
-    {
-        "name": "sheath-katana"
-    },
-    {
-        "name": "sheath-knife"
-    },
-    {
-        "name": "sheath-mop"
-    },
-    {
-        "name": "sheath-rod"
-    },
     {
         "name": "sheath-sabre"
     },
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-bag.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-bag.png
deleted file mode 100644
index 81091d9a6182f88b80cd71372a4db944c3c5aeaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJiJmTwArY;~60D08jxf9BFm5n%
z{JMX_7M8=im+MO$62Eh7Ra;a8=XA?CGG}<!y}V}9udrrc_SL5;6T(D)tWR2T?!({X
z@odTRsced;Sxq=O=O}*o@{PUC`gy+52d+&9F}FWAB$jV|TOVb?pv}<Az|){(ck%I$
z|NrZM-L&U&JE#G&SEQ#Y(16R0@h<~2Gc$wUOT}Ls_gysyI*!59)z4*}Q$iB}b{$Pp

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-carrot.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-carrot.png
deleted file mode 100644
index f9c3f6d753a002957b4280af1dfd078d0bab9e04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJgPtyqArY;~60D087BDK?{r(!Z
z>u-J0e`#iUd+o!`XZ}`P4HAvW`}&Ljkb?0{uQLZtiZxr7Nl%!S!M`n_tm|<7HZSg3
zk>^@`1F9zdtv4%EW9x0z`(ODZQZnM^My<uR7oy($`tP#tZ~bQ9dH?@kv;On{|9|_#
z|0P$3l=8+Mc3Ak~^>hC=$?E-v2Br?eiNDs=UnyZYIED9<X`7nctJDt0t{9^OlNe0R
y3ZxDQDJ@PA>1hfy;Bq^t0d#Le&Vd657#JFMTh4!bDf$@DGYp=telF{r5}E*GylHv>

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbar.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbar.png
deleted file mode 100644
index c7e735941f72f4ed9345860e75884f78f8416b73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ9iA?ZArY-_Ct33yRuFIz*Y3UC
zI_=&|3+8i;7Ch`-JKgSFwu+5WlTuk@Y8rA=UGbx4S{a+rKRMB48>0{R>MIo#S&p7R
zxAR$L?2aGF^ZfgFtoGfK_TbU{+T~M%;%+=%=eN}KR8)1x{_VYSuV<;gyX<1V_N7(d
zmzZfW?%TO`RCLNrKFpGNc5+6X`#Of;YX>-Z4o0k8%+A~*u+dQM_&MwKJ|#bUoCTXW
n;~Z0+4z?(8G=Y#wdq>?5w=Dl3Zx7T1{lMVq>gTe~DWM4fgqLBK

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbarr.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-crowbarr.png
deleted file mode 100644
index c763911d14d2bb98a2f719250dce24254bf957cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 263
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJbDl1aArY;~60FK{2LJMZ@bfeO
zE&cU>BJ-1^3$AV{cFD}jR}Xiy-YimgcNg)TAhAn%1@DXry8plZwLW}#x&J|lBW#@u
z+qtgFHst*LUH)Do@7^xfV+v-rGK_spDW?-1`8I{b`t~+DdUPy&{;PC`@(MZG2O19^
zJvlOg!II^P!nMfF67T;1<1J&+We`5GsP^}FV-Ig{<A$0ZnL7$Q4_8(3OqY<5h^ha(
z$TO)W-Fe2*h~Qe=5JP2O<0Bdptcw#wdYS?axZDnENOU$dHZn47u1dMR{+X={&}R&u
Lu6{1-oD!M<_I73|

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-equipped-BELT.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-equipped-BELT.png
deleted file mode 100644
index eb54d79fd53baea52acc921dd23fe82370c3175f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}W-iaSW-L^Y+$3-a`gFtq<A5
z(-LgU771~eH2NLb=)J*#?ZrVEFI5MRt(-y0U+SMXy_tR?%t8og01#}*(%PFFdpM2l
z<f*S2WtM+jId-2o+MHtUxp;}*kDFm{mBrID|LN>3UvAx?_+e?ZmF=r9*Ix4}oPJe)
zDep?m`gZLGoz?%(1#bt@`#at=U1iv0|9SQ6^MB54KYj4j*BP72Aoeh1M1R|Veszl6
z%y9pzP5oz_AAj^WGLL_&b5rx>gOZO|SEb(ncK(ok<FwiT(|Y8&7Ce2n^k<z2uVRVI
zG9Yv3whWGU!b)q+_4ms4{J7bDGo<Qt+4lc0cQ&lauV9FIx5A><#di9H2_U;XUHx3v
IIVCg!0N;6!VE_OC

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-katana.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-katana.png
deleted file mode 100644
index ba44c6a143487ac6fad3ef8b8de1fc624c001452..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJiJmTwArY;~5+(;OIQ+KfxP05z
zhbQ24?47w1N0uIueDRh;OrY@Jp-?wAHnt7Q2l$c_e(;Mf?q_DZB&c&@PGbQJ_b!IL
zvW*WJs;rq-GjFgw<p1Jky*a;P+ni0iOFZWkFr1oJ=hyUqd5Px#|NrN|JIcb$yy+?P
zBZidI>_-?ECy4Yk1sZU<9n_FuU7S$C477ydqd};pefpVoK*uq7y85}Sb4q9e0PFHd
A+5i9m

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-knife.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-knife.png
deleted file mode 100644
index b85a4db7b248b945db3cb56f614eac8cb42e97eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7*7|+kcif|7Zv#$3<O**YVtL%
zJ=}2Y8;7m4?e;gN8(6#pymv5!N(=nIDf@A<XhXcWX4JXGm1br6$1^3D+<PJ^7}dP#
uT-lrHC2UuBnSR%s$6<WkA80Ov{KOLGE^A@o{w}3CAik%opUXO@geCxL3^HQ?

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-mop.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-mop.png
deleted file mode 100644
index 5f311b7cac8c6a00446242ce49929d8766940349..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ@18D>ArY;~HU$qDn5}LU#s2<(
zP<XrK8{H5|2NRAG^?ykv1qBBJyfqV?uJLb@aB0>FogmtHc?*lqi?r$I(wVKD;-Uo3
z)PMNFdqZ&P=lcyuBv-x_6HD<HO}T%#)`$OoGlK<}L*ZG5ueu!0GRjQfZ9CdlE;LKv
zS-bPAe45}HK?8P$&yEkiIBBnPXS5Miist!jy2&|1RMyAf{$U;0ex?$$tFjEI?i+MF
ze(ZT85EaG4{2+#*h^3`|>cTH9x9gw$VBa`9SyJ-aI_pyfv)K3!L<uco=Jb5||5cV&
zPft&XfAiu5k)EbN11`6N8WOBP4v#@XLIMMW-0tG4r|N&!0)v3T)78&qol`;+02p*~
AhX4Qo

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-rod.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-rod.png
deleted file mode 100644
index 14e533d06205430b24d2c67e6c03527495d26a96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJSWg$nkcif|mkqfN7;v;E-Y&Li
z<+F@@G0{seyHIzMPwnOZjolqKJcbWef0v6~b$Cwb<-2d?oP{2(m{r-xQ@Azl{G6v}
x)-z5~oYpO>xXpX&`Heh+ioYd*CO1r&xp!%p<cE_7qkMr}22WQ%mvv4FO#p1<H-rEH

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre-equipped-BELT.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre-equipped-BELT.png
index b11ba9b56bb89bf6a4b19030aff51b39a349e134..a1e69cd243c531f59e4240aac44459f0bf3da9e4 100644
GIT binary patch
delta 585
zcmV-P0=E711K|XaBYy%YNkl<Zc-rmSv1=1i90&04C3Fx8;w^F<(s(BsB@M}P5J)G%
z!9}Qxow5m%`yZOop(2jCL0t^EXERXf;(_7TkWvr~6ilE&E||j4L9P^qVten^yYl_4
z2QQazUfzX#e*h5?5fKp)5fRaa_%%qs4aw{M7t$`^Z2+~Vjeky~EPgG2K^Q6)=`_mX
ztQTS3nqaG^X3b0n(0Wi80C?!#0RTLGe2nnp9`?WdzCIdT2tM40^Jq_b2)^maXcYqh
z?$+=9b^Yu2p8$Yi6dG5)1CleK{-lZ7i*Kk;CQ1VcU02@E1*27r>e>zL&JMD<%Y4(3
zz^+K>x=PQ2z<;htt7K_8UkWN0+npU4QG9}ES%j((Lf4fjKFRJ=;Jgr2h?Yf+RxyT)
zsga8S&N>?Jq}m0md0*?NuhpPi72kAH1<)#4BE6fr{gFjPL_|bHL_|bHl!}ffTKV7N
z{Wi3<#5$U2<pI>1HoOfzJ7B8^<Mo?0IO|1auc5qc>3=lJ^6K-UmKLYqh9pfi4jnwZ
zZ745dGx<IJGlXRQw8hJ%c0j9SNz&78Z+fRUko5D<8{w4=Nwi9qoUO~ZH$8dxX+Kv3
z8cIU&O-Dl4m1KZJ>meA}l}vSY!^PAXtztyWB3}NO>wO9Yb|sT-?Qk(Q-X1S5HJ4Dh
z=$lXGbV9C62>%qo(Rk<d&FdOe_}@F>{70MV$e>%zO;4X3jA;ina&6G9Y8$K~x<-Bh
X{QdJxR*F1^00000NkvXXu0mjf#HbiX

delta 475
zcmV<10VMw61oQ)tBYy$ANkl<Zc%1E;J!->15QU!tsRYL9tzOqrlM5JffgB{Y1HOPR
z;1j4aZiDN@xby}SS1KmOvOzWh@2*x@gWp#Qw0iTiD|Ti8LI@#*5JCtcaa1LwHMQJY
z$4#h8$ZP@u0MiueobV9yQa9S`J+M0>OD9PQrYWQweE^VUu755AqA^V&0{zBErEY6#
z`T2MS08F<ByU_e}AKPFBh-nJZ8u3elqP7C$6Tk+*dt~;EjiA4P2ICi<bIAv92dn}Y
zz7-o-C;001c7TTH16JP#R<93U4$u<)OMG;DIY3MF9U)n8)dAWsIlc93{^!dw7mXJ*
zLI@#*5JCtcgn!&AuJ<_fccQw(zEmZmD>BpV0qeb8qx*ccCAv#tu5%n)PIK?gCiu&Q
zA<A3HGT`y)IdcN55|V0eV0T2e-UBjFX+HTD5Tr3ao1Ze51z&GDzMCSAz@cbOEv6~X
zI>#xh$to(+|Fz6j2uFfWkM@>%?=wKN@x569@}jhH>Qsn|n)bBs61)Y*Y<x@`Kga=N
zHXg9&QK%DwMr6ipJYcnjI>CEFWbDQR=YtW+E={eeMcZkgbS^;ifCM4rD!(zz@xK;P
RbYlPj002ovPDHLkV1nEP)+PV|

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath-sabre.png
index 462d997cf38741230a9f06ceb448e9e9cd8f3575..7c8d5aab973f8b18ebed97592e0a89433eaae8db 100644
GIT binary patch
delta 646
zcmV;10(t$T0-gnsBYy&ANkl<ZSi|j?v1=1i9LGN|Ng)AaX%<PZXi4$595EmiK`25+
z&`pRS1tU^$h%tYFqeGyJTIeDzDU=LZgie`4px`2e&~7Pd<IskJRN4$F#OrfNU%aBW
z$t4#Tzti1uyx-@(zu)`4-@!kYu-@F$rzAjl)a3n_nivLv%YPa?JZcgiH3{8t^ZNFr
z>~@hAO_wX0E^PzkULcJtRkn`YY#q7T`Px0iil)n%kJm7~CUziP)|*15DhidV=oRAd
z)jom6aa$?y{OMt#QWfY^5(UAe6lM*8JGUUV{Hu00n?Ksi%paUx+jJn2)JR2<RtV*U
z3ZBl!ohicDGJm49u}3-^KL-II%o>TLMmig3eIax1>j$Au3S!HM92uF;#^Gt^45CUR
zsWCA<%lblw&!0l10?2oVI~@qa=fUur7iF~jKA?6)^sWZL#PlpcC-~f0`}J?n{XBS6
z767S0NE$v*ryi_uwu-Rr#GV8wZDasg$_0sxz~+e?fPY6%9+L;DAXM>{Tg}1jg5UF8
z2Y*n4kK|h09X;wN6$r_4tI4ygE*=(N5{oYNpMr~&e;bi1cyay!!)vnkU7{dXk54H!
z>cVy-x=hOQ4|99%oS(Rv8xurEe5@Xy_J0_4s~LY#Mn-(7;<Gy8r~^vHMqQL!%}()I
zofwJ(mw!3Y%U0~WtMv;pkha<n#K8KxU5J4mEOsCUKKJzs;mF|G3xs2nZ?_PRj^5os
zI6nJd2H|oV;BRePova>)pkkvg)I4GMJOmcUxqkCLd5}Z-{j$yzdel#))Bs?6cb}mG
gD2VOdef~@7CnA_U(-dr*djJ3c07*qoM6N<$f)vR$4FCWD

delta 265
zcmV+k0rvi$1)~CxBYyzuNkl<ZScUDCKMKMy6o)^>K@c1q9Q*?g4&BAg)dP41hu*=X
zIOqYqfP<qrc?kz~tq7vv5P2ynQK(Z}LEZ-;>05qZUYZugXVk~Y_(@YF*eq&x6fPlw
z(XMMcb<8Bd&P8RH{fAx?_GcKjpeTt%pxPeW`FN%DO(N^#Nq+<$r%h5!laTQ3td^-n
z#Vz6vEZ-ymBN8&p@ksb3XaKjY@?&I2&uC>|#LwMH2c(|+4M~%5H^dNM(?KrjDH876
zAT?JHfx;wY+z(SLBB5(w4up9M_!2JM)qRQFN&7E22}My9MNyRh0C)kJvyQxeb7Zgp
P0000<MNUMnLIPldlksz~

diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/sheath.png b/Resources/Textures/Clothing/Belt/sheath.rsi/sheath.png
index 5afd4c56b9f02dfc0a331fb38ce6aacc0e7c8fe6..fb1b2f0e8ae271d879751f4e227eb54692f1c91b 100644
GIT binary patch
delta 648
zcmV;30(bqD0-yzuB!9$uR9JLUVRs;Ka&Km7Y-J#Hd2nSQWq4_3004N}ZBS7T!ypL#
z=M+1F0xBNIu3fSl?D&I%P22P(K7nVR0BpbS2VMru3|yMjUTact=Z-@INsh5|PQ3FD
z3`z4#9S#AtM0%5_Qse!s=fl9Sp;0**$vcGQDs&Eixf#VrWPcr57i$>xFd}pzhr#f%
zQti^tBP?6GLi~UcH6MMN+;eWay|rkO5I4${l##?6AUg;&G|0*(TU0e>BIQDJC%TZQ
zJx#zL+$LEMfI&U>0004(Nkl<ZSi|j?F>At56ot==3T8;bETTdOp&8TQFK{Xyx^?Ih
zC><ON&ZVP2pnud+5QP4Sj9I&skg-CYs<>D%Lo6}A4r$s@T54Y2i;D*WA>`$LoO^PU
z2kgZ`!-htO4UMv_m3S0y53111Ay^<J9u6$7r%?NKrnSYa#a(|LJ*G4NJl}x>S+sM2
zR4wSLO$q>aix(1K)8!)ca>(3KDNS*+LSR-1te!!W8GmqBh3H_&z*fj@rA7h3T@?TT
zXBX$N0D5}sknbP@PT-4i!1iXu34FNz8tp+90HC!Lbk!zx0w2fnJ8mAYm@+`p+#Fl4
zwG`N$IrMUfhc^l*@Nsz{VYJ-9_GU!bTM%1*Z@waKiCG~qN-{>vjd%x=nJ`K+bUBJp
z(g~ps{C}2-pHAfBz<*98=Y&uI9uS1bIL!jV1t1FqHvm=$t^h0$+yT-;2mwd~Aq-$!
z2%!MmKnVXO`)h2+U)CaWknPO~lo|yhC)9o&hes!{07{Ufte!!&mV)Oe4*)QpOpz-<
i3^ATe_xsr|eE?jH<i^@oT7v)p002ovPDHLkU;%>Q7Z;rX

delta 249
zcmV<V00#e{1(gDjB!ApVL_t(|obA@J4T3-vfZ-owL!3dY+klqRSy;f<(j_chfCXGY
zD?@8#<pNk}W$`Q^N;I0|?j35vpHOjxFLxw7=<Dn2`=?TaeD&qB8cD(z5UD|~WiI7*
zEE%XGBHM)t$O1S5#pAMm{#`@cg#|?O8qr965!QfEh*p3Qh;r5dZG;m*6X6WdLU;i*
z5Z(Y^gbKh1p$2e8r~+IN>VUS0Ab?MZ*uduC{}Zz=0a=4AK{BeDqB+<MLIdiZU{YaT
z3U&m|Vgu7%&UruM1i<Bfud}mwo+mr~4t}~D{xoNcE=?B)00000NkvXXu0mjftIlk6

diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png
index 0874186095ef2d151a1cdd3da3c1d96c65e2e6e6..d4d1c3ca46ce624ae1f0cd9ca0bf72b7cc087a94 100644
GIT binary patch
delta 327
zcmV-N0l5CZ1K|RYBYy!XNkl<ZSi|ksJxjwt90u^GiKE}3gV8|1r9&X%+z;UB9LSPE
zOc%dEpwQx0vI^C~A*1Vo5L}wYK^GA#2nmI5f`f}Zof6_poV*kC{@dO1d+vWP9Pl4Y
zWI2BgAC40ii)9_aP>t{Gdhg~8)%doviPN)GecMHrvsf%S9DgU&xW+ZEagF~-g;A{W
zKaQsXm<Hfico@a<S3YpT*E^qS0ESV_>MNxLuL3kfh%8r!13=_i9Jt`av|ERe;TUcB
z)`kh17LrMcVkWS6<U>XXqYZz2dc*CriJKQ2$)uFl>9z0h%lml;0D3N1%mk!vK^v~D
z`i{-Wv)FfRwm@A+WrwhdkIsEu98a--0x2EoeC$GReO`|b4!gL%Dy89{0#r|Mb1V}F
ZfE6QgN|Jt33_Sn<002ovPDHLkV1iZ^nTr4b

delta 422
zcmV;X0a^ax0>1;0BYyw{b3#c}2nYxWd<bNS0004YNkl<ZScT=5u}Z^G7=@1-3+Z5+
zq(f%~2N4tz2g%f-lni|c7r`NmOP)b+6T!uYa0(fmd;kY^P;eK_6$&*=>2;`A5|buP
z^52W#KV6cL@5{L-B*1@~qw`Dt``EH7xZ`>$xH199_4wAoUVrAfB~@_t_Kxe*lN3*C
z0*>o(`*0uKjxqNdX$c58n@s0Ey)=PE;edoK5PRNew+i6^aRLI~?HG7^d?|#J3W(Sn
z?bgC@GJ!ICPA*Uf4%94R*}`Q_<pin}j!d9x;YbAP?s+W%YB*4$gcOC#n%tXQoNe&H
zXP9gsgQ9R*lYg5);4}0GCbWkuDR7`50o$^;xidw7U?T7tZf-xwzn)qieAhDZ`Wzv^
zEC~RdS|U^62mTph6h*k3LAeZxR0mS<FqHb=m=Lfni?8WA03_hUp221HU_~s3J%g`~
znpkh@xDS~UIPjf-fM}azrEnnj8pdH_WWy5zaS1W9;U6ghAtBbX;eTSj0RNW%e;~C{
Qod5s;07*qoM6N<$f&?kLu>b%7

diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png
index d5f8656886dd6a0497ec68d9dc09e34104445fd0..6b53ba68975d0a3c440985028d10d8e3f62283a7 100644
GIT binary patch
delta 326
zcmV-M0lEIv0^tIXB!4JLL_t(|+U?puio!q?$MNSLLRiMa6IcX<g(c<QLzn}2rPOl;
zD@$)+kz$KLASbYUR>H8b=={kJll^`wE%M~|%OK*52mk;800000Byd*r@w)Gfrq1(c
z__K3)%RR7ZjW{dXcSbiKUr8nSGn^G|T2sd<=sTmg>p_Qc(tp$W5?#RQe9>W?^maXH
zj??t#B{(b5B|O3};(H;qghho9En$)2UoBzL;h&Z8FT(#;Ldo!}k|p@>H}C6}00000
z0002Mi<}ib?zh2ztY%-1me}DP_gigRBcHqP@^_-dA~W{x&k{a$BOJ>AtT~<^2tNKP
z8{wGn!#Jt4qCdsM|1@_ARjktHDxs=9V(t>ET%zVGq3R8CuIGiS{<SuYQ&fo9>j2=H
YJ2iA2`?;-{*#H0l07*qoM6N<$g4>OuQ2+n{

delta 313
zcmV-90mlB}0@MPKB!3%8L_t(|obB2%3c@fH#_{L@96f-eql4fg=;%QlojN$^q(^ab
z@E{J3j$S1a<%x*2jeRM;_WuLHA-4HGS}9E&0000=TCCQ-NnLege=r=68dpNJ>~Qpy
zKnaxaKnaxaL<xyY@ZP^ZnmXDO4JBO97dPo0-FAOdKfbo;2Y;b5tb|Wuw;8nef8bmA
zs)d*<^nJqe{nrp?uck2ZR^JK$000000QfLpW`%Ey%8b#F<h6L75NtFZ7mf>K>MEf&
zAy8O2DSN&!wlO8dh8K+};n(oObO}|%3zH>ig%_qu&<-z5l#nXC`0El<hZj;p)g?If
z2ccR2q<zTTb29zqK7=|JM%jnZb}2Svn4`HF!*mJU5&!_ibI#oXY)r#c8MUzc00000
LNkvXXu0mjfpDB$*

diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png
index b0415abc98497c9d2c00665b5a52fca72bf5d464..b0e6a2ce8ddfefc315fdd0bd4c984bd5c6fa99f8 100644
GIT binary patch
delta 320
zcmV-G0l)si0^0(RB!41FL_t(|+U?mfio!q`#qm!Mu^?mN3AP9b3rotqhmZq!CF@+l
z%F-KHSZomp<OFt~)xZ?Hn#@EqGx`52n}m5UQG_P~000000001v>%pk~Tvwv8pVvL3
zd-ne<pM_t4{mAuTw5~*p(nSBjiqc43iMnU^zS;3~)~4<Bc7NGv(2XW|Yj2mGHf^WJ
z(^-SU+cs1E3VW4c!{_olHmHQ$!VfAT*YLec$UXeS66O;AuM!qE_<HrRnA0D;IX!Ry
z000000005@+l{8M68E(ndcpVSuN0+`{dV*A5~A5Cr+5qO;yZbGH@Nro?7^MtqbQ-S
zBy4~82p{EC|2gUsl9=sYRYFpm<=7=8IoOU>Legt>XbD+N^-bG(h48%&fVVqvyCJWn
St8Zoi0000<MNUMnLSTYQHlKI^

delta 294
zcmV+>0onfB0>J{1B!37=L_t(|obB4N4Z<)Gg<+c^7=RHdD3M?oCP)bt8HI|1kyypZ
z1rY_H5TA`-{C`rq#PU76h;-)w003ZMf9Qf*jti@WV)5(k#%eh&vH0$Cl{<YC6i@LD
zqWDUS4<QUs7PX&zwgAq@RZzJ0Qvw+EBXsKTez&}(?5zmz{eSRe5pP2EDOh?}uu=#~
zdwqWVx`^TpFxhilq`B)4000000DuHz<_7*XTVOUH@X6S@f%uN%fW=q8HdErevk75p
zCutTTq_)wdL$K;0N`_$FK$Qw1SNB*Vgxsz3YC|YFH;^lYq#vQua|6}RD3oZNR^Oa$
srhBYDG?8R3Lmv|+7@7b8K$~;!0oat&y6F2{-T(jq07*qoM6N<$g7zeYp#T5?

diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json
index aa6abfee3b..a6b30533f5 100644
--- a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/31615/commits/8795484578b33a9919b7801667287c0f28afe642",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf",
   "size": {
     "x": 32,
     "y": 32