diff --git a/_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm b/_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm index fd082ec1ddca..55d8cc03bfad 100644 --- a/_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm +++ b/_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm @@ -3529,6 +3529,10 @@ /obj/machinery/light/small/directional/south, /obj/machinery/firealarm/directional/east, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/melee/axe/sledgehammer, +/obj/item/melee/axe/sledgehammer{ + pixel_x = 5 + }, /turf/open/floor/pod, /area/ship/storage/equip) "DD" = ( diff --git a/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm b/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm index acae9b9b0701..f2e6b8f6dd63 100644 --- a/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm +++ b/_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm @@ -6125,8 +6125,8 @@ /area/ship/security/armory) "Ol" = ( /obj/structure/rack, -/obj/item/pickaxe, /obj/machinery/airalarm/directional/south, +/obj/item/melee/axe/sledgehammer, /turf/open/floor/plasteel/dark, /area/ship/hallway/fore) "On" = ( diff --git a/code/game/objects/items/melee/fireaxe.dm b/code/game/objects/items/melee/fireaxe.dm index 7ae3728803c0..d58c48c5e4ff 100644 --- a/code/game/objects/items/melee/fireaxe.dm +++ b/code/game/objects/items/melee/fireaxe.dm @@ -2,6 +2,7 @@ icon = 'icons/obj/weapon/axe.dmi' lefthand_file = 'icons/mob/inhands/weapons/axes_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/axes_righthand.dmi' + mob_overlay_icon = 'icons/mob/clothing/back.dmi' force = 5 throwforce = 15 w_class = WEIGHT_CLASS_BULKY @@ -12,7 +13,6 @@ max_integrity = 200 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30) resistance_flags = FIRE_PROOF - species_exception = list(/datum/species/kepori) /obj/item/melee/axe/ComponentInitialize() . = ..() @@ -52,3 +52,49 @@ /obj/item/melee/axe/scrap/ComponentInitialize() . = ..() AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=22, icon_wielded="[base_icon_state]_w") + +/* +Blunt + */ +/obj/item/melee/axe/sledgehammer + icon_state = "sledgehammer" + base_icon_state = "sledgehammer" + name = "breaching sledgehammer" + desc = "A large hammer used by the Gorlex Marauder splinters. As powerful as a weapon as it is a shipbreaking and mining tool." + force = 5 + armour_penetration = 40 + attack_verb = list("bashed", "smashed", "crushed", "smacked") + hitsound = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg') + slot_flags = ITEM_SLOT_BACK + sharpness = IS_BLUNT + toolspeed = 0.5 + wall_decon_damage = MINERAL_WALL_INTEGRITY + usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg') + var/wielded = FALSE + +/obj/item/melee/axe/sledgehammer/ComponentInitialize() + . = ..() + AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=30, icon_wielded="[base_icon_state]_w") + +/obj/item/melee/axe/sledgehammer/Initialize() + . = ..() + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) + +/obj/item/melee/axe/sledgehammer/proc/on_wield(obj/item/source, mob/user) + SIGNAL_HANDLER + + tool_behaviour = TOOL_MINING + wielded = TRUE + +/obj/item/melee/axe/sledgehammer/proc/on_unwield(obj/item/source, mob/user) + SIGNAL_HANDLER + + tool_behaviour = null + wielded = FALSE + +/obj/item/melee/axe/sledgehammer/attack(mob/living/target, mob/living/user) + . = ..() + var/atom/throw_target = get_edge_target_turf(target, user.dir) + if(!target.anchored) + target.throw_at(throw_target, rand(1,2), 2, user, gentle = TRUE) diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm index a94a815db8b0..326efd7cd573 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -42,6 +42,16 @@ stock_max = 3 availability_prob = 40 +/datum/blackmarket_item/weapon/sledgehammer + name = "Breaching Sledgehammer" + desc = "A Clique outfit had to ditch a lot of equipment to evade a Gezenan assault. This little piece breaks legs and walls like no other. You want in?" + item = /obj/item/melee/axe/sledgehammer + + price_min = 2000 + price_max = 3000 + stock_max = 3 + availability_prob = 30 + /datum/blackmarket_item/weapon/powerfist name = "Powerfist" desc = "Need a bit more... omph in your right hook? This gas operated powerfist will put you in the heavyweight." diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 5ca5b6bd045d..53910743285b 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/inhands/weapons/axes_lefthand.dmi b/icons/mob/inhands/weapons/axes_lefthand.dmi index 584ca2b2290e..accff4a2bb7f 100644 Binary files a/icons/mob/inhands/weapons/axes_lefthand.dmi and b/icons/mob/inhands/weapons/axes_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/axes_righthand.dmi b/icons/mob/inhands/weapons/axes_righthand.dmi index 8a29d67a8871..79a3b19b7798 100644 Binary files a/icons/mob/inhands/weapons/axes_righthand.dmi and b/icons/mob/inhands/weapons/axes_righthand.dmi differ diff --git a/icons/obj/weapon/axe.dmi b/icons/obj/weapon/axe.dmi index 46d9982ab5f2..ff735abf5ebe 100644 Binary files a/icons/obj/weapon/axe.dmi and b/icons/obj/weapon/axe.dmi differ