diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 4d287f15980..f529ec7b652 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -375,14 +375,14 @@ result = /obj/item/clothing/head/lizard time = 10 reqs = list(/obj/item/organ/tail/lizard = 1) - category = CAT_MISC + category = CAT_CLOTHING /datum/crafting_recipe/lizardhat_alternate name = "Lizard Cloche Hat" result = /obj/item/clothing/head/lizard time = 10 reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1) - category = CAT_MISC + category = CAT_CLOTHING /datum/crafting_recipe/kittyears name = "Kitty Ears" @@ -390,7 +390,7 @@ time = 10 reqs = list(/obj/item/organ/tail/cat = 1, /obj/item/organ/ears/cat = 1) - category = CAT_MISC + category = CAT_CLOTHING /datum/crafting_recipe/skateboard name = "Skateboard" @@ -826,3 +826,12 @@ /obj/item/assembly/signaler/anomaly/bluespace = 1) result = /obj/item/storage/backpack/holding category = CAT_CLOTHING + +/datum/crafting_recipe/ipickaxe + name = "Improvised Pickaxe" + reqs = list( + /obj/item/crowbar = 1, + /obj/item/kitchen/knife = 1, + /obj/item/stack/sticky_tape = 1) + result = /obj/item/pickaxe/improvised + category = CAT_MISC diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 3c6c6f1732f..9e7e8cda1eb 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -92,11 +92,22 @@ icon_state = "jackhammer" item_state = "jackhammer" toolspeed = 0.1 //the epitome of powertools. extremely fast mining - w_class = WEIGHT_CLASS_HUGE //the epitome of power(gamer)tools is CHUNCKY usesound = 'sound/weapons/sonic_jackhammer.ogg' hitsound = 'sound/weapons/sonic_jackhammer.ogg' desc = "Cracks rocks with sonic blasts." +/obj/item/pickaxe/improvised + name = "improvised pickaxe" + desc = "A pickaxe made with a knife and crowbar taped together, how does it not break?" + icon_state = "ipickaxe" + item_state = "ipickaxe" + force = 10 + throwforce = 7 + toolspeed = 3 //3 times slower than a normal pickaxe + slot_flags = ITEM_SLOT_BELT + w_class = WEIGHT_CLASS_NORMAL + custom_materials = list(/datum/material/iron=12050) //metal needed for a crowbar and for a knife, why the FUCK does a knife cost 6 metal sheets while a crowbar costs 0.025 sheets? shit makes no sense fuck this + /obj/item/shovel name = "shovel" desc = "A large tool for digging and moving dirt." diff --git a/icons/mob/inhands/equipment/mining_lefthand.dmi b/icons/mob/inhands/equipment/mining_lefthand.dmi index 7496aba625a..709180b32c4 100644 Binary files a/icons/mob/inhands/equipment/mining_lefthand.dmi and b/icons/mob/inhands/equipment/mining_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/mining_righthand.dmi b/icons/mob/inhands/equipment/mining_righthand.dmi index de3d11978a0..45e05bdd314 100644 Binary files a/icons/mob/inhands/equipment/mining_righthand.dmi and b/icons/mob/inhands/equipment/mining_righthand.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index d3435a8333c..4a13ba54048 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ