diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 2b9424dd594..c461d7b76a9 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -355,6 +355,44 @@ obj/item/weapon/twohanded/ desc = "A spear brought over from the Kidan homeworld." +///CHAINSAW/// + +/obj/item/weapon/twohanded/chainsaw + icon_override = 'icons/mob/in-hand/swords.dmi' + icon_state = "chainsaw0" + name = "Chainsaw" + desc = "Perfect for felling trees or fellow spaceman." + force = 15 + throwforce = 15 + throw_speed = 1 + throw_range = 5 + w_class = 4.0 + force_unwielded = 15 + force_wielded = 35 + wieldsound = 'sound/weapons/drill.ogg' + flags = NOSHIELD + origin_tech = "materials=3;syndicate=4" + attack_verb = list("sawed", "cut", "hacked", "carved", "cleave") + sharp = 1 + edge = 1 + no_embed = 1 // Like with the single-handed esword, this shouldn't be embedding in people. + + +/obj/item/weapon/twohanded/chainsaw/update_icon() + if(wielded) + icon_state = "chainsaw[wielded]" + else + icon_state = "chainsaw0" + + +/obj/item/weapon/twohanded/chainsaw/unwield() + ..() + hitsound = "swing_hit" + +/obj/item/weapon/twohanded/chainsaw/wield() + ..() + hitsound = 'sound/weapons/circsawhit.ogg' + // SINGULOHAMMER /obj/item/weapon/twohanded/singularityhammer diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 8431b334c75..7f92f14258e 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -218,7 +218,7 @@ emp_act /mob/living/carbon/human/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone) if(!I || !user) return 0 - if(istype(I, /obj/item/weapon/butch/meatcleaver) && src.stat == DEAD && user.a_intent == "harm") + if((istype(I, /obj/item/weapon/butch/meatcleaver) || istype(I, /obj/item/weapon/twohanded/chainsaw)) && src.stat == DEAD && user.a_intent == "harm") var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new /obj/item/weapon/reagent_containers/food/snacks/meat/human(get_turf(src.loc)) newmeat.name = src.real_name + newmeat.name newmeat.subjectname = src.real_name diff --git a/icons/mob/in-hand/swords.dmi b/icons/mob/in-hand/swords.dmi index f7bdd0ae1b0..dc9fa883839 100644 Binary files a/icons/mob/in-hand/swords.dmi and b/icons/mob/in-hand/swords.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index f5a1f53a4a4..f686858b569 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ