From b5616d22a9e07b94098e8d3fdc4a52dd2fdbb337 Mon Sep 17 00:00:00 2001 From: RedBookcase Date: Sat, 5 Apr 2025 23:48:18 -0700 Subject: [PATCH] Salvage melee weapon tweaks (#35914) * Minor salvage melee tweaks. * Minor salvage melee tweaks. --------- Co-authored-by: RedBookcase --- .../Entities/Objects/Weapons/Melee/mining.yml | 27 +++++++++++++----- .../Melee/crusher.rsi/equipped-BACKPACK.png | Bin 0 -> 1238 bytes .../crusher.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1238 bytes .../Weapons/Melee/crusher.rsi/meta.json | 10 ++++++- .../crusher_glaive.rsi/equipped-BACKPACK.png | Bin 0 -> 1159 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1159 bytes .../Melee/crusher_glaive.rsi/meta.json | 10 ++++++- 7 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 7ae4480d85..911cf30680 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -110,6 +110,15 @@ - type: Sprite sprite: Objects/Weapons/Melee/crusher.rsi state: icon + - type: Item + size: Ginormous + sprite: Objects/Weapons/Melee/crusher-inhands.rsi + - type: Clothing + sprite: Objects/Weapons/Melee/crusher.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: AmmoCounter - type: UseDelayOnShoot - type: UseDelay @@ -147,9 +156,6 @@ Slash: 2.5 Structural: 30 - type: GunRequiresWield - - type: Item - size: Ginormous - sprite: Objects/Weapons/Melee/crusher-inhands.rsi - type: DisarmMalus - type: Prying @@ -168,7 +174,7 @@ attackRate: 2 damage: types: - Slash: 15 + Slash: 12 - type: EmbeddableProjectile sound: /Audio/Weapons/star_hit.ogg offset: -0.15,0.0 @@ -191,6 +197,16 @@ components: - type: Sprite sprite: Objects/Weapons/Melee/crusher_glaive.rsi + state: icon + - type: Item + size: Ginormous + sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi + - type: Clothing + sprite: Objects/Weapons/Melee/crusher_glaive.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: UseDelay delay: 1.9 - type: LeechOnMarker @@ -201,6 +217,3 @@ - type: Tag tags: - Pickaxe - - type: Item - size: Ginormous - sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..deffd3744ae3df893cb55bea90adb7eb3812956e GIT binary patch literal 1238 zcmV;{1S$K8P)Fn$*f~$jnOAx{S{(et5 z^y2YP#7=~BoU=|36;o?#D@2fu2He089^kVP@U1}?CMPGUtE-EiJtOMr`6QjfxiBx8 zOvV-$7b%;~S|x_SMYFTB1)TACTHsGf9^ez%Sh=?SyQPAD53o8UfEhS}mvQ4<5c#>e zxwX^cOQ8@dF!?Rs7w<}wC!KBND6+Cut^l0C3*5lZ;jH3U`4YZx+%R!g@b$gp(g}{f z2vvq(nS0~|;4H-rJ}d<80KVXjUQkGa6B832$BT$1>NtCWuHVhjK;j^Mef*35<(6s3 z*R0hc0DQm+yuc0o-~m3I*T7SixgY=+*!lZAA<3}_@3-%v2bs@w`B1y8cW4_~DFWjH zPT&P@CJ#Q~6_gOy4TGpuDguc6BE-bMF>y1itdu;!m6FHzAd>=&kB=916IBFU|8qc& z|1q^E*fJ;JMp$wO`;i!^V8lwm+ z5*|;2g2)#MP$~kGOsCV<2@pmeJsQ1PwbGX7YwO4rO%g;8L7doR8sudt3&QJ0E5T(Q zU+Y?TGqL3?udR)8xtyAVD&kO4Wk1;vK*26{EYa&XOWytGt4Y(OT|JZXx=%IJ!w=2U z?aa(fAvv48kCnba9@E>8FU}i(E(u%@ut^1O`CX}f^mOdAgvP_N37p2estHi=A&BE3 zyFHVCJN=zzzAYQY9JnA-2?;!nojlwW^W)V+!YXGdonA?Li9|v`S&}VZ4f5b=TmZj? zyoDWW*}7aoAs&)mb~OX7nSRS)&39j5mb@iMAP64NYQ@|Ho%E}SK`}X1CwUuN`I26H%idAbt1n=1!8ji~M?Y3J~tXhx5 zct0>WILNCpR%;Lyt5yi8OXWdJ%Qh(z6{}VVfZ)i;h)p~<#S#T;Ll`Tu8cUB}eYu5K zOY`&dG&MDKJFHGEujljmNLWLAz{@-DYRRXfdy8!{q4h%rIDPX(s1sWY=wJ^OK|Vh_$( zdwbmo0IWtga~XG7c_VM?AxeXV<^bI3Nn;~#l&UgxGw!je3z&6GO8{(!syEZctR(=* z^KPtq5F!dzZ2{_mcsUrg1bB3>oo@8x%kf{6I=~9dI;JJS&+LNSq);ygtiWu{_=gC_ z99G#;J^Z+%$`UyDP64NYQ@|Fn$*f~$jnOAx{S{(et5 z^y2YP#7=~BoU=|36;o?#D@2fu2He089^kVP@U1}?CMPGUtE-EiJtOMr`6QjfxiBx8 zOvV-$7b%;~S|x_SMYFTB1)TACTHsGf9^ez%Sh=?SyQPAD53o8UfEhS}mvQ4<5c#>e zxwX^cOQ8@dF!?Rs7w<}wC!KBND6+Cut^l0C3*5lZ;jH3U`4YZx+%R!g@b$gp(g}{f z2vvq(nS0~|;4H-rJ}d<80KVXjUQkGa6B832$BT$1>NtCWuHVhjK;j^Mef*35<(6s3 z*R0hc0DQm+yuc0o-~m3I*T7SixgY=+*!lZAA<3}_@3-%v2bs@w`B1y8cW4_~DFWjH zPT&P@CJ#Q~6_gOy4TGpuDguc6BE-bMF>y1itdu;!m6FHzAd>=&kB=916IBFU|8qc& z|1q^E*fJ;JMp$wO`;i!^V8lwm+ z5*|;2g2)#MP$~kGOsCV<2@pmeJsQ1PwbGX7YwO4rO%g;8L7doR8sudt3&QJ0E5T(Q zU+Y?TGqL3?udR)8xtyAVD&kO4Wk1;vK*26{EYa&XOWytGt4Y(OT|JZXx=%IJ!w=2U z?aa(fAvv48kCnba9@E>8FU}i(E(u%@ut^1O`CX}f^mOdAgvP_N37p2estHi=A&BE3 zyFHVCJN=zzzAYQY9JnA-2?;!nojlwW^W)V+!YXGdonA?Li9|v`S&}VZ4f5b=TmZj? zyoDWW*}7aoAs&)mb~OX7nSRS)&39j5mb@iMAP64NYQ@|Ho%E}SK`}X1CwUuN`I26H%idAbt1n=1!8ji~M?Y3J~tXhx5 zct0>WILNCpR%;Lyt5yi8OXWdJ%Qh(z6{}VVfZ)i;h)p~<#S#T;Ll`Tu8cUB}eYu5K zOY`&dG&MDKJFHGEujljmNLWLAz{@-DYRRXfdy8!{q4h%rIDPX(s1sWY=wJ^OK|Vh_$( zdwbmo0IWtga~XG7c_VM?AxeXV<^bI3Nn;~#l&UgxGw!je3z&6GO8{(!syEZctR(=* z^KPtq5F!dzZ2{_mcsUrg1bB3>oo@8x%kf{6I=~9dI;JJS&+LNSq);ygtiWu{_=gC_ z99G#;J^Z+%$`UyDP64NYQ@|zv6E^{|6|r8qphwDAP$aOos5yk_EYcJCaMk_R{;K=E^#2#AAtB6gsJbQ*J$$7fm3 zi`Z@fs)-;(4Xp?q7~#cx3hz#Dxyi^DKo|nsv6vJ7PTwvqF6~n4g`Nn0VGAs-BLZJ?ue`kFEWgoNs*Q(! z5>z1~(*D`ZM{19rC!VRKDuVIbVHLoB*kr%`z;I^7MYuTQ0A0egFU1QBv887eBQiz#q>kqICV{GJLX7cYwp zPmOzYZe;8psatoefK|XMU=^?mSOu&CRspMkiULYcgvQ5-9Uk^N+uairg-yz^7G11L z4@9uX-`srJ+3OE`(Z#CtKm_~!V`F0u_fT(5b9}m3mD1V0y~Q6E`+S(dzZf?@*>gp4jPd)4N`MefZX$HJ{`mUaQJhjaa zS4jP(0$h7^RT?C$1}fO40=P3^dU`t46CgUmjdAF~duiWD1^AP^>s$hHfU!{uu!_sJ z5zNKY8u9^Uq&4qBjN=uDl)OU=CW1IsW~?>i0gWN697w0bq;mk8m~U;RUl+rFA0Xra zR$x{sN&>i#q^JZ9gN-U?B>_OF(n;?y5Uqqk2dlCGVI}Jomy!T;lW}@DocG#RVE(`g z%qm4mfP>t&bMm553a|pRv4X8;@mn5aL46Datc|*@@1ra>v{k?=U=^?mSOu&CR)PN& Z_zSn}L3J|4kv0GT002ovPDHLkV1n{171RI# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..799d1df667d39af4533593bf8c2960da719cbdce GIT binary patch literal 1159 zcmV;21bF+2P)zv6E^{|6|r8qphwDAP$aOos5yk_EYcJCaMk_R{;K=E^#2#AAtB6gsJbQ*J$$7fm3 zi`Z@fs)-;(4Xp?q7~#cx3hz#Dxyi^DKo|nsv6vJ7PTwvqF6~n4g`Nn0VGAs-BLZJ?ue`kFEWgoNs*Q(! z5>z1~(*D`ZM{19rC!VRKDuVIbVHLoB*kr%`z;I^7MYuTQ0A0egFU1QBv887eBQiz#q>kqICV{GJLX7cYwp zPmOzYZe;8psatoefK|XMU=^?mSOu&CRspMkiULYcgvQ5-9Uk^N+uairg-yz^7G11L z4@9uX-`srJ+3OE`(Z#CtKm_~!V`F0u_fT(5b9}m3mD1V0y~Q6E`+S(dzZf?@*>gp4jPd)4N`MefZX$HJ{`mUaQJhjaa zS4jP(0$h7^RT?C$1}fO40=P3^dU`t46CgUmjdAF~duiWD1^AP^>s$hHfU!{uu!_sJ z5zNKY8u9^Uq&4qBjN=uDl)OU=CW1IsW~?>i0gWN697w0bq;mk8m~U;RUl+rFA0Xra zR$x{sN&>i#q^JZ9gN-U?B>_OF(n;?y5Uqqk2dlCGVI}Jomy!T;lW}@DocG#RVE(`g z%qm4mfP>t&bMm553a|pRv4X8;@mn5aL46Datc|*@@1ra>v{k?=U=^?mSOu&CR)PN& Z_zSn}L3J|4kv0GT002ovPDHLkV1n{171RI# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json index 8a70dbd998..6074bd9875 100644 --- a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord). Back/Suit sprites by Redbookcase (github).", "size": { "x": 32, "y": 32 @@ -21,6 +21,14 @@ 0.3 ] ] + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } -- 2.51.2