diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 178b3e7a6e..ae68d48f48 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -26,9 +26,9 @@ Piercing: 0.7 Shock: 1.2 flatReductions: - Blunt: 16 - Slash: 16 - Piercing: 16 + Blunt: 14 + Slash: 14 + Piercing: 14 Shock: 10 Heat: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index 31b9c54fce..96671b4f89 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 11057b854a..ac7bf1f8fc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -14,14 +14,14 @@ damage: types: # axes are kinda like sharp hammers, you know? - Blunt: 7 - Slash: 7 + Blunt: 4 + Slash: 10 - type: Wieldable - type: IncreaseDamageOnWield modifiers: flatReductions: - Blunt: -5 # negative reductions = increases - Slash: -5 + Blunt: -2 # negative reductions = increases + Slash: -8 - type: Clothing size: 20 sprite: Objects/Weapons/Melee/fireaxe.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index e0f1bbfef0..c6507d1856 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -12,8 +12,8 @@ - type: MeleeWeapon damage: types: - Piercing: 15 - Blunt: 5 + Piercing: 10 + Blunt: 4 - type: Item size: 24 sprite: Objects/Weapons/Melee/pickaxe.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 24b6120d02..7c0bc711a3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml index d80f616c11..fa7eb140b0 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml +++ b/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 \ No newline at end of file + damageModifierSet: StrongMetallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index f7aba28fb9..b8a74a5f73 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml +++ b/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 \ No newline at end of file + node: cratesecure diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json index a380e9796e..777736b486 100644 --- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json +++ b/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 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..93d4bdbdec Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..ccf554d0b8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right.png differ