diff --git a/code/game/objects/items/RCL.dm b/code/game/objects/items/RCL.dm index e4c7382b3b..9513519fa9 100644 --- a/code/game/objects/items/RCL.dm +++ b/code/game/objects/items/RCL.dm @@ -2,8 +2,8 @@ name = "rapid cable layer" desc = "A device used to rapidly deploy cables. It has screws on the side which can be removed to slide off the cables. Do not use without insulation!" icon = 'icons/obj/tools.dmi' - icon_state = "rcl-empty" - item_state = "rcl-0" + icon_state = "rcl" + item_state = "rcl" var/obj/structure/cable/last var/obj/item/stack/cable_coil/loaded opacity = FALSE @@ -23,6 +23,10 @@ var/datum/radial_menu/persistent/wiring_gui_menu var/mob/listeningTo +/obj/item/twohanded/rcl/Initialize() + . = ..() + update_icon() + /obj/item/twohanded/rcl/ComponentInitialize() . = ..() AddElement(/datum/element/update_icon_updates_onmob) @@ -105,7 +109,15 @@ . = ..() if(!loaded || !loaded.amount) return - var/mutable_appearance/cable_overlay = mutable_appearance(icon, "rcl-[max(CEILING(loaded.amount/(max_amount/3), 1), 3)]") + var/mutable_appearance/cable_overlay = mutable_appearance(icon, "[initial(icon_state)]-[CEILING(loaded.amount/(max_amount/3), 1)]") + cable_overlay.color = GLOB.cable_colors[colors[current_color_index]] + . += cable_overlay + +/obj/item/twohanded/rcl/worn_overlays(isinhands, icon_file, style_flags = NONE) + . = ..() + if(!isinhands || !(loaded?.amount)) + return + var/mutable_appearance/cable_overlay = mutable_appearance(icon, "rcl-[CEILING(loaded.amount/(max_amount/3), 1)]") cable_overlay.color = GLOB.cable_colors[colors[current_color_index]] . += cable_overlay @@ -279,18 +291,6 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook) wiringGuiUpdate(user) - -/obj/item/twohanded/rcl/pre_loaded/Initialize() //Comes preloaded with cable, for testing stuff - . = ..() - loaded = new() - loaded.max_amount = max_amount - loaded.amount = max_amount - update_icon() - -/obj/item/twohanded/rcl/Initialize() - . = ..() - update_icon() - /obj/item/twohanded/rcl/ui_action_click(mob/user, action) if(istype(action, /datum/action/item_action/rcl_col)) current_color_index++; @@ -309,10 +309,15 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook) else //open the menu showWiringGui(user) +/obj/item/twohanded/rcl/pre_loaded/Initialize() //Comes preloaded with cable, for testing stuff + loaded = new() + loaded.max_amount = max_amount + loaded.amount = max_amount + return ..() + /obj/item/twohanded/rcl/ghetto actions_types = list() max_amount = 30 name = "makeshift rapid cable layer" icon_state = "rclg" - item_state = "rclg" ghetto = TRUE diff --git a/icons/mob/inhands/equipment/tools_lefthand.dmi b/icons/mob/inhands/equipment/tools_lefthand.dmi index 72b994328d..c25ea837da 100644 Binary files a/icons/mob/inhands/equipment/tools_lefthand.dmi and b/icons/mob/inhands/equipment/tools_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/tools_righthand.dmi b/icons/mob/inhands/equipment/tools_righthand.dmi index ef1001c438..65f1145278 100644 Binary files a/icons/mob/inhands/equipment/tools_righthand.dmi and b/icons/mob/inhands/equipment/tools_righthand.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index ee703fc70b..6a2bb343df 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ