From b0dedb97709abd0e24045fb04c684d6b202fd085 Mon Sep 17 00:00:00 2001 From: RedBookcase Date: Sat, 26 Apr 2025 13:45:08 -0700 Subject: [PATCH] Changed the storage sizes of different swords. (#36564) Co-authored-by: RedBookcase --- .../Prototypes/Entities/Objects/Fun/toys.yml | 6 +- .../Entities/Objects/Weapons/Melee/sword.yml | 130 +++++++++++------- .../Weapons/Melee/captain_sabre.rsi/meta.json | 38 ++--- .../captain_sabre_storage_64x.rsi/meta.json | 14 ++ .../captain_sabre_storage_64x.rsi/storage.png | Bin 0 -> 494 bytes .../claymore.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 600 bytes .../Weapons/Melee/claymore.rsi/meta.json | 4 + .../Melee/claymore_storage_64x.rsi/meta.json | 14 ++ .../claymore_storage_64x.rsi/storage.png | Bin 0 -> 589 bytes .../Melee/cutlass.rsi/foam_storage.png | Bin 0 -> 477 bytes .../Weapons/Melee/cutlass.rsi/meta.json | 8 +- .../Weapons/Melee/cutlass.rsi/storage.png | Bin 0 -> 495 bytes .../Weapons/Melee/energykatana.rsi/meta.json | 54 ++++---- .../energykatana_storage_64x.rsi/meta.json | 14 ++ .../energykatana_storage_64x.rsi/storage.png | Bin 0 -> 382 bytes .../Melee/katana.rsi/equipped-BACKPACK.png | Bin 0 -> 529 bytes .../Melee/katana.rsi/equipped-BELT.png | Bin 0 -> 574 bytes .../Weapons/Melee/katana.rsi/meta.json | 46 ++++--- .../Melee/katana_storage_64x.rsi/meta.json | 14 ++ .../Melee/katana_storage_64x.rsi/storage.png | Bin 0 -> 361 bytes .../Weapons/Melee/machete.rsi/meta.json | 5 +- .../Weapons/Melee/machete.rsi/storage.png | Bin 0 -> 382 bytes 22 files changed, 233 insertions(+), 114 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/captain_sabre_storage_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/captain_sabre_storage_64x.rsi/storage.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/claymore.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/claymore_storage_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/claymore_storage_64x.rsi/storage.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cutlass.rsi/foam_storage.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cutlass.rsi/storage.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana_storage_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/energykatana_storage_64x.rsi/storage.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/katana_storage_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/katana_storage_64x.rsi/storage.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/machete.rsi/storage.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 27187f6119..e758bd4ac0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1811,7 +1811,11 @@ Blunt: 0 - type: Item size: Normal - sprite: Objects/Weapons/Melee/cutlass.rsi + storedSprite: + state: foam_storage + sprite: Objects/Weapons/Melee/cutlass.rsi + shape: + - 0,0,0,2 - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index a87f380646..f4d4c5a918 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -1,3 +1,6 @@ +#While you were busy charging your batong... I studied the blade. + +#BaseSword - type: entity parent: BaseItem id: BaseSword @@ -19,6 +22,58 @@ qualities: - Slicing +#Shortswords +- type: entity + name: cutlass + parent: [ BaseSword, BaseMajorContraband ] + id: Cutlass + description: A wickedly curved blade, often seen in the hands of space pirates. + components: + - type: Tag + tags: + - Machete + - type: Sprite + sprite: Objects/Weapons/Melee/cutlass.rsi + - type: MeleeWeapon + damage: + types: + Slash: 16 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + storedSprite: + state: storage + sprite: Objects/Weapons/Melee/cutlass.rsi + shape: + - 0,0,0,2 + - type: DisarmMalus + +- type: entity + name: machete + parent: [ BaseSword, BaseMajorContraband ] + id: Machete + description: A large, vicious looking blade. + components: + - type: Tag + tags: + - Machete + - type: Sprite + sprite: Objects/Weapons/Melee/machete.rsi + - type: MeleeWeapon + damage: + types: + Slash: 15 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + storedSprite: + state: storage + sprite: Objects/Weapons/Melee/machete.rsi + shape: + - 0,0,0,2 + - type: DisarmMalus + +#Longswords - type: entity name: captain's sabre parent: [ BaseSword, BaseCommandContraband ] @@ -38,7 +93,11 @@ reflectProb: .1 spread: 90 - type: Item - sprite: Objects/Weapons/Melee/captain_sabre.rsi + storedSprite: + state: storage + sprite: Objects/Weapons/Melee/captain_sabre_storage_64x.rsi #Done in 64x64 because it looks way too puny in 32x32 + shape: + - 0,0,0,3 - type: Tag tags: - CaptainSabre @@ -67,7 +126,16 @@ soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item + storedSprite: + state: storage + sprite: Objects/Weapons/Melee/katana_storage_64x.rsi #Done in 64x64 because it looks way too puny in 32x32 + shape: + - 0,0,0,3 + - type: Clothing sprite: Objects/Weapons/Melee/katana.rsi + slots: + - Back + - Belt - type: DisarmMalus - type: entity @@ -84,7 +152,11 @@ types: Slash: 30 - type: Item - sprite: Objects/Weapons/Melee/energykatana.rsi + storedSprite: + state: storage + sprite: Objects/Weapons/Melee/energykatana_storage_64x.rsi #Done in 64x64 because it looks way too puny in 32x32 + shape: + - 0,0,0,3 - type: EnergyKatana - type: DashAbility - type: LimitedCharges @@ -98,27 +170,7 @@ - Belt - type: Reflect -- type: entity - name: machete - parent: [ BaseSword, BaseMajorContraband ] - id: Machete - description: A large, vicious looking blade. - components: - - type: Tag - tags: - - Machete - - type: Sprite - sprite: Objects/Weapons/Melee/machete.rsi - - type: MeleeWeapon - damage: - types: - Slash: 15 - soundHit: - path: /Audio/Weapons/bladeslice.ogg - - type: Item - sprite: Objects/Weapons/Melee/machete.rsi - - type: DisarmMalus - +#Greatswords - type: entity name: claymore parent: [ BaseSword, BaseMajorContraband ] @@ -135,38 +187,24 @@ soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item + storedSprite: + state: storage + sprite: Objects/Weapons/Melee/claymore_storage_64x.rsi #Done in 64x64 because it looks way too puny in 32x32 + shape: + - 0,0,1,3 - type: Clothing sprite: Objects/Weapons/Melee/claymore.rsi slots: - - back - - type: DisarmMalus - -- type: entity - name: cutlass - parent: [ BaseSword, BaseMajorContraband ] - id: Cutlass - description: A wickedly curved blade, often seen in the hands of space pirates. - components: - - type: Tag - tags: - - Machete - - type: Sprite - sprite: Objects/Weapons/Melee/cutlass.rsi - - type: MeleeWeapon - damage: - types: - Slash: 16 - soundHit: - path: /Audio/Weapons/bladeslice.ogg - - type: Item - sprite: Objects/Weapons/Melee/cutlass.rsi + - Back + - SuitStorage #Bigger than the other swords, easier to strap to your suit. - type: DisarmMalus +#Other/Weird - type: entity name: throngler parent: [ BaseSword, BaseMajorContraband ] id: Throngler - description: Why would you make this? + description: If Security dares take it from you, just remind them that they are indeed mortal. components: - type: Sprite sprite: Objects/Weapons/Melee/Throngler2.rsi 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 a6b30533f5..8662f1b945 100644 --- a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json @@ -1,22 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre_storage_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/captain_sabre_storage_64x.rsi/meta.json new file mode 100644 index 0000000000..7ad399e870 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/captain_sabre_storage_64x.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Storage sprite by RedBookcase on Github.", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "storage" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre_storage_64x.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre_storage_64x.rsi/storage.png new file mode 100644 index 0000000000000000000000000000000000000000..685cc1b795903eb50621f3e49e5c4e5afb5de2d9 GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s6j zo-U3d6>)EG9rR*K6kz}GbJO+>&08d7dOT&2p3@b7&M)) zRG5X|>w@kJsrYm3+8Qs;C6>D#+rL4>=uOS%-)UvyQ#kZF92l4c8W>m<7#KlJFQ&Wq zVne(_XQZt+ShT3&--BFjfiny@N`HOL?MvV~z;W$y0$;$zmQH_e2E(bB9ZDK5_liz$ z-&t3KA}zzirdZpiQTAEy85-i^A)G%%iPJ2zWUDPJEtf7 z`pZ`T_lF~Yt?5l*+i)v@=Mcv&2DR%A5!n|W2D<(E_i^^p#}Dh=&W6qHI<}<6Gsdcw z(_vrJ`T0_NdyX~o|I?H2+|+%i#7?w9;_QF+jn^Dl8#d=_H%T?HG`?r6oFg{lWbA_S zTM@H5KbU*A&Yv$3YkTbIETavjBCY@-(*^NTWYoqbHSzBv)b>x*0tF0XFkJ! lI8?zD7HXgXEDL@h-*nOcXl&rKa$p29c)I$ztaD0e0ssoLd97nJ*TL8_!x<13+L91lYr-W2>51#l#fQnuDsCFb_Df z2ADDroTDgQ!Sg)S@l2Wr&;wXyJRV137{WVpmtahr2gpu=LzoAQR=~asqG|Jh=>YaY z!t^m|9xxgJhG>)K0kRcAwas-~b3{unGr2K!a5{00J7U!T}J_U=Zb2Dufm)@Wel)W;@DyTCGpqcaa^ zZ-X{_gG`|OPtjvDp1?nZ2xzbh2S7lBRZczt%7>#n14rv<&C;#`O&Px;K1{`Hmv;<# mbNP3Kwit$C7=}Sb2=NcfWD@dzRUZHV00002BR01_s9e zo-U3d6>)E88hSegO0@M)H51`e)C&^`>E_kt{lzYG>sHiX_J!Ww{}`2jF*})Tby@wF zfjf$;sMzp|i0qPCIXixOy5|Kw6n$UG|6|@$g_!rh_n!Y=ckghhrk;=jBLW%tE%^KI zp@g`s;2dYs1!t}Qwytt4QDoTi^Tel12deeT8Jigx6_#!NIs1{V5yK3Y8%c6zOiDfP z_Vmf7u*}O|f8oaNqlye`3j3?L1R7jfESSVhnS;2584l)6)DTVxG*(z@z$oxWtkZ}Q zL*jt&h0HR=V++?G*tngrbIGYEt~1SB;ajm$P;jMhzvK2>Qd6XC zZNlcS-LxuBjBWnmjVBW7SC{w96t_)ga5*FU`fEze-YKWDjH_2^{XDawewmehV#2cT zTd#auH2G$HvCzSv8{LwtPT9YI@;m=PeCzuh*U*>S79Nu3uB()Oz0ZK*)}96jJqd=F zd;AXiFg@U?IdAX2fS+k+&phTkZl}|CA3h%c=Y?PxJIlTq(-&`?!kC-fj ztN;tKcHmV-pEEGVF0Yw8f07(v@hK1;63~dKcBPUQ40@NssC~^Qb(gax!c>L@g*zVCN7_caS zSqzE-Sagu<7_!m;%rd&?0_5fwdVN4{`;d{?paWU3It9P-&^iAZK=lQ&W`fj_q!{MQ zLSsgToIGg;84FjiT~AKzW;l2FDVR;FBS>-p$O4cfKn_3$AP0dQL8=4DYS{f}R$x$) zXJ)wf@GryVkIZ1VOqp~S94eq_0y&b{sGukpfGpp8^9~q;04z#KNdpu)fE0^xsU2_! zkd+3IedDaI0_N)RKym}AfNTeV5}+e7*bN$^W1bc=G%eJQT={4uT;-tj~#6haNlx9e}I>s^05OgL2BR01_nk0 zPZ!6KinzBkZMhCPNVxp9Y{*buv~=p$q?e&A+UpVQ;_W4sbg~8HoFDyif)V OPzFy|KbLh*2~7Y6^pi;d literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..abd4829838b3e2076b35944330d8e9bc6110b57e GIT binary patch literal 529 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDChdfr0U` zr;B4qMcmt4`@Ieah_HQ-E)-DSVAKMivj~9#~-bNvRRQ)TLpJs z+xuMT%_Af8@asFJSXNEVDvSKK(=q@3>WoP~Z%Sre4A?zmzssFD|L^!cTzTzjQR<4a zbz))-Wgld%Dq7BdSf}14`iRB(#=kEWDf7kWKYQ|LoBii?51m)s_2xDIxlonm*OyJs zzSf$jFNK9(ZC7W>e7h>2kxTygM$gMvR6LC|PA~8bdTMy=H-~@eN|q0zajFgHKd?Ob zqNcI4piQq6M8;mF&yJs&y;ZH!(!$OpBKE|_0PgJ&?B$>^M{EuA7B5y zcK`F8%~kard2$ot0&Zp5@!~4ITCq4!$m%vtr$AhgFV}5UUy!SobkxzgjbuF{iZy7{?5r Lu6{1-oD!MSFZ5&+p_Byq= z1l^RA(ad>!?T;b5)1rH7n~$&k$E_$(RBRoeR<2mABqOqbfmOqSkt?8q3ChfFe7tzs znYd%W4t2$B*!t3@?Yw?b)xB?GiOCEMeQxtPBvx?DcUxe3^PKDLEm6LeRX$81t@_SO znI_~+ODo!7E--)6@jX`=zGbg;Q7^yr{`=lr0#_N{O*Y^9bW7IH9ZjLk2bL_>DBAR8 zV$I&Ta-nG3j9JTGc`NiKf1OeJXqD&$_NzMKM~XrtSIvHKJ?PW2n5(br1qDt!Eann8 zoceS3sd$D38^tq@7EaS(4u-oJ$?;qP2i7v&`fzJ)g?fGW?i2@csosdS)j8R$TFU3v ze3UXdbZif|t@N|R2|0KAK65cd>Q9=d{ALgT*~sN>{mrXiUpK02es$;ZroGvD`FyNevi`-J>!a6R?%Qm|Ccf8d%RVjjW;3Z-o3?SZ_D}qy$hu|KVFR6-*qK2N zGknyH=K3wY{Z?#N@)|Kx3@8tw<{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json index b2c66cff5b..765dfdae2b 100644 --- a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json @@ -1,22 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Belt and SuitStorage sprites by RedBoockase on Github.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/katana_storage_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/katana_storage_64x.rsi/meta.json new file mode 100644 index 0000000000..7ad399e870 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/katana_storage_64x.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Storage sprite by RedBookcase on Github.", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "storage" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/katana_storage_64x.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/katana_storage_64x.rsi/storage.png new file mode 100644 index 0000000000000000000000000000000000000000..ad4aef4ef86578586ddbfd36b1b05abae46ae6f6 GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nlH zPZ!6KinzBkHgX;c5OLj~x4^e;Lc=-%m$h$Qd}W{fvF~Pngxr9 zg9C@~iDqVn>HRs37kDrHlyWe4c%IF0mtpRD#uDa|eQZdAHyy5*ru?yvX8yqSfYF3O zkD>oM!ycvz2Hpnl1CP~@u>4NCmS6U{WSx9wh1@K4BkoUJHG1;FVdQ&MBb@0Mz`1wEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json index 069cee5a70..42d1cb70b6 100644 --- a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from Baystation12 and modified by Taral at https://github.com/Baystation12/Baystation12/pull/29841/commits/57265cd89e6b66b9a67915172f60bbbeacbeced0", + "copyright": "Taken from Baystation12 and modified by Taral at https://github.com/Baystation12/Baystation12/pull/29841/commits/57265cd89e6b66b9a67915172f60bbbeacbeced0. Storage sprite by RedBookcase on Github.", "size": { "x": 32, "y": 32 @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "storage" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/storage.png new file mode 100644 index 0000000000000000000000000000000000000000..fdb9f9d72ed6cec96a72acdde89deb311ea5c30a GIT binary patch literal 382 zcmV-^0fGLBP)r$}y(aSZKY^%GZs&RjN|-=|Dr7zk&8 z&P=i_ld7sDNfHCnMnJ)O-ZhiQ3ZK%VDT~raW=JX)4qnH7KBfyvr zwJ^ZD2z3(rSa1r|{9S~jr@+S~gio|z>FjwjzTPexjNrICIR}L*!s&b}*4){-7f=90 zQ{?UGZ^7kkLNBN}4S