Skip to content

protoaxe-fix #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Xullian-Xex wants to merge 1 commit into
base: main
Choose a base branch
from
Open

protoaxe-fix #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/_globalvars/lists/maintenance_loot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ GLOBAL_LIST_INIT(loot_t4_melee, list(
GLOBAL_LIST_INIT(loot_t5_melee, list(
/obj/item/twohanded/thermic_lance,
/obj/item/twohanded/chainsaw,
/obj/item/melee/transforming/energy/axe/protonaxe,
/obj/item/melee/transforming/energy/protonaxe,
/obj/item/melee/powered/ripper,
/obj/item/melee/f13powerfist,
/obj/item/twohanded/sledgehammer/rockethammer,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/fallout/f13lootdrop.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@
/obj/item/twohanded/sledgehammer/rockethammer,
/obj/item/melee/powered/ripper,
/obj/item/melee/f13powerfist,
/obj/item/melee/transforming/energy/axe/protonaxe,
/obj/item/melee/transforming/energy/protonaxe,
/obj/item/gun/ballistic/revolver/ballisticfist,
/obj/item/twohanded/sledgehammer/supersledge,
/obj/item/shishkebabpack,
Expand Down
15 changes: 10 additions & 5 deletions code/modules/fallout/weapons/melee/twohanded.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,26 +503,31 @@
playsound(loc, hitsound, 70, TRUE)

// Proton axe Keywords: Damage 20/41, AP 0.7
/obj/item/melee/transforming/energy/axe/protonaxe
/obj/item/melee/transforming/energy/protonaxe
name = "proton axe"
desc = "The experimental proton axe resembles a futuristic war-axe with a glowing blue blade of electrical energy at its head."
icon = 'icons/fallout/objects/melee/twohanded.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/melee2h_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/melee2h_righthand.dmi'
icon_state = "protonaxe"
icon_state_on = "protonaxe_on"
mob_overlay_icon = 'icons/fallout/onmob/backslot_weapon.dmi'
block_parry_data = /datum/block_parry_data/smith_generic //data is in finished items file
w_class = WEIGHT_CLASS_BULKY
slot_flags = null
force = 20
force_on = 41
w_class_on = WEIGHT_CLASS_HUGE
light_color = "#40ceff"
attack_verb_off = list("attacked", "chopped", "cleaved", "torn", "cut")
attack_verb_on = list()
hitsound = 'sound/weapons/bladeslice.ogg'
throw_speed = 3
throw_range = 5
armour_penetration = 0.7
throwforce = 15
throwforce_on = 50

/obj/item/melee/transforming/energy/axe/protonaxe/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, require_twohands=TRUE)
AddComponent(/datum/component/two_handed, force_unwielded=20, force_wielded=41, icon_wielded="protonaxe_on")
AddElement(/datum/element/update_icon_updates_onmob)

// Inquisitorial axe Keywords: Damage 6/32, AP 0.9, SPEAR REACH, BACK SLOT ENABLED
Expand Down
Loading