diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 48d1b42aba3..9c69cce7fbe 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -133,7 +133,8 @@ victim.drop_r_hand() victim.drop_l_hand() victim.put_in_hands(chainsaw) - + chainsaw.attack_self(victim) + chainsaw.wield(victim) victim.reagents.add_reagent("adminordrazine",25) victim.client.color = pure_red @@ -169,4 +170,4 @@ victim.status_flags |= GOTTAGOREALLYFAST sleep(duration) victim.status_flags &= ~GOTTAGOREALLYFAST - victim << "You slow down." \ No newline at end of file + victim << "You slow down." diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index f3fe39a88cb..bb16e93d1a1 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -400,6 +400,7 @@ icon_state = "chainsaw_off" flags = CONDUCT force = 13 + var/force_on = 21 w_class = 5 throwforce = 13 throw_speed = 2 @@ -415,8 +416,8 @@ /obj/item/weapon/twohanded/required/chainsaw/attack_self(mob/user) on = !on user << "As you pull the starting cord dangling from \the [src], [on ? "it begins to whirr." : "the chain stops moving."]" - force = on ? 21 : 13 - throwforce = on ? 21 : 13 + force = on ? force_on : initial(force) + throwforce = on ? force_on : initial(force) icon_state = "chainsaw_[on ? "on" : "off"]" if(hitsound == "swing_hit") @@ -435,11 +436,18 @@ if(wielded) . = ..() - /obj/item/weapon/twohanded/required/chainsaw/doomslayer name = "OOOH BABY" desc = "VRRRRRRR!!!" armour_penetration = 100 + force_on = 30 + +/obj/item/weapon/twohanded/required/chainsaw/doomslayer/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type) + if(attack_type == PROJECTILE_ATTACK) + owner.visible_message("Ranged attacks just make [owner] angrier!") + playsound(src, pick("sound/weapons/bulletflyby.ogg","sound/weapons/bulletflyby2.ogg","sound/weapons/bulletflyby3.ogg"), 75, 1) + return 1 + return 0 //GREY TIDE /obj/item/weapon/twohanded/spear/grey_tide