From e47fe15fbfccbb70e9ee9e7c6af1bfc30f35d321 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Thu, 3 May 2018 22:44:07 -0400 Subject: [PATCH] Fixes a comment that caused developers to scratch their heads. Glass has a hardness of 30 https://github.com/PolarisSS13/Polaris/blob/master/code/modules/materials/materials.dm#L433 Thrown_force_divisor multiplies by 1.5. WHY THE HELL IS THIS A MULTIPLIER INSTEAD OF A DIVISOR ???? WHAT MADMAN NAMED THESE VARIABLES? https://github.com/PolarisSS13/Polaris/blob/master/code/game/objects/items/weapons/material/material_weapons.dm#L56 p.s: Marble spear does 50 damage per hit. may wanna nerf that. It's a 2 tile attack that does 50 damage. When thrown, marble spear does 39 damage, since it multiplies the blunt damage (26) by 1.5 --- code/game/objects/items/weapons/material/twohanded.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index acc3132712..dbc573cf26 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -144,9 +144,9 @@ force = 10 w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK - force_divisor = 0.5 // 15 when wielded with hardness 15 (glass) + force_divisor = 0.5 // 15 when wielded with hardness 30 (glass) unwielded_force_divisor = 0.375 - thrown_force_divisor = 1.5 // 20 when thrown with weight 15 (glass) + thrown_force_divisor = 1.5 // 22.5 when thrown with weight 15 (glass) throw_speed = 3 edge = 0 sharp = 1 @@ -156,4 +156,4 @@ applies_material_colour = 0 fragile = 1 //It's a haphazard thing of glass, wire, and steel reach = 2 // Spears are long. - attackspeed = 14 \ No newline at end of file + attackspeed = 14