From 1051e240cf885daa1623501184b2a6203165604a Mon Sep 17 00:00:00 2001 From: Xullian-Xex Date: Sun, 31 May 2026 16:30:17 +0300 Subject: [PATCH] protoaxe-fix --- code/_globalvars/lists/maintenance_loot.dm | 2 +- code/modules/fallout/f13lootdrop.dm | 2 +- code/modules/fallout/weapons/melee/twohanded.dm | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index a8ff356a..945f7a47 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -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, diff --git a/code/modules/fallout/f13lootdrop.dm b/code/modules/fallout/f13lootdrop.dm index cc58e493..661c8ff2 100644 --- a/code/modules/fallout/f13lootdrop.dm +++ b/code/modules/fallout/f13lootdrop.dm @@ -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, diff --git a/code/modules/fallout/weapons/melee/twohanded.dm b/code/modules/fallout/weapons/melee/twohanded.dm index 3e43ec47..baf21d6f 100644 --- a/code/modules/fallout/weapons/melee/twohanded.dm +++ b/code/modules/fallout/weapons/melee/twohanded.dm @@ -503,7 +503,7 @@ 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' @@ -511,18 +511,23 @@ 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