diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index dd1e2ee4ded..681c4b7b077 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -1440,6 +1440,12 @@ var/mob/living/carbon/human/wearer = M wearer.regenerate_icons() // update that mf to_chat(M, "[src] is now skinned as '[pick].'") + post_reskin(M) + +/// Automatically called after a reskin, for any extra variable changes. +/obj/item/proc/post_reskin(mob/our_mob) + return + /// SKYRAT EDIT ADDITION END /// Special stuff you want to do when an outfit equips this item. diff --git a/modular_skyrat/master_files/icons/mob/64x64_lefthand.dmi b/modular_skyrat/master_files/icons/mob/64x64_lefthand.dmi index ba570208a15..70ac1d387c1 100644 Binary files a/modular_skyrat/master_files/icons/mob/64x64_lefthand.dmi and b/modular_skyrat/master_files/icons/mob/64x64_lefthand.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/64x64_righthand.dmi b/modular_skyrat/master_files/icons/mob/64x64_righthand.dmi index 2ef79054e9d..f92f3e53470 100644 Binary files a/modular_skyrat/master_files/icons/mob/64x64_righthand.dmi and b/modular_skyrat/master_files/icons/mob/64x64_righthand.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/back.dmi b/modular_skyrat/master_files/icons/mob/clothing/back.dmi index c67cca49358..4b86cf9ffb2 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/back.dmi and b/modular_skyrat/master_files/icons/mob/clothing/back.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/kinetic_glaive.dmi b/modular_skyrat/master_files/icons/obj/kinetic_glaive.dmi new file mode 100644 index 00000000000..ae0bbdb0625 Binary files /dev/null and b/modular_skyrat/master_files/icons/obj/kinetic_glaive.dmi differ diff --git a/modular_skyrat/modules/mining_vendor_additions/code/order_mining.dm b/modular_skyrat/modules/mining_vendor_additions/code/order_mining.dm index cccdfc50688..e9b2485ba40 100644 --- a/modular_skyrat/modules/mining_vendor_additions/code/order_mining.dm +++ b/modular_skyrat/modules/mining_vendor_additions/code/order_mining.dm @@ -5,3 +5,35 @@ /datum/orderable_item/mining/suit_voucher item_path = /obj/item/suit_voucher cost_per_order = 2000 + +/obj/item/kinetic_crusher + uses_advanced_reskins = TRUE + unique_reskin = list( + "Crusher" = list( + RESKIN_ICON = 'icons/obj/mining.dmi', + RESKIN_ICON_STATE = "crusher", + RESKIN_INHAND_L = 'icons/mob/inhands/weapons/hammers_lefthand.dmi', + RESKIN_INHAND_R = 'icons/mob/inhands/weapons/hammers_righthand.dmi', + RESKIN_INHAND_STATE = "crusher0", + ), + "Glaive" = list( + RESKIN_ICON = 'modular_skyrat/master_files/icons/obj/kinetic_glaive.dmi', + RESKIN_ICON_STATE = "crusher-glaive", + RESKIN_WORN_ICON = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi', + RESKIN_WORN_ICON_STATE = "crusher-glaive", + RESKIN_INHAND_L = 'modular_skyrat/master_files/icons/mob/64x64_lefthand.dmi', + RESKIN_INHAND_R = 'modular_skyrat/master_files/icons/mob/64x64_righthand.dmi', + ), + ) + +/obj/item/kinetic_crusher/post_reskin(mob/our_mob) + if(icon_state == "crusher-glaive") + name = "proto-kinetic glaive" + desc = "A modified proto-kinetic crusher, it is still little more than various mining tools cobbled together \ + into a high-tech knife on a stick with a handguard and goliath-leather grip. While equally as effective as its unmodified compatriots, \ + it still does little to aid any but the most skilled - or suicidal." + attack_verb_continuous = list("slices", "slashes", "cleaves", "chops", "stabs") + attack_verb_simple = list("slice", "slash", "cleave", "chop", "stab") + inhand_x_dimension = 64 + inhand_y_dimension = 64 + our_mob.update_held_items()