From: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:34:35 +0000 (-0400) Subject: Spears equippable to suit storage (#26724) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=263469dffa200eab09ba270a2eb58f1b98c78f2f;p=space-station-14.git Spears equippable to suit storage (#26724) * meat and potatoes hahaha * DAMAGE yes * come on * Check again * Guhhhhh guh --- 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 0000000000..585f227940 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-SUITSTORAGE.png differ 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 0000000000..648fff08e4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json index 383ea777d2..5a18552d2e 100644 --- a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/plasma_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/reinforced_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..e194aff0a6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-SUITSTORAGE.png differ 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 0000000000..cb8ff3d744 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json index 49209bf2dc..421037eac3 100644 --- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/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/uranium_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..fc03f154a4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-SUITSTORAGE.png differ 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 } ] }