Reduce locker/crate hp and resistances, add spear wielding (#6001)

Resources/Prototypes/Damage/modifier_sets.yml

@@ -26,9 +26,9 @@
     Piercing: 0.7
     Shock: 1.2
   flatReductions:
-    Blunt: 16
+    Blunt: 14
-    Slash: 16
+    Slash: 14
-    Piercing: 16
+    Piercing: 14
     Shock: 10
     Heat: 10
 

Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml

@@ -10,7 +10,7 @@
   - type: MeleeWeapon
     damage:
       types:
-        Blunt: 15
+        Blunt: 14
   - type: Clothing
     size: 15
     sprite: Objects/Weapons/Melee/baseball_bat.rsi

Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml

@@ -14,14 +14,14 @@
     damage:
       types:
         # axes are kinda like sharp hammers, you know?
-        Blunt: 7
+        Blunt: 4
-        Slash: 7
+        Slash: 10
   - type: Wieldable
   - type: IncreaseDamageOnWield
     modifiers:
       flatReductions:
-        Blunt: -5 # negative reductions = increases
+        Blunt: -2 # negative reductions = increases
-        Slash: -5
+        Slash: -8
   - type: Clothing
     size: 20
     sprite: Objects/Weapons/Melee/fireaxe.rsi

Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml

@@ -12,8 +12,8 @@
   - type: MeleeWeapon
     damage:
       types:
-        Piercing: 15
+        Piercing: 10
-        Blunt: 5
+        Blunt: 4
   - type: Item
     size: 24
     sprite: Objects/Weapons/Melee/pickaxe.rsi

Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml

@@ -24,6 +24,7 @@
   - type: Clothing
     size: 24
     sprite: Objects/Weapons/Melee/spear.rsi
+    QuickEquip: false
     Slots:
     - back
   - type: Construction
@@ -39,6 +40,11 @@
     solution: melee
   - type: SolutionTransfer
     maxTransferAmount: 5
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    modifiers:
+      flatReductions:
+        Piercing: -7
 
 - type: MeleeWeaponAnimation
   id: spear

Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml

@@ -23,7 +23,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 150
+        damage: 50
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
@@ -43,4 +43,12 @@
   components:
   - type: Damageable
     damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageModifierSet: StrongMetallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 75
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]

Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml

@@ -45,7 +45,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 100
+        damage: 50
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
@@ -110,7 +110,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 100
+        damage: 75
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
@@ -128,4 +128,4 @@
         - Paper
   - type: Construction
     graph: CrateSecure
-    node: cratesecure
+    node: cratesecure

Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json

@@ -18,6 +18,14 @@
       "name": "inhand-right",
       "directions": 4
     },
+    {
+        "name": "wielded-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-right",
+        "directions": 4
+    },
     {
       "name": "equipped-BACKPACK",
       "directions": 4