diff --git a/code/__defines/color.dm b/code/__defines/color.dm index 2ddfaf18475..339b6884328 100644 --- a/code/__defines/color.dm +++ b/code/__defines/color.dm @@ -93,6 +93,8 @@ #define COLOR_SNOW "#9CADAD" #define COLOR_LING_HIVEMIND "#583012" +#define COLOR_TOOLS "#eac041" + // Blood colors #define COLOR_HUMAN_BLOOD "#A10808" diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index de2cabf214a..ea2259168f4 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -50,14 +50,6 @@ dufflebag = /obj/item/storage/backpack/duffel/eng messengerbag = /obj/item/storage/backpack/messenger/engi - belt_contents = list( - /obj/item/weldingtool/largetank = 1, // industrial welding tool - /obj/item/crowbar = 1, - /obj/item/wirecutters = 1, - /obj/item/stack/cable_coil/random = 1, - /obj/item/powerdrill = 1 - ) - /datum/outfit/job/chief_engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(istajara(H)) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 565d4cc8da1..ae8f306eae8 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -104,13 +104,21 @@ icon_state = "utilitybelt_ce" item_state = "utility_ce" + starts_with = list( + /obj/item/weldingtool/largetank = 1, // industrial welding tool + /obj/item/crowbar = 1, + /obj/item/wirecutters/toolbelt = 1, + /obj/item/stack/cable_coil/random = 1, + /obj/item/powerdrill = 1 + ) + /obj/item/storage/belt/utility/full starts_with = list( /obj/item/screwdriver = 1, /obj/item/wrench = 1, /obj/item/weldingtool = 1, /obj/item/crowbar = 1, - /obj/item/wirecutters = 1, + /obj/item/wirecutters/toolbelt = 1, /obj/item/stack/cable_coil/random = 1, /obj/item/powerdrill = 1 ) @@ -119,7 +127,7 @@ starts_with = list( /obj/item/weldingtool/largetank = 1, /obj/item/crowbar = 1, - /obj/item/wirecutters = 1, + /obj/item/wirecutters/toolbelt = 1, /obj/item/stack/cable_coil/random = 1, /obj/item/powerdrill = 1, /obj/item/device/multitool = 1, diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 52be76ffd16..46febfefd44 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -144,10 +144,12 @@ build_from_parts = TRUE worn_overlay = "head" + var/list/color_options = list(COLOR_BLUE, COLOR_RED, COLOR_PURPLE, COLOR_BROWN, COLOR_GREEN, COLOR_CYAN, COLOR_YELLOW) + /obj/item/wirecutters/Initialize() . = ..() if(build_from_parts) - color = pick(COLOR_BLUE, COLOR_RED, COLOR_PURPLE, COLOR_BROWN, COLOR_GREEN, COLOR_CYAN, COLOR_YELLOW) + color = pick(color_options) add_overlay(overlay_image(icon, "[initial(icon_state)]_[worn_overlay]", flags=RESET_COLOR)) /obj/item/wirecutters/update_icon() @@ -192,6 +194,9 @@ /obj/item/wirecutters/iswirecutter() return TRUE +/obj/item/wirecutters/toolbelt + color_options = list(COLOR_TOOLS) + /obj/item/wirecutters/bomb name = "bomb defusal wirecutters" desc = "A tool used to delicately sever the wires used in bomb fuses." diff --git a/html/changelogs/geeves-more_tool_sprites.yml b/html/changelogs/geeves-more_tool_sprites.yml new file mode 100644 index 00000000000..8900664f156 --- /dev/null +++ b/html/changelogs/geeves-more_tool_sprites.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - imageadd: "Resprited wrenches and crowbars to match the new tool style." + - tweak: "Tweaked wirecutters to spawn in the same color as the other tools in your toolbelt. Random wirecutters will still have random colors." \ No newline at end of file diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index 8f89da9e2a6..95002b6d92a 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ