From d728ccc625a23d234b59ef29feb419f413fcd952 Mon Sep 17 00:00:00 2001 From: Kaedwuff Date: Mon, 10 Dec 2018 13:57:56 -0600 Subject: [PATCH] Less Stupid Fireaxes (#5668) Fireaxes now attack much slower, but also no longer embed constantly in everyone you attack, or everyone nearby the general vicinity of your attack. --- .../items/weapons/material/twohanded.dm | 4 +- html/changelogs/Kaedwuff - Fireaxe.yml | 37 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Kaedwuff - Fireaxe.yml diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 6a1a36507c3..4301c44829f 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -188,8 +188,9 @@ force_wielded = 30 attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") applies_material_colour = 0 + can_embed = 0 -/obj/item/weapon/material/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/weapon/material/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity) if(!proximity) return ..() if(A && wielded) @@ -203,6 +204,7 @@ P.die_off() /obj/item/weapon/material/twohanded/fireaxe/pre_attack(var/mob/living/target, var/mob/living/user) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN * 2.5) if(istype(target)) cleave(user, target) ..() diff --git a/html/changelogs/Kaedwuff - Fireaxe.yml b/html/changelogs/Kaedwuff - Fireaxe.yml new file mode 100644 index 00000000000..1c0874915d5 --- /dev/null +++ b/html/changelogs/Kaedwuff - Fireaxe.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Kaedwuff + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Fireaxes now attack much slower, but also no longer embed constantly in everyone you attack, or everyone nearby the general vicinity of your attack."