From c13d56b64215568388712048c9b366c9253642a3 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Thu, 2 May 2024 17:54:15 +1000 Subject: [PATCH] Moving hatchets and machetes onto /tool subtypes. --- .../extensions/storage/subtypes_belt.dm | 2 +- .../extensions/storage/subtypes_firstaid.dm | 2 +- .../extensions/storage/subtypes_pockets.dm | 2 +- code/datums/supplypacks/hydroponics.dm | 4 +- .../objects/items/weapons/material/misc.dm | 63 ------------------ .../objects/items/weapons/storage/belt.dm | 2 +- .../objects/items/weapons/storage/firstaid.dm | 2 +- .../closets/secure/hydroponics.dm | 2 +- .../structures/crates_lockers/crates.dm | 2 +- code/modules/clothing/webbing/holster.dm | 2 +- .../designs/general/designs_arms_ammo.dm | 2 +- .../designs/general/designs_tools.dm | 2 +- code/modules/mechs/equipment/combat.dm | 10 +-- .../robot/flying/module_flying_cultivator.dm | 2 +- .../silicon/robot/modules/module_clerical.dm | 2 +- code/modules/spells/spellbook/druid.dm | 2 +- code/modules/tools/components/head.dm | 6 ++ code/modules/tools/components/recipes.dm | 3 + code/modules/tools/subtypes/axes.dm | 38 +++++++++++ code/modules/tools/subtypes/machetes.dm | 48 +++++++++++++ .../artifacts/standalone/replicator.dm | 2 +- icons/obj/items/tool/axes/handaxe.dmi | Bin 0 -> 704 bytes icons/obj/items/tool/axes/hatchet.dmi | Bin 0 -> 473 bytes icons/obj/items/tool/components/tool_head.dmi | Bin 570 -> 606 bytes icons/obj/items/tool/hatchet.dmi | Bin 475 -> 0 bytes maps/antag_spawn/ert/ert_base.dmm | 2 +- maps/away/slavers/slavers_base.dmm | 4 +- maps/exodus/exodus-2.dmm | 4 +- maps/ministation/ministation-1.dmm | 2 +- maps/ministation/ministation-2.dmm | 4 +- .../crashed_pod/crashed_pod.dmm | 2 +- .../exoplanet_ruins/hydrobase/hydrobase.dmm | 2 +- maps/shaded_hills/shaded_hills-grassland.dmm | 2 +- maps/tradeship/tradeship-0.dmm | 2 +- nebula.dme | 2 + tools/map_migrations/3959_hatchets.txt | 2 + 36 files changed, 132 insertions(+), 96 deletions(-) create mode 100644 code/modules/tools/subtypes/axes.dm create mode 100644 code/modules/tools/subtypes/machetes.dm create mode 100644 icons/obj/items/tool/axes/handaxe.dmi create mode 100644 icons/obj/items/tool/axes/hatchet.dmi delete mode 100644 icons/obj/items/tool/hatchet.dmi create mode 100644 tools/map_migrations/3959_hatchets.txt diff --git a/code/datums/extensions/storage/subtypes_belt.dm b/code/datums/extensions/storage/subtypes_belt.dm index 1b139472987..13c388ca00e 100644 --- a/code/datums/extensions/storage/subtypes_belt.dm +++ b/code/datums/extensions/storage/subtypes_belt.dm @@ -18,7 +18,7 @@ /obj/item/inducer/, /obj/item/robotanalyzer, /obj/item/tool/hoe/mini, - /obj/item/hatchet, + /obj/item/tool/axe/hatchet, /obj/item/scanner/plant, /obj/item/stack/tape_roll, /obj/item/chems/spray/extinguisher/mini, diff --git a/code/datums/extensions/storage/subtypes_firstaid.dm b/code/datums/extensions/storage/subtypes_firstaid.dm index 5eb6ad1e14b..9896ba4ec5b 100644 --- a/code/datums/extensions/storage/subtypes_firstaid.dm +++ b/code/datums/extensions/storage/subtypes_firstaid.dm @@ -26,7 +26,7 @@ can_hold = list( /obj/item/screwdriver, /obj/item/wrench, - /obj/item/hatchet, + /obj/item/tool/axe/hatchet, /obj/item/utensil/fork, /obj/item/shard, /obj/item/flame/fuelled/lighter, diff --git a/code/datums/extensions/storage/subtypes_pockets.dm b/code/datums/extensions/storage/subtypes_pockets.dm index b161fe96414..a07e38ae2ae 100644 --- a/code/datums/extensions/storage/subtypes_pockets.dm +++ b/code/datums/extensions/storage/subtypes_pockets.dm @@ -13,7 +13,7 @@ storage_slots = 2 max_w_class = ITEM_SIZE_NORMAL //for knives can_hold = list( - /obj/item/hatchet, + /obj/item/tool/axe/hatchet, /obj/item/knife, ) diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm index 8eb6036c3f2..67de54be202 100644 --- a/code/datums/supplypacks/hydroponics.dm +++ b/code/datums/supplypacks/hydroponics.dm @@ -6,7 +6,7 @@ name = "Gear - Hydroponics Supplies" contains = list(/obj/item/chems/spray/plantbgone = 4, /obj/item/chems/glass/bottle/ammonia = 2, - /obj/item/hatchet, + /obj/item/tool/axe/hatchet, /obj/item/tool/hoe/mini, /obj/item/scanner/plant, /obj/item/clothing/gloves/thick/botany, @@ -41,7 +41,7 @@ /decl/hierarchy/supply_pack/hydroponics/weedcontrol name = "Gear - Weed control" - contains = list(/obj/item/hatchet = 2, + contains = list(/obj/item/tool/axe/hatchet = 2, /obj/item/chems/spray/plantbgone = 4, /obj/item/clothing/mask/gas = 2, /obj/item/grenade/chem_grenade/antiweed = 2) diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 9119f6727d6..d32d9d92b41 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -45,69 +45,6 @@ sharp = FALSE edge = FALSE -/obj/item/hatchet - name = "hatchet" - desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." - icon = 'icons/obj/items/tool/hatchet.dmi' - icon_state = "hatchet" - max_force = 15 - item_flags = ITEM_FLAG_IS_WEAPON - material_force_multiplier = 0.2 // 12 with hardness 60 (steel) - thrown_material_force_multiplier = 0.25 // 15 with weight 60 (steel) - w_class = ITEM_SIZE_SMALL - sharp = 1 - edge = 1 - origin_tech = @'{"materials":2,"combat":1}' - attack_verb = list("chopped", "torn", "cut") - material = /decl/material/solid/metal/steel - material_alteration = MAT_FLAG_ALTERATION_NAME - hitsound = "chop" - -/obj/item/hatchet/Initialize() - . = ..() - set_extension(src, /datum/extension/tool, list(TOOL_HATCHET = TOOL_QUALITY_DEFAULT)) - -/obj/item/hatchet/unbreakable - max_health = ITEM_HEALTH_NO_DAMAGE - -/obj/item/hatchet/machete - name = "machete" - desc = "A long, sturdy blade with a rugged handle. Leading the way to cursed treasures since before space travel." - icon = 'icons/obj/items/weapon/machetes/machete.dmi' - icon_state = ICON_STATE_WORLD - w_class = ITEM_SIZE_NORMAL - slot_flags = SLOT_LOWER_BODY - material = /decl/material/solid/metal/titanium - base_parry_chance = 50 - max_force = 20 - material_force_multiplier = 0.20 //20 with hardness 80 (titanium) or 15 with hardness 60 (steel) - var/static/list/standard_machete_icons = list( - 'icons/obj/items/weapon/machetes/machete.dmi', - 'icons/obj/items/weapon/machetes/machete_red.dmi', - 'icons/obj/items/weapon/machetes/machete_blue.dmi', - 'icons/obj/items/weapon/machetes/machete_black.dmi', - 'icons/obj/items/weapon/machetes/machete_olive.dmi' - ) - -/obj/item/hatchet/machete/Initialize() - icon = pick(standard_machete_icons) - . = ..() - -/obj/item/hatchet/machete/unbreakable - max_health = ITEM_HEALTH_NO_DAMAGE - -/obj/item/hatchet/machete/steel - name = "fabricated machete" - desc = "A long, machine-stamped blade with a somewhat ungainly handle. Found in military surplus stores, malls, and horror movies since before interstellar travel." - base_parry_chance = 40 - material = /decl/material/solid/metal/steel - matter = list(/decl/material/solid/organic/plastic = MATTER_AMOUNT_REINFORCEMENT) - -/obj/item/hatchet/machete/deluxe - name = "deluxe machete" - desc = "A fine example of a machete, with a polished blade, wooden handle and a leather cord loop." - icon = 'icons/obj/items/weapon/machetes/machete_dx.dmi' - /obj/item/scythe name = "scythe" desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow." diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 84b94b616ea..5716aa9d063 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -184,7 +184,7 @@ icon = 'icons/clothing/belt/machete.dmi' overlay_flags = BELT_OVERLAY_HOLSTER storage = /datum/storage/holster/machete - can_holster = list(/obj/item/hatchet/machete) + can_holster = list(/obj/item/tool/machete) sound_in = 'sound/effects/holster/sheathin.ogg' sound_out = 'sound/effects/holster/sheathout.ogg' diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index dbf33173ec0..3ba0ac1a383 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -158,7 +158,7 @@ return list( /obj/item/screwdriver, /obj/item/wrench, - /obj/item/hatchet, + /obj/item/tool/axe/hatchet, /obj/item/utensil/fork, /obj/item/shard, /obj/item/flame/fuelled/lighter, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 8c3222a8d61..057608a9af1 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -13,7 +13,7 @@ /obj/item/clothing/mask/bandana/botany, /obj/item/clothing/head/bandana/green, /obj/item/tool/hoe/mini, - /obj/item/hatchet, + /obj/item/tool/axe/hatchet, /obj/item/wirecutters/clippers, /obj/item/chems/spray/plantbgone, ) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index ef8e608c9ca..96ba4a125f0 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -247,7 +247,7 @@ /obj/item/chems/spray/plantbgone = 2, /obj/item/tool/hoe/mini = 2, /obj/item/plants = 2, - /obj/item/hatchet = 2, + /obj/item/tool/axe/hatchet = 2, /obj/item/wirecutters/clippers = 2, /obj/item/scanner/plant = 2 ) diff --git a/code/modules/clothing/webbing/holster.dm b/code/modules/clothing/webbing/holster.dm index 54ac39c2762..622fd0fee0a 100644 --- a/code/modules/clothing/webbing/holster.dm +++ b/code/modules/clothing/webbing/holster.dm @@ -79,7 +79,7 @@ desc = "A handsome synthetic leather sheath with matching belt." icon = 'icons/clothing/accessories/holsters/holster_machete.dmi' can_holster = list( - /obj/item/hatchet/machete, + /obj/item/tool/machete, /obj/item/knife/kitchen/cleaver, /obj/item/sword/katana ) diff --git a/code/modules/fabrication/designs/general/designs_arms_ammo.dm b/code/modules/fabrication/designs/general/designs_arms_ammo.dm index ce3cbb3578f..eb92c1ef0f3 100644 --- a/code/modules/fabrication/designs/general/designs_arms_ammo.dm +++ b/code/modules/fabrication/designs/general/designs_arms_ammo.dm @@ -14,7 +14,7 @@ path = /obj/item/gun/projectile/flare /datum/fabricator_recipe/arms_ammo/hidden - path = /obj/item/hatchet/machete/steel + path = /obj/item/tool/machete/steel hidden = TRUE /datum/fabricator_recipe/arms_ammo/hidden/shotgun diff --git a/code/modules/fabrication/designs/general/designs_tools.dm b/code/modules/fabrication/designs/general/designs_tools.dm index b6a10a4fd15..a7893fe4e1b 100644 --- a/code/modules/fabrication/designs/general/designs_tools.dm +++ b/code/modules/fabrication/designs/general/designs_tools.dm @@ -30,7 +30,7 @@ path = /obj/item/wrench /datum/fabricator_recipe/tool/hatchet - path = /obj/item/hatchet + path = /obj/item/tool/axe/hatchet /datum/fabricator_recipe/tool/minihoe path = /obj/item/tool/hoe/mini diff --git a/code/modules/mechs/equipment/combat.dm b/code/modules/mechs/equipment/combat.dm index 01ac69efd03..9a646515d03 100644 --- a/code/modules/mechs/equipment/combat.dm +++ b/code/modules/mechs/equipment/combat.dm @@ -234,7 +234,7 @@ restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND) restricted_software = list(MECH_SOFTWARE_UTILITY) -/obj/item/hatchet/machete/mech +/obj/item/tool/machete/mech name = "mechete" desc = "That thing is too big to be called a machete. Too big, too thick, too heavy, and too rough, it is more like a large hunk of iron." w_class = ITEM_SIZE_GARGANTUAN @@ -244,14 +244,14 @@ material_force_multiplier = 0.75 // Equals 20 AP with 25 force max_health = ITEM_HEALTH_NO_DAMAGE //Else we need a whole system for replacement blades -/obj/item/hatchet/machete/mech/apply_hit_effect(mob/living/target, mob/living/user, hit_zone) +/obj/item/tool/machete/mech/apply_hit_effect(mob/living/target, mob/living/user, hit_zone) . = ..() if (.) do_attack_effect(target, "smash") if (target.mob_size < user.mob_size) //Damaging attacks overwhelm smaller mobs target.throw_at(get_edge_target_turf(target,get_dir(user, target)),1, 1) -/obj/item/hatchet/machete/mech/resolve_attackby(atom/A, mob/user, click_params) +/obj/item/tool/machete/mech/resolve_attackby(atom/A, mob/user, click_params) //Case 1: Default, you are hitting something that isn't a mob. Just do whatever, this isn't dangerous or op. if (!isliving(A)) return ..() @@ -261,7 +261,7 @@ playsound(user, 'sound/mecha/mechmove03.ogg', 35, 1) return ..() -/obj/item/hatchet/machete/mech/attack_self(mob/living/user) +/obj/item/tool/machete/mech/attack_self(mob/living/user) . = ..() if (user.a_intent != I_HURT) return @@ -281,7 +281,7 @@ /obj/item/mech_equipment/mounted_system/melee/machete icon_state = "mech_blade" - holding = /obj/item/hatchet/machete/mech + holding = /obj/item/tool/machete/mech //Ballistic shield diff --git a/code/modules/mob/living/silicon/robot/flying/module_flying_cultivator.dm b/code/modules/mob/living/silicon/robot/flying/module_flying_cultivator.dm index c81e3acc7e9..9d2b5f06f82 100644 --- a/code/modules/mob/living/silicon/robot/flying/module_flying_cultivator.dm +++ b/code/modules/mob/living/silicon/robot/flying/module_flying_cultivator.dm @@ -11,7 +11,7 @@ /obj/item/plants, /obj/item/wirecutters/clippers, /obj/item/tool/hoe/mini/unbreakable, - /obj/item/hatchet/unbreakable, + /obj/item/tool/axe/hatchet/unbreakable, /obj/item/chems/glass/bucket, /obj/item/scalpel/laser, /obj/item/circular_saw, diff --git a/code/modules/mob/living/silicon/robot/modules/module_clerical.dm b/code/modules/mob/living/silicon/robot/modules/module_clerical.dm index 770cdbfda36..d052194f847 100644 --- a/code/modules/mob/living/silicon/robot/modules/module_clerical.dm +++ b/code/modules/mob/living/silicon/robot/modules/module_clerical.dm @@ -29,7 +29,7 @@ /obj/item/gripper/service, /obj/item/chems/glass/bucket, /obj/item/tool/hoe/mini, - /obj/item/hatchet, + /obj/item/tool/axe/hatchet, /obj/item/scanner/plant, /obj/item/plants, /obj/item/robot_harvester, diff --git a/code/modules/spells/spellbook/druid.dm b/code/modules/spells/spellbook/druid.dm index 6bd2d064f12..fd35ae19542 100644 --- a/code/modules/spells/spellbook/druid.dm +++ b/code/modules/spells/spellbook/druid.dm @@ -39,6 +39,6 @@ /obj/item/seeds, /obj/item/wirecutters/clippers, /obj/item/scanner/plant, - /obj/item/hatchet, + /obj/item/tool/axe/hatchet, /obj/item/tool/hoe/mini ) diff --git a/code/modules/tools/components/head.dm b/code/modules/tools/components/head.dm index 816557f265c..9d361406262 100644 --- a/code/modules/tools/components/head.dm +++ b/code/modules/tools/components/head.dm @@ -71,6 +71,12 @@ var/global/list/_tool_properties_cache = list() icon_state = "shovel" tool_type = /obj/item/tool/shovel +/obj/item/tool_component/head/handaxe + name = "hand axe head" + desc = "The head of a hand axe." + icon_state = "handaxe" + tool_type = /obj/item/tool/axe + /obj/item/tool_component/head/pickaxe name = "pickaxe head" desc = "The head of a pickaxe." diff --git a/code/modules/tools/components/recipes.dm b/code/modules/tools/components/recipes.dm index 76c3cf50b19..6b15a446564 100644 --- a/code/modules/tools/components/recipes.dm +++ b/code/modules/tools/components/recipes.dm @@ -36,6 +36,9 @@ /decl/stack_recipe/tool/head/shovel result_type = /obj/item/tool_component/head/shovel +/decl/stack_recipe/tool/head/handaxe + result_type = /obj/item/tool_component/head/handaxe + /decl/stack_recipe/tool/head/sledgehammer difficulty = MAT_VALUE_VERY_HARD_DIY result_type = /obj/item/tool_component/head/sledgehammer diff --git a/code/modules/tools/subtypes/axes.dm b/code/modules/tools/subtypes/axes.dm new file mode 100644 index 00000000000..74911ae6ed3 --- /dev/null +++ b/code/modules/tools/subtypes/axes.dm @@ -0,0 +1,38 @@ +/obj/item/tool/axe + name = "hand axe" + desc = "A handheld tool for chopping things, wood, food, or people." + icon_state = "preview" + icon = 'icons/obj/items/tool/axes/handaxe.dmi' + sharp = TRUE + edge = TRUE + force = 10 + handle_material = /decl/material/solid/organic/wood + material_force_multiplier = 0.3 + thrown_material_force_multiplier = 0.25 // 15 with weight 60 (steel) + max_force = 15 + item_flags = ITEM_FLAG_IS_WEAPON + origin_tech = @'{"materials":2,"combat":1}' + attack_verb = list("chopped", "torn", "cut") + hitsound = "chop" + +/obj/item/tool/axe/get_initial_tool_qualities() + var/static/list/tool_qualities = list( + TOOL_HATCHET = TOOL_QUALITY_DEFAULT + ) + return tool_qualities + +// Legacy SS13 hatchet. +/obj/item/tool/axe/hatchet + name = "hatchet" + desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." + icon = 'icons/obj/items/tool/axes/hatchet.dmi' + material_force_multiplier = 0.2 // 12 with hardness 60 (steel) + w_class = ITEM_SIZE_SMALL + material_alteration = MAT_FLAG_ALTERATION_NAME + handle_material = /decl/material/solid/organic/plastic + +/obj/item/tool/axe/hatchet/get_handle_color() + return null + +/obj/item/tool/axe/hatchet/unbreakable + max_health = ITEM_HEALTH_NO_DAMAGE diff --git a/code/modules/tools/subtypes/machetes.dm b/code/modules/tools/subtypes/machetes.dm new file mode 100644 index 00000000000..3eb8ce3b02c --- /dev/null +++ b/code/modules/tools/subtypes/machetes.dm @@ -0,0 +1,48 @@ +/obj/item/tool/machete + name = "machete" + desc = "A long, sturdy blade with a rugged handle. Leading the way to cursed treasures since before space travel." + icon = 'icons/obj/items/weapon/machetes/machete.dmi' + w_class = ITEM_SIZE_NORMAL + slot_flags = SLOT_LOWER_BODY + material = /decl/material/solid/metal/titanium + base_parry_chance = 50 + max_force = 20 + material_force_multiplier = 0.2 //20 with hardness 80 (titanium) or 15 with hardness 60 (steel) + origin_tech = @'{"materials":2,"combat":1}' + attack_verb = list("chopped", "torn", "cut") + var/static/list/standard_machete_icons = list( + 'icons/obj/items/weapon/machetes/machete.dmi', + 'icons/obj/items/weapon/machetes/machete_red.dmi', + 'icons/obj/items/weapon/machetes/machete_blue.dmi', + 'icons/obj/items/weapon/machetes/machete_black.dmi', + 'icons/obj/items/weapon/machetes/machete_olive.dmi' + ) + +/obj/item/tool/machete/Initialize() + icon = pick(standard_machete_icons) + . = ..() + +/obj/item/tool/machete/get_handle_color() + return null + +/obj/item/tool/machete/get_initial_tool_qualities() + var/static/list/tool_qualities = list( + TOOL_HATCHET = TOOL_QUALITY_MEDIOCRE, + TOOL_HAMMER = TOOL_QUALITY_BAD + ) + return tool_qualities + +/obj/item/tool/machete/unbreakable + max_health = ITEM_HEALTH_NO_DAMAGE + +/obj/item/tool/machete/steel + name = "fabricated machete" + desc = "A long, machine-stamped blade with a somewhat ungainly handle. Found in military surplus stores, malls, and horror movies since before interstellar travel." + base_parry_chance = 40 + material = /decl/material/solid/metal/steel + matter = list(/decl/material/solid/organic/plastic = MATTER_AMOUNT_REINFORCEMENT) + +/obj/item/tool/machete/deluxe + name = "deluxe machete" + desc = "A fine example of a machete, with a polished blade, wooden handle and a leather cord loop." + icon = 'icons/obj/items/weapon/machetes/machete_dx.dmi' diff --git a/code/modules/xenoarcheaology/artifacts/standalone/replicator.dm b/code/modules/xenoarcheaology/artifacts/standalone/replicator.dm index f66fdb61a95..53a2d7655a1 100644 --- a/code/modules/xenoarcheaology/artifacts/standalone/replicator.dm +++ b/code/modules/xenoarcheaology/artifacts/standalone/replicator.dm @@ -50,7 +50,7 @@ /obj/item/clipboard, /obj/item/cell, /obj/item/circular_saw, - /obj/item/hatchet, + /obj/item/tool/axe/hatchet, /obj/item/handcuffs, /obj/item/hemostat, /obj/item/knife/kitchen, diff --git a/icons/obj/items/tool/axes/handaxe.dmi b/icons/obj/items/tool/axes/handaxe.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ac66fd9d9c480c5ee7ce347d96eb3ee4511b2e3c GIT binary patch literal 704 zcmV;x0zdtUP)?F)t-2m7wB` z(%i(n{LB=Er2Ldh-Qt}5lK7<5oDzgS6O!~{SWCS2oOqC4avtrKD=1&%Hv#sFmn zS3ehU!T8oev?bZwh3-qm0SKrEC`#{t z6^cOWOzg37oRL_(Z_|z^^J7bu-ncOa0B~npuv@WvpS7ED+g;XfrVFFb+0E=uJwNrC z-MSw;J%#gzu5`?{lW!|9yqnW>VN1-u`J4D|(4Bb!YOk>YD`|8&V;X5Z)s z00000(8Vj~cPo#PG0$GPz)OvQUBbaD7s!o4LA&;&ashi(E&u=k008hGkrbY=p~0RAXG#3E1NDfv^kqD mG_*OJE;O_`UjG3A5WWENEFlN$*QJyI0000Q#l(c87Ms`94;LnFdiZ^As{dwAu=E}H8meD9w0FvN=`~aK|dKP z79TSpNK8m#WMWKAN>*4@c6M@wg@ZFmF(fx5W@cn~cy`3X!h?f>udl7ik}=kY7U{NS z94Q;;pE=>FG3u5o=%q#p6cy*5HSMNJ*MuSJnJ}T*z9j$v00DGTPE!Ct=GbNc003!v zR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainG zjE%TBGg33tGfE(w;*!LYR3KBSJijO>MTv_uC9|j)$T#HTOe;#vO@*+P6W6DoV6hC*ROL#cz3+8Tb{VGYn-5*cNBfQ>(*9&5x9N_b>(Di%)8Vm=Mf=BGl P00000NkvXXu0mjfEdjWo literal 0 HcmV?d00001 diff --git a/icons/obj/items/tool/components/tool_head.dmi b/icons/obj/items/tool/components/tool_head.dmi index 393da5e179727640e0ba3f713131144be15ad26b..dbb7e7db2bcf3bc222f8dbb7a540236e3db81d6d 100644 GIT binary patch delta 438 zcmV;n0ZIP41l|OYBrFn8OjJd{z`#jITxDW*ii)29|Np|l$@TZ{-~a#s0d!JMQvg8b z*k%9#0HKjnk$)SK&+=067_Y40>gNIuG5}4^SppAVnf(9&0ZmCnK~zYI?N-Zf#2^gh z@dFLf-V;dfEv)ZVlKp@#dk!>Hq)$07*qoM6N<$g8w1Rpa1{> delta 402 zcmV;D0d4-?1iA!}Brg?EOjJd{z`#jITxDW*ii)29|Np|l$-uzCbha}j00001bW%=J z06^y0W&i*HnvqbEf19#`tDg%vC;$^BO^eRk7`^}i0WC>HK~zYI?UqY!#2^qv`CK4i z&EAIbK7r|dWP1*f0q%d5VG$`5PUQ41kzBiOx_He;#zLI>!!pcz>BlakoZFhvIUF8h z=o~(l{QebQHgrf=9tenKEsa5z4QCuehQvTVQ=7460fR}me>NfggXrEGWH+O=z?42! zfx*)P#3AJchAE^Mm@;JOVTjPAO=%8bsB>HaN!0c<&6FkqvH_MYp(Pb;L_jsnBgB^$ zpn`E7pzc!_1JDT50fguiV_$IU)IXGtuS^H6k%^$pcQCuswDJr>a}jmnBNO2s$3?Bw z-NSb#9s#fESfee`ZuzP5Q!~9K0OEVGmrSf w-YQ#l(c87Ms`94;LnFdiZ^As{dwAu=E}H8meD9w0FvN=`~aK|dKP z79TSpNK8m#WMWKAN>*4@c6M@wg@ZFmF(fx5W@cn~cy`3X!h?f>udl7ik}=kY7U{NS z94Q;;pE=>FG3u5o=%q#p6cy*5HSMNJ*MuSJnJ}T*z9j$v00DGTPE!Ct=GbNc003)x zR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainG zjE%TBGg33tGfE(w;*!LYR3K9+Be5hoBeg_{i!&v&s2C_>$i zT=Kte9jar>PfQd)ccn{sIO_}MZg2f6Nx$76Ps$^_-h|f+VxS!0^RLkLd;uB^2a|$F R?9BiG002ovPDHLkV1m_gx)1;W diff --git a/maps/antag_spawn/ert/ert_base.dmm b/maps/antag_spawn/ert/ert_base.dmm index e107a998527..90a25ae22ba 100644 --- a/maps/antag_spawn/ert/ert_base.dmm +++ b/maps/antag_spawn/ert/ert_base.dmm @@ -143,7 +143,7 @@ "az" = ( /obj/structure/table/steel_reinforced, /obj/item/twohanded/baseballbat/aluminium, -/obj/item/hatchet, +/obj/item/tool/axe/hatchet, /turf/unsimulated/floor{ icon_state = "dark" }, diff --git a/maps/away/slavers/slavers_base.dmm b/maps/away/slavers/slavers_base.dmm index cafded89588..01b0a5d20d1 100644 --- a/maps/away/slavers/slavers_base.dmm +++ b/maps/away/slavers/slavers_base.dmm @@ -115,7 +115,7 @@ /area/slavers_base/mort) "aA" = ( /obj/structure/rack, -/obj/item/hatchet, +/obj/item/tool/axe/hatchet, /turf/floor/airless, /area/slavers_base/mort) "aB" = ( @@ -1796,7 +1796,7 @@ "fa" = ( /obj/structure/table, /obj/item/firstaid/regular, -/obj/item/hatchet, +/obj/item/tool/axe/hatchet, /turf/floor/tiled/airless, /area/slavers_base/med) "fb" = ( diff --git a/maps/exodus/exodus-2.dmm b/maps/exodus/exodus-2.dmm index 72d2aa8bb70..2ab9e42e273 100644 --- a/maps/exodus/exodus-2.dmm +++ b/maps/exodus/exodus-2.dmm @@ -20401,7 +20401,7 @@ /turf/floor/tiled/techfloor/grid, /area/exodus/crew_quarters/kitchen) "aQX" = ( -/obj/item/hatchet, +/obj/item/tool/axe/hatchet, /obj/item/tool/hoe/mini, /obj/effect/floor_decal/corner/lime{ dir = 9 @@ -20449,7 +20449,7 @@ "aRf" = ( /obj/structure/table, /obj/item/tool/hoe/mini, -/obj/item/hatchet, +/obj/item/tool/axe/hatchet, /turf/floor/tiled/steel_grid, /area/exodus/hydroponics) "aRg" = ( diff --git a/maps/ministation/ministation-1.dmm b/maps/ministation/ministation-1.dmm index 4b6dc61716e..07c49269e35 100644 --- a/maps/ministation/ministation-1.dmm +++ b/maps/ministation/ministation-1.dmm @@ -5726,7 +5726,7 @@ /obj/item/scanner/plant, /obj/item/wirecutters/clippers, /obj/item/book/skill/service/botany, -/obj/item/hatchet, +/obj/item/tool/axe/hatchet, /obj/item/tool/hoe/mini, /obj/item/tool/hoe/mini, /obj/item/tool/spade, diff --git a/maps/ministation/ministation-2.dmm b/maps/ministation/ministation-2.dmm index 9deaa60cb9f..5f8a080a925 100644 --- a/maps/ministation/ministation-2.dmm +++ b/maps/ministation/ministation-2.dmm @@ -785,7 +785,7 @@ /obj/item/shield/buckler, /obj/item/gps/explorer, /obj/item/belt/holster/machete, -/obj/item/hatchet/machete/deluxe, +/obj/item/tool/machete/deluxe, /obj/item/twohanded/spear/steel, /turf/floor/tiled/white, /area/ministation/science) @@ -2995,7 +2995,7 @@ /obj/item/chems/glass/beaker/large, /obj/item/scanner/plant, /obj/item/scanner/gas, -/obj/item/hatchet, +/obj/item/tool/axe/hatchet, /obj/item/tool/hoe/mini, /obj/item/wrench, /obj/item/wirecutters/clippers, diff --git a/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm b/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm index 6da90e0290c..0c8e1e821aa 100644 --- a/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm +++ b/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm @@ -1037,7 +1037,7 @@ /obj/item/seeds/orangeseed, /obj/item/seeds/cornseed, /obj/item/seeds/cornseed, -/obj/item/hatchet, +/obj/item/tool/axe/hatchet, /obj/item/chems/glass/bucket, /obj/item/tool/hoe/mini, /obj/item/plantspray/pests, diff --git a/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm b/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm index 3f96f286802..b07c1e7702e 100644 --- a/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm +++ b/maps/random_ruins/exoplanet_ruins/hydrobase/hydrobase.dmm @@ -833,7 +833,7 @@ /area/map_template/hydrobase/station/growA) "cq" = ( /obj/structure/closet/secure_closet/hydroponics/hydro, -/obj/item/hatchet/machete, +/obj/item/tool/machete, /turf/floor/tiled, /area/map_template/hydrobase/station/growF) "cr" = ( diff --git a/maps/shaded_hills/shaded_hills-grassland.dmm b/maps/shaded_hills/shaded_hills-grassland.dmm index 0e3a7962b57..44ca7b0fdc0 100644 --- a/maps/shaded_hills/shaded_hills-grassland.dmm +++ b/maps/shaded_hills/shaded_hills-grassland.dmm @@ -64,7 +64,7 @@ "kr" = ( /obj/structure/closet/crate/chest, /obj/item/tool/pickaxe/iron, -/obj/item/hatchet, +/obj/item/tool/axe/hatchet, /obj/abstract/exterior_marker/inside, /turf/floor/woven, /area/shaded_hills/outside) diff --git a/maps/tradeship/tradeship-0.dmm b/maps/tradeship/tradeship-0.dmm index fbf3494de2e..9001eb083b7 100644 --- a/maps/tradeship/tradeship-0.dmm +++ b/maps/tradeship/tradeship-0.dmm @@ -645,7 +645,7 @@ /turf/floor/tiled, /area/ship/trade/loading_bay) "bs" = ( -/obj/item/hatchet, +/obj/item/tool/axe/hatchet, /turf/floor, /area/ship/trade/aft_port_underside_maint) "bu" = ( diff --git a/nebula.dme b/nebula.dme index 5ad67597f52..e673b9eb307 100644 --- a/nebula.dme +++ b/nebula.dme @@ -3757,9 +3757,11 @@ #include "code\modules\tools\components\handle.dm" #include "code\modules\tools\components\head.dm" #include "code\modules\tools\components\recipes.dm" +#include "code\modules\tools\subtypes\axes.dm" #include "code\modules\tools\subtypes\drills.dm" #include "code\modules\tools\subtypes\hammers.dm" #include "code\modules\tools\subtypes\hoes.dm" +#include "code\modules\tools\subtypes\machetes.dm" #include "code\modules\tools\subtypes\pickaxes.dm" #include "code\modules\tools\subtypes\power_tools.dm" #include "code\modules\tools\subtypes\shovel.dm" diff --git a/tools/map_migrations/3959_hatchets.txt b/tools/map_migrations/3959_hatchets.txt new file mode 100644 index 00000000000..443e74690c0 --- /dev/null +++ b/tools/map_migrations/3959_hatchets.txt @@ -0,0 +1,2 @@ +/obj/item/hatchet/machete/@SUBTYPES : /obj/item/tool/machete/@SUBTYPES{@OLD} +/obj/item/hatchet/@SUBTYPES : /obj/item/tool/axe/hatchet/@SUBTYPES{@OLD} \ No newline at end of file