From a16ce8745451a1a9720f26cf95f2d9a4cf1ee9cc Mon Sep 17 00:00:00 2001 From: Lzimann Date: Tue, 7 Jun 2016 18:15:56 -0300 Subject: [PATCH 1/3] Dual e-swords dismemberment --- code/game/objects/items/weapons/twohanded.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 6d5861759c6..56838f7aa28 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -207,6 +207,7 @@ item_color = "green" attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 75 + sharpness = IS_SHARP var/hacked = 0 /obj/item/weapon/twohanded/dualsaber/New() From 8f014d93ca41d6699ed741b9fd1ba14dcf23900c Mon Sep 17 00:00:00 2001 From: Lzimann Date: Tue, 7 Jun 2016 21:35:12 -0300 Subject: [PATCH 2/3] Now they actually dismember --- code/game/objects/items/weapons/twohanded.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 56838f7aa28..2f21e350c7c 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -197,6 +197,7 @@ throw_speed = 3 throw_range = 5 w_class = 2 + var/w_class_on = 4 force_unwielded = 3 force_wielded = 34 wieldsound = 'sound/weapons/saberon.ogg' @@ -207,7 +208,6 @@ item_color = "green" attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 75 - sharpness = IS_SHARP var/hacked = 0 /obj/item/weapon/twohanded/dualsaber/New() @@ -257,6 +257,8 @@ return 1 /obj/item/weapon/twohanded/dualsaber/wield(mob/living/carbon/M) //Specific wield () hulk checks due to reflection chance for balance issues and switches hitsounds. + sharpness = IS_SHARP + w_class = w_class_on if(M.has_dna()) if(M.dna.check_mutation(HULK)) M << "You lack the grace to wield this!" @@ -265,6 +267,8 @@ hitsound = 'sound/weapons/blade1.ogg' /obj/item/weapon/twohanded/dualsaber/unwield() //Specific unwield () to switch hitsounds. + sharpness = initial(sharpness) + w_class = initial(w_class) ..() hitsound = "swing_hit" From bd8f24f50963c131e78da27f9c6af054a039c285 Mon Sep 17 00:00:00 2001 From: Lzimann Date: Wed, 8 Jun 2016 10:43:42 -0300 Subject: [PATCH 3/3] Moves sharpness and w_class after DNA check --- code/game/objects/items/weapons/twohanded.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 2f21e350c7c..ec03a765583 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -257,12 +257,12 @@ return 1 /obj/item/weapon/twohanded/dualsaber/wield(mob/living/carbon/M) //Specific wield () hulk checks due to reflection chance for balance issues and switches hitsounds. - sharpness = IS_SHARP - w_class = w_class_on if(M.has_dna()) if(M.dna.check_mutation(HULK)) M << "You lack the grace to wield this!" return + sharpness = IS_SHARP + w_class = w_class_on ..() hitsound = 'sound/weapons/blade1.ogg'