From 8e2687663423e9c589275ec8ee12dc013900b523 Mon Sep 17 00:00:00 2001 From: Yawet330 <65188584+Yawet330@users.noreply.github.com> Date: Mon, 1 Jun 2020 00:44:31 +0100 Subject: [PATCH] Makes Spears rational. (#12401) * hate spears, hate elances, hate embedding. * Update code/game/objects/items/twohanded.dm Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> * Update code/game/objects/items/twohanded.dm Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> * Update code/game/objects/items/twohanded.dm Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> * Update code/game/objects/items/twohanded.dm Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/game/objects/items/twohanded.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index acfc9a6e85..6f5e99e5aa 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -582,7 +582,7 @@ force_wielded = 18 throwforce = 20 throw_speed = 4 - embedding = list("embedded_impact_pain_multiplier" = 3, "embed_chance" = 90) + embedding = list("embedded_impact_pain_multiplier" = 1.5, "embed_chance" = 65) armour_penetration = 10 custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075) hitsound = 'sound/weapons/bladeslice.ogg' @@ -667,6 +667,7 @@ force_wielded = 19 force_unwielded = 11 throwforce = 21 + embedding = getEmbeddingBehavior(embed_chance = 75, embedded_pain_multiplier = 1.5) //plasmaglass spears are sharper icon_prefix = "spearplasma" qdel(tip) var/obj/item/twohanded/spear/S = locate() in parts_list @@ -681,6 +682,7 @@ if(G) explosive = G name = "explosive lance" + embedding = getEmbeddingBehavior(embed_chance = 0, embedded_pain_multiplier = 1)//elances should not be embeddable desc = "A makeshift spear with [G] attached to it." update_icon()