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 c49e20981e31f3dd882590e8b7238fe61ceece83..76911eba5f709dbcfe6c6780c5fd349bf732f904 100644 (file)
--- 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 3758487bd43f7a010141db026168ea209bf955d5..0def916ddc73cbd0aeec10a84af66fbf0ca29298 100644 (file)
--- 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 6e1c682f47575976a0f02d2c96e470b5b4264c94..f1efe63ff5000dbd2100d2e8dd1c9b5f276aa2cb 100644 (file)
--- 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 (file)
index 0000000..585f227
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 49209bf2dcd49281924a181fabf4d108fbc2ada2..421037eac3726d16a0cf57d84e922e67918757a8 100644 (file)
--- 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 (file)
index 0000000..648fff0
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 383ea777d2718c0a8f7f99a1989da36257531638..5a18552d2e070f03832848e95d044dc29e05ad56 100644 (file)
--- 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 (file)
index 0000000..e194aff
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 383ea777d2718c0a8f7f99a1989da36257531638..5a18552d2e070f03832848e95d044dc29e05ad56 100644 (file)
--- 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 (file)
index 0000000..cb8ff3d
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 49209bf2dcd49281924a181fabf4d108fbc2ada2..421037eac3726d16a0cf57d84e922e67918757a8 100644 (file)
--- 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 (file)
index 0000000..fc03f15
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 383ea777d2718c0a8f7f99a1989da36257531638..5a18552d2e070f03832848e95d044dc29e05ad56 100644 (file)
--- 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
     }
   ]
 }