From 263469dffa200eab09ba270a2eb58f1b98c78f2f Mon Sep 17 00:00:00 2001 From: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Date: Mon, 8 Apr 2024 11:34:35 -0400 Subject: [PATCH] Spears equippable to suit storage (#26724) * meat and potatoes hahaha * DAMAGE yes * come on * Check again * Guhhhhh guh --- .../Construction/Interaction/CraftingTests.cs | 4 ++-- .../Entities/Objects/Weapons/Melee/spear.yml | 1 + .../Recipes/Construction/Graphs/weapons/spear.yml | 8 ++++---- .../Melee/bone_spear.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 593 bytes .../Weapons/Melee/bone_spear.rsi/meta.json | 4 ++++ .../plasma_spear.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 363 bytes .../Weapons/Melee/plasma_spear.rsi/meta.json | 4 ++++ .../reinforced_spear.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 361 bytes .../Weapons/Melee/reinforced_spear.rsi/meta.json | 4 ++++ .../Melee/spear.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 629 bytes .../Objects/Weapons/Melee/spear.rsi/meta.json | 4 ++++ .../uranium_spear.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 368 bytes .../Weapons/Melee/uranium_spear.rsi/meta.json | 4 ++++ 13 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-SUITSTORAGE.png diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs b/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs index c49e20981e..76911eba5f 100644 --- a/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs +++ b/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs @@ -56,7 +56,7 @@ public sealed class CraftingTests : InteractionTest // Player's hands should be full of the remaining rods, except those dropped during the failed crafting attempt. // Spear and left over stacks should be on the floor. - await AssertEntityLookup((Rod, 2), (Cable, 8), (ShardGlass, 2), (Spear, 1)); + await AssertEntityLookup((Rod, 2), (Cable, 7), (ShardGlass, 2), (Spear, 1)); } // The following is wrapped in an if DEBUG. This is because of cursed state handling bugs. Tests don't (de)serialize @@ -100,7 +100,7 @@ public sealed class CraftingTests : InteractionTest Assert.That(sys.IsEntityInContainer(rods), Is.False); Assert.That(sys.IsEntityInContainer(wires), Is.False); Assert.That(rodStack, Has.Count.EqualTo(8)); - Assert.That(wireStack, Has.Count.EqualTo(8)); + Assert.That(wireStack, Has.Count.EqualTo(7)); await FindEntity(Spear, shouldSucceed: false); }); diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 3758487bd4..0def916ddc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -52,6 +52,7 @@ quickEquip: false slots: - back + - suitStorage - type: Construction graph: Spear node: spear diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml index 6e1c682f47..f1efe63ff5 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml @@ -10,7 +10,7 @@ amount: 2 doAfter: 2 - material: Cable - amount: 2 + amount: 3 doAfter: 1 - tag: GlassShard name: Glass Shard @@ -33,7 +33,7 @@ amount: 2 doAfter: 2 - material: Cable - amount: 2 + amount: 3 doAfter: 1 - tag: ReinforcedGlassShard name: Reinforced Glass Shard @@ -56,7 +56,7 @@ amount: 2 doAfter: 2 - material: Cable - amount: 2 + amount: 3 doAfter: 1 - tag: PlasmaGlassShard name: Plasma Glass Shard @@ -79,7 +79,7 @@ amount: 2 doAfter: 2 - material: Cable - amount: 2 + amount: 3 doAfter: 1 - tag: UraniumGlassShard name: Uranium Glass Shard diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..585f2279403ddbff8ab4709ffe3938def8d38e81 GIT binary patch literal 593 zcmV-X0Ir1H|t?9S}Cz2A9e-rwhcX5a2SfRpi{#dybtfvi3|Xd&wccLEl(2}a$9u`ZC+ z$CZHbpv9(>F>EI$u1o`d^l>F%F`EDY9uF>r1L(kyzD=G%cW1W%fT6u196$%#`E$!l zCs@xBKhn5n4CmI@;L}6l0J@O*@c?H6Dlc!=G6|+KoLhK3ITD`7owog}W8uYhBCGG; z*8yCI;5x8VxyO@^L%Nzz8d(fAYegobO?V6BW((0NTF7PMY7fCBvX2|p^!guC^CIH_ zSt8>A0NBeYssw*xvICy`;@TqR02w0VfLtby-3L!?5L0Ua0PxZYR?4Q-)&ZB@cVpj( zw(13`x7EmOXl->s)Sv`}Eg&dznRwU|2!bF8f*>M{>0Kg#xW>qo!m^*yDsZF zHcW1m7|t#992<4lRr4p6vMJVSmyLBmr(Kr%GR#f0R%E4YikY?*mewz2Q>F*b0KW^Yy90b-;!}Vi2!bF8 ff*=TjApYhP+c48H_-LJ)00000NkvXXu0mjf!OsiN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json index 49209bf2dc..421037eac3 100644 --- a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json @@ -32,6 +32,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..648fff08e4c7cbd3d23a2999f759de4677cd58f5 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5w(P6XFV_KR^Dwb?Vk)rxI;#?Wz3y{}~t}BO}Y>4Yjni3_HEKPY1A6eCx*<8Ee%Ba^OB4E;3#OlqVDZv`Spls&I7$jn#nQ&@x z2WPVOk_p`sQyFx)=1jPe!xtf+hqIe0#n8>!r&7dFE!>B7 zMUrO38V^o~4Uya%G%`FL9;qY*UT8a`d2rE!78Ta15h4`}Kgbw}hAjNBp<*#>t9fIC z^oE%Ys~EaDS?)SqU}?&8_{gfh%;wq!S4O=S5do9NB35q>O$pWr24yox#vl;`&4g2n zJ2;cImrUrEn988THD|(&9KHw<6@`t5H)?9ACNObt;(T-4FtkAVxu_UhnUAu}hayA9 mZIdRPQ%m@GR70YUf#J1+#MPjktCWB~V(@hJb6Mw<&;$U31arjz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json index 383ea777d2..5a18552d2e 100644 --- a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json @@ -32,6 +32,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..cb8ff3d7441bce827f42a521837e9f5064f23662 GIT binary patch literal 629 zcmV-*0*d{KP)7s++BosGMXlU^-$l%tct95ZKr2l~bg;N9F#kzKJHJLj#8mPFrI5`w_ zDTT;Y0tFTBUQBYf_gT8UmwfM=dq4W#86Xe@0X*%v$7qb2H-=_J00lv`(jst%ZrocuQ!{q`q46AG%`2Cp`Eew65J2u6hkHoSp{$-ly@Mu;7-tnwfQel*iLZWPy+;L_!Fl0b_X^UagkVZ zb;~;mO3@)8Ktrjh0Rl9XiW(q5L#e0%0yLBg%K*HFmL3pl48xGzUNeBxSbCKRYD0}2 z$OcHS5<$GPmO+i2p~|Wel3XQ{ved}P0``r8SoFP zL>$LSP$O!k_F=68OLyZK27^H&@tPd9akG?lB7{fJ!AcDd8X@VP0JU*H47pbLH}Hkh zs>ceg6_#2sK_#;Rwl^|T&fQ`-oTm>YT&nk+dD2k#eilQjW4*(AUogXeB%sUUxE3gJ($mE;q+(8T0s|u>n~y@n>PLq3w+3!9@#NR9L4*h*T{6AY&jJvhc%(ip8w0 z=8X-~8)i1FV(8{%x$AI&r76$hBdhu{n`;+b8TDF31WX!>SiLzkC0HXEl+7F&gG3B8 z6HYDe;7rzDGND^yDuWK!oC!B__##A96gD2-sHvfvz{I_Y^UZC;&;sS>qGD`iKFTs5 siVPXIO`32{ZNcwH42sO|2Lo6beCi~pP7VpO26~FY)78&qol`;+0A|K?asU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json index 383ea777d2..5a18552d2e 100644 --- a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json @@ -32,6 +32,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } -- 2.51.2