diff --git a/code/game/machinery/computer/orders/order_items/mining/order_mining.dm b/code/game/machinery/computer/orders/order_items/mining/order_mining.dm index babbd4a4738..72fca5f3ccd 100644 --- a/code/game/machinery/computer/orders/order_items/mining/order_mining.dm +++ b/code/game/machinery/computer/orders/order_items/mining/order_mining.dm @@ -46,6 +46,10 @@ purchase_path = /obj/item/crusher_trophy/retool_kit/dagger cost_per_order = 150 +/datum/orderable_item/mining/crusher_retool_kit_glaive + purchase_path = /obj/item/crusher_trophy/retool_kit/glaive + cost_per_order = 150 + /datum/orderable_item/mining/resonator purchase_path = /obj/item/resonator cost_per_order = 710 diff --git a/code/modules/mining/equipment/kinetic_crusher/trophies_misc.dm b/code/modules/mining/equipment/kinetic_crusher/trophies_misc.dm index 4d50d0aa3f7..3cbbc24e51f 100644 --- a/code/modules/mining/equipment/kinetic_crusher/trophies_misc.dm +++ b/code/modules/mining/equipment/kinetic_crusher/trophies_misc.dm @@ -10,12 +10,22 @@ icon = 'icons/obj/mining.dmi' icon_state = "retool_kit" denied_type = /obj/item/crusher_trophy/retool_kit + /// Specifies the icon file in which the crusher's new state is stored. + var/retool_icon = 'icons/obj/mining.dmi' ///Specifies the sprite/icon state which the crusher is changed to as an item. Should appear in the icons/obj/mining.dmi file with accompanying "lit" and "recharging" sprites - var/retool_icon = "crusher_sword" - ///Specifies the icon state for the crusher's appearance in hand. Should appear in both icons/mob/inhands/weapons/hammers_lefthand.dmi and icons/mob/inhands/weapons/hammers_righthand.dmi + var/retool_icon_state = "crusher_sword" + ///Specifies the icon state for the crusher's appearance in hand. Should appear in both retool_lefthand_file and retool_righthand_file, which are icons/mob/inhands/weapons/hammers_lefthand.dmi and icons/mob/inhands/weapons/hammers_righthand.dmi by default. var/retool_inhand_icon = "crusher_sword" ///For if the retool kit changes the projectile's appearance. The sprite should be in icons/obj/weapons/guns/projectiles.dmi var/retool_projectile_icon = "pulse1" + /// Specifies the left hand inhand icon file. If both this and retool_righthand_file are set, changes the inhand files and dimensions as appropriate. + var/retool_lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi' + /// Specifies the right hand inhand icon file. If both this and retool_lefthand_file are set, changes the inhand files and dimensions as appropriate. + var/retool_righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi' + /// Specifies the X dimensions of the new inhand, only relevant with different inhand files. + var/retool_inhand_X = 32 + /// Specifies the Y dimensions of the new inhand, only relevant with different inhand files. + var/retool_inhand_Y = 32 /obj/item/crusher_trophy/retool_kit/effect_desc() return "the crusher to have the appearance of a sword" @@ -23,34 +33,39 @@ /obj/item/crusher_trophy/retool_kit/add_to(obj/item/kinetic_crusher/pkc, mob/user) . = ..() if(.) - pkc.icon_state = retool_icon + pkc.icon = retool_icon + pkc.icon_state = retool_icon_state pkc.current_inhand_icon_state = retool_inhand_icon pkc.projectile_icon = retool_projectile_icon + pkc.inhand_x_dimension = retool_inhand_X + pkc.inhand_y_dimension = retool_inhand_Y + pkc.update_appearance() if(iscarbon(pkc.loc)) var/mob/living/carbon/holder = pkc.loc holder.update_worn_back() holder.update_suit_storage() holder.update_held_items() - pkc.update_appearance() /obj/item/crusher_trophy/retool_kit/remove_from(obj/item/kinetic_crusher/pkc) + pkc.icon = initial(pkc.icon) pkc.icon_state = initial(pkc.icon_state) pkc.current_inhand_icon_state = initial(pkc.current_inhand_icon_state) pkc.projectile_icon = initial(pkc.projectile_icon) + pkc.lefthand_file = initial(pkc.lefthand_file) + pkc.righthand_file = initial(pkc.righthand_file) + pkc.inhand_x_dimension = initial(pkc.inhand_x_dimension) + pkc.inhand_y_dimension = initial(pkc.inhand_y_dimension) + pkc.update_appearance() if(iscarbon(pkc.loc)) var/mob/living/carbon/holder = pkc.loc holder.update_worn_back() holder.update_suit_storage() holder.update_held_items() - pkc.update_appearance() ..() /obj/item/crusher_trophy/retool_kit/harpoon name = "crusher harpoon retool kit" desc = "A toolkit for changing the crusher's appearance without affecting the device's function. This one will make it look like a harpoon." - icon = 'icons/obj/mining.dmi' - icon_state = "retool_kit" - denied_type = /obj/item/crusher_trophy/retool_kit retool_icon = "crusher_harpoon" retool_inhand_icon = "crusher_harpoon" retool_projectile_icon = "pulse_harpoon" @@ -61,21 +76,29 @@ /obj/item/crusher_trophy/retool_kit/dagger name = "crusher dagger retool kit" desc = "A toolkit for changing the crusher's appearance without affecting the device's function. This one will make it look like a dual dagger and mini-blaster on a chain." - icon = 'icons/obj/mining.dmi' - icon_state = "retool_kit" - denied_type = /obj/item/crusher_trophy/retool_kit retool_icon = "crusher_dagger" retool_inhand_icon = "crusher_dagger" /obj/item/crusher_trophy/retool_kit/dagger/effect_desc() return "the crusher to have the appearance of a dual dagger and blaster" +/obj/item/crusher_trophy/retool_kit/glaive + name = "crusher glaive retool kit" + desc = "A toolkit for changing the crusher's appearance without affecting the device's function. This one will make it look like a glaive, with a longer, thinner blade." + retool_icon = "crusher_glaive" + retool_inhand_icon = "crusher_glaive" + retool_lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi' + retool_righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' + retool_inhand_X = 64 + retool_inhand_Y = 64 + +/obj/item/crusher_trophy/retool_kit/glaive/effect_desc() + return "the crusher to have the appearance of a glaive" + /obj/item/crusher_trophy/retool_kit/ashenskull name = "ashen skull" desc = "It burns with the flame of the necropolis, whispering in your ear. It demands to be bound to a suitable weapon." - icon = 'icons/obj/mining.dmi' icon_state = "retool_kit_skull" - denied_type = /obj/item/crusher_trophy/retool_kit retool_icon = "crusher_skull" retool_inhand_icon = "crusher_skull" retool_projectile_icon = "pulse_skull" diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 563c8f684c5..872eeee0946 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index cf9a23033a7..ce958e1df22 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/mob/inhands/64x64_lefthand.dmi b/icons/mob/inhands/64x64_lefthand.dmi index d46d2b439f5..49dbe635e56 100644 Binary files a/icons/mob/inhands/64x64_lefthand.dmi and b/icons/mob/inhands/64x64_lefthand.dmi differ diff --git a/icons/mob/inhands/64x64_righthand.dmi b/icons/mob/inhands/64x64_righthand.dmi index 8adb31df854..952d85c83fd 100644 Binary files a/icons/mob/inhands/64x64_righthand.dmi and b/icons/mob/inhands/64x64_righthand.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index 5f850703d19..5a933d9d468 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ