diff --git a/modular_zubbers/code/datums/components/crafting/tools.dm b/modular_zubbers/code/datums/components/crafting/tools.dm index 0a98cb46e92..2124267f2ad 100644 --- a/modular_zubbers/code/datums/components/crafting/tools.dm +++ b/modular_zubbers/code/datums/components/crafting/tools.dm @@ -1,23 +1,39 @@ /datum/crafting_recipe/pn_jaws name = "Proto Nitrate Jaws of Life" result = /obj/item/crowbar/power/protonitrate - time = 20 SECONDS + time = 3 SECONDS reqs = list(/obj/item/crowbar/power = 1, /obj/item/grenade/gas_crystal/proto_nitrate_crystal = 1) category = CAT_TOOLS +/datum/crafting_recipe/pn_jaws/science + name = "Proto Nitrate Hybrid Cutters" + result = /obj/item/crowbar/power/protonitrate/science + time = 3 SECONDS + reqs = list(/obj/item/crowbar/power/science = 1, + /obj/item/grenade/gas_crystal/proto_nitrate_crystal = 1) + category = CAT_TOOLS + /datum/crafting_recipe/pn_drill name = "Proto Nitrate Hand Drill" result = /obj/item/screwdriver/power/protonitrate - time = 20 SECONDS + time = 3 SECONDS reqs = list(/obj/item/screwdriver/power = 1, /obj/item/grenade/gas_crystal/proto_nitrate_crystal = 1) category = CAT_TOOLS +/datum/crafting_recipe/pn_drill/science + name = "Proto Nitrate Hand Drill" + result = /obj/item/screwdriver/power/protonitrate/science + time = 3 SECONDS + reqs = list(/obj/item/screwdriver/power/science = 1, + /obj/item/grenade/gas_crystal/proto_nitrate_crystal = 1) + category = CAT_TOOLS + /datum/crafting_recipe/pn_welder name = "Proto Nitrate Welding Tool" result = /obj/item/weldingtool/experimental/protonitrate - time = 20 SECONDS + time = 3 SECONDS reqs = list(/obj/item/weldingtool/experimental = 1, /obj/item/grenade/gas_crystal/proto_nitrate_crystal = 1) category = CAT_TOOLS diff --git a/modular_zubbers/code/game/Items/tools.dm b/modular_zubbers/code/game/Items/tools.dm index 0d3c9389b81..20181449adf 100644 --- a/modular_zubbers/code/game/Items/tools.dm +++ b/modular_zubbers/code/game/Items/tools.dm @@ -1,11 +1,31 @@ +// Power Tools Belt Overlays +/obj/item/crowbar/power/get_belt_overlay() + if(tool_behaviour != TOOL_WIRECUTTER) + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "jaws") + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "jaws_on") + +/obj/item/crowbar/power/science/get_belt_overlay() + if(tool_behaviour != TOOL_WIRECUTTER) + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "sci_jaws") + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "sci_jaws_on") + +/obj/item/screwdriver/power/get_belt_overlay() + if(tool_behaviour != TOOL_WRENCH) + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "drill") + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "drill_on") + +/obj/item/screwdriver/power/science/get_belt_overlay() + if(tool_behaviour != TOOL_WRENCH) + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "sci_drill") + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "sci_drill_on") + + +// Proto Nitrate Tools /obj/item/crowbar/power/protonitrate name = "proto nitrate jaws of life" desc = "Hydraulic tool combined with Proto Nitrate Crystal for increased efficeincy." icon = 'modular_zubbers/icons/obj/equipment/equipment.dmi' icon_state = "pn_jaws" - lefthand_file = 'modular_zubbers/icons/mob/inhands/equipment/equipment_lefthand.dmi' - righthand_file = 'modular_zubbers/icons/mob/inhands/equipment/equipment_righthand.dmi' - inhand_icon_state = "pn_jaws" toolspeed = 0.5 /obj/item/crowbar/power/protonitrate/Initialize(mapload) @@ -28,19 +48,47 @@ toolspeed = 0.25 return COMPONENT_NO_DEFAULT_MESSAGE +/obj/item/crowbar/power/protonitrate/get_belt_overlay() + if(tool_behaviour != TOOL_WIRECUTTER) + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_jaws") + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_jaws_on") + +/obj/item/crowbar/power/protonitrate/science + name = "proto nitrate hybrid cutters" // hybrid between crowbar and wirecutters + desc = "Hybrid cutters combined with Proto Nitrate Crystal for increased efficeincy but without the hydraulic force required to pry open doors." + icon_state = "pn_jaws_sci" + inhand_icon_state = "jaws_sci" + force_opens = FALSE + +/obj/item/crowbar/power/protonitrate/science/get_belt_overlay() + if(tool_behaviour != TOOL_WIRECUTTER) + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_sci_jaws") + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_sci_jaws_on") + /obj/item/screwdriver/power/protonitrate name = "proto nitrate hand drill" desc = "Hand drill combined with Proto Nitrate Crystal for increased efficeincy." icon = 'modular_zubbers/icons/obj/equipment/equipment.dmi' icon_state = "pn_drill" - lefthand_file = 'modular_zubbers/icons/mob/inhands/equipment/equipment_lefthand.dmi' - righthand_file = 'modular_zubbers/icons/mob/inhands/equipment/equipment_righthand.dmi' - inhand_icon_state = "pn_drill" toolspeed = 0.25 +/obj/item/screwdriver/power/protonitrate/get_belt_overlay() + if(tool_behaviour != TOOL_WRENCH) + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_drill") + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_drill_on") + +/obj/item/screwdriver/power/protonitrate/science + icon_state = "pn_drill_sci" + +/obj/item/screwdriver/power/protonitrate/science/get_belt_overlay() + if(tool_behaviour != TOOL_WRENCH) + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_sci_drill") + return mutable_appearance('modular_zubbers/icons/obj/clothing/belt_overlays.dmi', "pn_sci_drill_on") + /obj/item/weldingtool/experimental/protonitrate name = "proto nitrate welding tool" desc = "An experimental welder further enchanced by combining it with Proto Nitrate Crystal." icon = 'modular_zubbers/icons/obj/equipment/equipment.dmi' icon_state = "pn_welder" toolspeed = 0.25 + diff --git a/modular_zubbers/icons/mob/inhands/equipment/equipment_lefthand.dmi b/modular_zubbers/icons/mob/inhands/equipment/equipment_lefthand.dmi deleted file mode 100644 index 8c864a0c6bc..00000000000 Binary files a/modular_zubbers/icons/mob/inhands/equipment/equipment_lefthand.dmi and /dev/null differ diff --git a/modular_zubbers/icons/mob/inhands/equipment/equipment_righthand.dmi b/modular_zubbers/icons/mob/inhands/equipment/equipment_righthand.dmi deleted file mode 100644 index c68ddaa7074..00000000000 Binary files a/modular_zubbers/icons/mob/inhands/equipment/equipment_righthand.dmi and /dev/null differ diff --git a/modular_zubbers/icons/obj/clothing/belt_overlays.dmi b/modular_zubbers/icons/obj/clothing/belt_overlays.dmi new file mode 100644 index 00000000000..e53b81f03c2 Binary files /dev/null and b/modular_zubbers/icons/obj/clothing/belt_overlays.dmi differ diff --git a/modular_zubbers/icons/obj/equipment/equipment.dmi b/modular_zubbers/icons/obj/equipment/equipment.dmi index 08725ec17ec..a8a2c05b992 100644 Binary files a/modular_zubbers/icons/obj/equipment/equipment.dmi and b/modular_zubbers/icons/obj/equipment/equipment.dmi differ