From ab9e2a3ab714241483ea5f50547ddcf86a8a7872 Mon Sep 17 00:00:00 2001 From: Twaticus <46540570+Twaticus@users.noreply.github.com> Date: Sun, 20 Apr 2025 18:59:19 -0400 Subject: [PATCH] Crafter's Toolbox (#90639) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Title makes the pr sound cooler than it actually is 😏 ## About The Pull Request Splits Artistic Toolbox into a painting related one, and a crafting related one. Artistic Toolbox now includes Crayons, 2 Spray Cans, Paint Palette, and 3 Buckets of Adaptive Paint. ![dreamseeker_wrGjs9HcXC](https://github.com/user-attachments/assets/f7edae0f-32d1-471f-a989-6410d389bba8) Crafter Toolbox includes Crayons, Camera, Film Cartridge, Chisel, and various colors of Pipe Cleaners. ![dreamseeker_pEyY6pkEr8](https://github.com/user-attachments/assets/69666273-8a3a-4c5e-938f-a33211aab1e2) (camera is kind of a placeholder for more 'crafty' future additions) Removes crowbar from artistic toolbox cause i thought it was weird. Renames fishing toolbox. Gives fishing toolbox its own inhands. Renames artistic toolbox inhands. Replaces some crayon/chisel/pipe cleaner spawns with artistic and crafter toolboxes on various maps. ## Why It's Good For The Game i think it'll be useful in the future and sometimes i wanna map in a painting toolbox without a billion pipecleaners in it also hot pink toolbox duh ![dreamseeker_M3O3IgEQaW](https://github.com/user-attachments/assets/ce71977d-cf4a-4085-be08-0ba901c5eb98) ## Changelog :cl: add: Adds a crafters toolbox storing chisels and pipecleaners. Artistic toolbox now stores various painting supplies instead. /:cl: --- _maps/RandomZLevels/museum.dmm | 1 + .../map_files/Deltastation/DeltaStation2.dmm | 63 +++++++++++++----- .../map_files/IceBoxStation/IceBoxStation.dmm | 11 ++- _maps/map_files/MetaStation/MetaStation.dmm | 20 +++--- .../map_files/NebulaStation/NebulaStation.dmm | 26 ++++++-- _maps/map_files/tramstation/tramstation.dmm | 25 ++++--- _maps/map_files/wawastation/wawastation.dmm | 27 +++++--- code/game/objects/items/his_grace.dm | 4 +- code/game/objects/items/storage/toolbox.dm | 30 ++++++++- code/game/objects/items/toys.dm | 2 +- code/modules/cargo/packs/general.dm | 1 + code/modules/fishing/fishing_equipment.dm | 4 +- .../inhands/equipment/toolbox_lefthand.dmi | Bin 2298 -> 1371 bytes .../inhands/equipment/toolbox_righthand.dmi | Bin 1300 -> 1397 bytes icons/obj/storage/toolbox.dmi | Bin 2415 -> 2402 bytes 15 files changed, 152 insertions(+), 62 deletions(-) diff --git a/_maps/RandomZLevels/museum.dmm b/_maps/RandomZLevels/museum.dmm index b85746b3249..113fe2b6987 100644 --- a/_maps/RandomZLevels/museum.dmm +++ b/_maps/RandomZLevels/museum.dmm @@ -2952,6 +2952,7 @@ /obj/structure/closet/crate/cardboard, /obj/item/storage/toolbox/artistic, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/storage/toolbox/crafter, /turf/open/indestructible/plating, /area/awaymission/museum) "xR" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 6957bd962ca..0468b828831 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -28416,15 +28416,17 @@ /area/station/command/bridge) "gWv" = ( /obj/structure/table/wood, -/obj/item/storage/crayons, -/obj/item/storage/crayons, -/obj/item/chisel{ - pixel_x = 4; - pixel_y = 3 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/item/storage/toolbox/artistic{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/storage/toolbox/crafter{ + pixel_x = 2; + pixel_y = 1 + }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "gWy" = ( @@ -42751,8 +42753,14 @@ /area/station/hallway/secondary/entry) "kEo" = ( /obj/structure/table/wood, -/obj/item/storage/crayons, -/obj/item/storage/crayons, +/obj/item/storage/toolbox/artistic{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/storage/toolbox/crafter{ + pixel_x = 2; + pixel_y = 1 + }, /turf/open/floor/wood, /area/station/service/library/abandoned) "kEp" = ( @@ -46028,15 +46036,18 @@ /area/station/engineering/atmos/storage) "lvL" = ( /obj/structure/table/wood, -/obj/item/storage/dice{ - pixel_x = 12; - pixel_y = 1 - }, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/machinery/status_display/ai/directional/south, -/obj/effect/spawner/random/bureaucracy/folder, +/obj/item/storage/toolbox/artistic{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/storage/toolbox/crafter{ + pixel_x = 2; + pixel_y = 1 + }, /turf/open/floor/wood/large, /area/station/service/library/lounge) "lvU" = ( @@ -52953,11 +52964,16 @@ "nkL" = ( /obj/structure/table/wood, /obj/item/storage/box/actionfigure{ - pixel_y = 12 + pixel_y = 20; + pixel_x = 0 }, /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/effect/spawner/random/bureaucracy/folder{ + pixel_x = 3; + pixel_y = 0 + }, /turf/open/floor/wood/large, /area/station/service/library/lounge) "nkN" = ( @@ -67743,8 +67759,18 @@ /obj/machinery/airalarm/directional/east, /obj/machinery/light_switch/directional/south, /obj/structure/table/wood, -/obj/item/paper_bin/carbon, -/obj/item/pen, +/obj/item/paper_bin/carbon{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/storage/dice{ + pixel_x = -11; + pixel_y = 1 + }, /turf/open/floor/wood/large, /area/station/service/library/lounge) "qVn" = ( @@ -79893,7 +79919,10 @@ /area/station/science/research) "tWf" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp, +/obj/item/flashlight/lamp{ + pixel_x = 0; + pixel_y = 9 + }, /obj/effect/turf_decal/siding/wood{ dir = 8 }, diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index fcd6c932f33..98d2ee65335 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -71512,10 +71512,15 @@ /turf/open/floor/stone, /area/station/service/bar/atrium) "uma" = ( -/obj/item/chisel, -/obj/item/storage/toolbox/artistic, +/obj/item/storage/toolbox/artistic{ + pixel_x = -1; + pixel_y = 2 + }, /obj/structure/rack, -/obj/item/storage/crayons, +/obj/item/storage/toolbox/crafter{ + pixel_x = 3; + pixel_y = -3 + }, /turf/open/floor/sepia, /area/station/security/prison/rec) "umg" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 5fbf97c4731..234f4c8358d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -36899,9 +36899,6 @@ /obj/item/canvas, /obj/item/canvas, /obj/item/canvas, -/obj/item/chisel{ - pixel_y = 7 - }, /turf/open/floor/iron, /area/station/commons/storage/tools) "nfK" = ( @@ -37227,12 +37224,15 @@ /area/station/commons/fitness/recreation) "nmN" = ( /obj/structure/table, -/obj/item/hand_labeler, -/obj/item/camera, -/obj/item/camera_film, -/obj/item/storage/crayons, -/obj/item/storage/crayons, -/obj/item/storage/crayons, +/obj/machinery/light_switch/directional/east, +/obj/item/storage/toolbox/artistic{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/storage/toolbox/crafter{ + pixel_x = 2; + pixel_y = 1 + }, /turf/open/floor/iron, /area/station/commons/storage/tools) "nmQ" = ( @@ -56755,7 +56755,6 @@ /turf/open/floor/plating, /area/station/medical/pharmacy) "tZL" = ( -/obj/machinery/light_switch/directional/east, /obj/structure/easel, /obj/item/canvas/twentythree_twentythree, /obj/item/canvas/twentythree_twentythree, @@ -68928,6 +68927,7 @@ /obj/item/paper_bin/construction, /obj/item/airlock_painter, /obj/item/rcl/pre_loaded, +/obj/item/hand_labeler, /turf/open/floor/iron, /area/station/commons/storage/tools) "yks" = ( diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index e2887f1a2ea..e03f4d33426 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -83271,13 +83271,22 @@ "msw" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical{ - pixel_y = 14 + pixel_y = 11; + pixel_x = -2 }, /obj/item/storage/toolbox/electrical{ - pixel_y = 7 + pixel_y = 7; + pixel_x = 3 + }, +/obj/item/storage/toolbox/artistic{ + pixel_x = -2; + pixel_y = 3 }, -/obj/item/storage/toolbox/artistic, /obj/structure/window/spawner/directional/south, +/obj/item/storage/toolbox/crafter{ + pixel_x = 3; + pixel_y = -1 + }, /turf/open/floor/iron/dark, /area/station/commons/storage/primary) "msy" = ( @@ -94419,14 +94428,19 @@ /turf/open/floor/iron, /area/station/maintenance/port/central) "obU" = ( -/obj/item/chisel, -/obj/item/storage/toolbox/artistic, /obj/structure/rack, -/obj/item/storage/crayons, /obj/effect/turf_decal/siding/wood{ dir = 6 }, /obj/machinery/camera/autoname/directional/east, +/obj/item/storage/toolbox/artistic{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/item/storage/toolbox/crafter{ + pixel_x = 3; + pixel_y = -3 + }, /turf/open/floor/wood/large, /area/station/security/prison/rec) "obV" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 061d2189b95..d474482132a 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -3727,9 +3727,6 @@ /obj/structure/table, /obj/item/airlock_painter, /obj/item/rcl/pre_loaded, -/obj/item/chisel{ - pixel_y = 7 - }, /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 }, @@ -22788,15 +22785,17 @@ /area/station/cargo/storage) "hbg" = ( /obj/structure/table, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/storage/crayons, -/obj/item/storage/crayons, -/obj/item/storage/crayons, /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 6 }, +/obj/item/storage/toolbox/artistic{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/storage/toolbox/crafter{ + pixel_x = 2; + pixel_y = 1 + }, /turf/open/floor/iron, /area/station/commons/storage/art) "hbk" = ( @@ -41091,6 +41090,14 @@ /obj/structure/table/wood, /obj/structure/cable, /obj/structure/disposalpipe/segment, +/obj/item/storage/toolbox/artistic{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/storage/toolbox/crafter{ + pixel_x = 2; + pixel_y = 1 + }, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) "nxy" = ( diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index 185494908f4..123a9dc6c9c 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -23658,11 +23658,9 @@ /obj/item/canvas, /obj/item/canvas, /obj/item/canvas, -/obj/item/chisel{ - pixel_y = 7 - }, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, +/obj/item/hand_labeler, /turf/open/floor/iron/textured, /area/station/commons/storage/art) "hYh" = ( @@ -39110,14 +39108,16 @@ /area/station/service/bar) "ndI" = ( /obj/structure/table, -/obj/item/hand_labeler, -/obj/item/camera, -/obj/item/camera_film, -/obj/item/storage/crayons, -/obj/item/storage/crayons, -/obj/item/storage/crayons, /obj/machinery/airalarm/directional/east, /obj/structure/sign/poster/contraband/clown/directional/south, +/obj/item/storage/toolbox/artistic{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/storage/toolbox/crafter{ + pixel_x = 2; + pixel_y = 1 + }, /turf/open/floor/iron/textured, /area/station/commons/storage/art) "ndR" = ( @@ -41650,7 +41650,14 @@ /area/station/science/explab) "nXO" = ( /obj/structure/table/wood, -/obj/item/storage/crayons, +/obj/item/storage/toolbox/artistic{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/storage/toolbox/crafter{ + pixel_x = 2; + pixel_y = 1 + }, /turf/open/floor/carpet/purple, /area/station/service/library) "nXY" = ( diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index 0f938609eff..187a4bdb2bb 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -9,7 +9,7 @@ desc = "A toolbox painted bright green. Looking at it makes you feel uneasy." icon = 'icons/obj/storage/toolbox.dmi' icon_state = "green" - inhand_icon_state = "artistic_toolbox" + inhand_icon_state = "toolbox_green" lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi' w_class = WEIGHT_CLASS_GIGANTIC @@ -43,7 +43,7 @@ /obj/item/his_grace/update_icon_state() icon_state = ascended ? "gold" : "green" - inhand_icon_state = ascended ? "toolbox_gold" : "artistic_toolbox" + inhand_icon_state = ascended ? "toolbox_gold" : "toolbox_green" return ..() /obj/item/his_grace/update_overlays() diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 4826f202d29..8148d9debfe 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -281,14 +281,38 @@ name = "artistic toolbox" desc = "A toolbox painted bright green. Why anyone would store art supplies in a toolbox is beyond you, but it has plenty of extra space." icon_state = "green" - inhand_icon_state = "artistic_toolbox" + inhand_icon_state = "toolbox_green" w_class = WEIGHT_CLASS_GIGANTIC //Holds more than a regular toolbox! material_flags = NONE storage_type = /datum/storage/toolbox/artistic /obj/item/storage/toolbox/artistic/PopulateContents() new /obj/item/storage/crayons(src) - new /obj/item/crowbar(src) + new /obj/item/toy/crayon/spraycan(src) + new /obj/item/toy/crayon/spraycan(src) + new /obj/item/paint_palette(src) + new /obj/item/paint/anycolor(src) + new /obj/item/paint/anycolor(src) + new /obj/item/paint/anycolor(src) + +/obj/item/storage/toolbox/crafter + name = "crafter toolbox" + desc = "A toolbox painted hot pink. Full of crafting supplies!" + icon_state = "pink" + inhand_icon_state = "toolbox_pink" + w_class = WEIGHT_CLASS_GIGANTIC //Holds more than a regular toolbox! + material_flags = NONE + +/obj/item/storage/toolbox/crafter/Initialize(mapload) + . = ..() + atom_storage.max_total_storage = 20 + atom_storage.max_slots = 11 + +/obj/item/storage/toolbox/crafter/PopulateContents() + new /obj/item/storage/crayons(src) + new /obj/item/camera(src) + new /obj/item/camera_film(src) + new /obj/item/chisel(src) new /obj/item/stack/pipe_cleaner_coil/red(src) new /obj/item/stack/pipe_cleaner_coil/yellow(src) new /obj/item/stack/pipe_cleaner_coil/blue(src) @@ -384,6 +408,7 @@ return ..() var/static/list/allowed_toolbox = list( /obj/item/storage/toolbox/artistic, + /obj/item/storage/toolbox/crafter, /obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/emergency, /obj/item/storage/toolbox/mechanical, @@ -400,6 +425,7 @@ /obj/item/storage/toolbox/emergency = "#445eb3", /obj/item/storage/toolbox/electrical = "#b77931", /obj/item/storage/toolbox/artistic = "#378752", + /obj/item/storage/toolbox/crafter = "#9D3282", /obj/item/storage/toolbox/syndicate = "#3d3d3d", ) var/obj/item/bot_assembly/repairbot/repair = new diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 2902bd72572..20af12be474 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -696,7 +696,7 @@ desc = "A replica toolbox that rumbles when you turn the key." icon = 'icons/obj/storage/toolbox.dmi' icon_state = "green" - inhand_icon_state = "artistic_toolbox" + inhand_icon_state = "toolbox_green" lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi' hitsound = 'sound/items/weapons/smash.ogg' diff --git a/code/modules/cargo/packs/general.dm b/code/modules/cargo/packs/general.dm index c7498f781bb..5d183a5bbb9 100644 --- a/code/modules/cargo/packs/general.dm +++ b/code/modules/cargo/packs/general.dm @@ -8,6 +8,7 @@ cost = CARGO_CRATE_VALUE * 1.8 contains = list(/obj/item/rcl, /obj/item/storage/toolbox/artistic, + /obj/item/storage/toolbox/crafter, /obj/item/toy/crayon/spraycan = 3, /obj/item/storage/crayons, /obj/item/toy/crayon/white, diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm index 9bcff58cf4e..f9a920d8804 100644 --- a/code/modules/fishing/fishing_equipment.dm +++ b/code/modules/fishing/fishing_equipment.dm @@ -327,8 +327,8 @@ /obj/item/storage/toolbox/fishing name = "fishing toolbox" desc = "Contains everything you need for your fishing trip." - icon_state = "fishing" - inhand_icon_state = "artistic_toolbox" + icon_state = "teal" + inhand_icon_state = "toolbox_teal" material_flags = NONE custom_price = PAYCHECK_CREW * 3 storage_type = /datum/storage/toolbox/fishing diff --git a/icons/mob/inhands/equipment/toolbox_lefthand.dmi b/icons/mob/inhands/equipment/toolbox_lefthand.dmi index 3dbd5ea013d4297076faebb415f96793ab6ee577..d7ffff0711a292c2147475b2ea358bb03ae21bf3 100644 GIT binary patch literal 1371 zcmX}sdpOf;902g&?8M2jriz_wdjT84zjB!a9axqqCqIpm7AMEG~}t*op{$6g>12&WXbv9YlY`Va&Hk+vg+LZMPwtW+v*(bTzI zZip>FCX;)IUjL_1_)4DF*4Cz7QDr?tNYpXBMC>!nlUR0jHo0qili7~rcUs^+7%lg&g6lL>7xz71b$WDnsVc@zb z)ksFP+{iaFFO{zw^SHbw5IZKjU?#r<`_MC9aFVD~7xge$j*_KjZ=P|=7ZL9=cYo9e zxcx>zogp0nz)Uo9FCigkdW7QZzeDFq%t$K9V9j;IK>ujU!=eu2)SNO9QaJ8#k;_fA z#otmw1?w}qGeR)(qO7Ia13(Gk{r-XB?84%nkp=szom;Y?Z6>|_VKmk;*0D_++F~hM z;Aj|>41Ai0-<$=hOIkI+8(5c*12_k9bz@_=&AJ-dtfRmX-o)|u3h-);?lfZlL$%bv z5;5B3znWYZoTkA?W1w}JHGxE3b*w3?&*Zjy6NuoO3@UFtLTS&mksrW*(+y%A`AS`` zXDMWF_q%4~)lnGK8sg|)lzqc;Yd}1-&O&B=Dzx1tbkc5U@X@Zp!NKz4W`*pR6qguA z$y>mue-~e%>rzT86Ug!DwSsp8vXaPA<^Vob){53boR(OqSGVSgxfPseIFl=+=e^Um z#)V#sdYP=peBUSAR&7bHqgIx*li|~kh25q+A0E;ABovO+LiOV3RZw`u*89P+5nU|S z!1VaziGu0aqh{t|UyJ<9go z2gUkn+^W{r9bvSkBST(ZUw}U-%B*WP5#OzAj(}TCDq^LwS7K7aQ-wHhaiK)ibFtrj zzGASIkxI7e-@&roq27M52Ywm9|0*0y~& zyX(OGCfwW`7vHR{#}*fR9#jUFjla=ScVfUMe1r`9MpMtJF=r*lO-VDa;EbuU6F;lX zNxwP2Ow#E|(iuXTsi=?Nw?{JL%KDa0^?H)@hCsmA`~?t47`s=`t}AhgMtfk8mHWu& FegOFLd;tIe literal 2298 zcma)-c{CgN7RSA6X{l7AIp5E{=l*i8IoZj{ zsK`i2NXT8bw{aHxcVEt4DehEIcAyLL#B!-Z)97Pk+Dk zC+_AETh4nbCHHFo?Vi5ZlcBP4a=(prw8y)=yg%i$3y-uv9`gdI22w&{KnrI8VU7w%prd~T!p@z*d`1nai+I(iGQW}~I;M)^=IKzHFQ=}CW?BKUiDZe z zv7WZSP8z-NQn`1_DuCBlw0k{(9sfR~C?@4iSBdjS3V) z{buIMIY(jJF(F)mh|Y+}Tki(36J&E{bksQiR1RgWg#_pG2C(gqRt$&%ljX5*j{& z>-~3I3J}!n`45akw54TW3M=RmVw>VX^(1!m4<<+_Pkc7BO$)4Xe)fQz3RnK$N%YM*YK29b*O2%~LX@wxxW!o2q zsVPm-+ze`#v8EsH_aW_jPxXST?!3_-6amoKmbqw99J?53W1pYKo@#v@bKqFAsPOOn zbKy?vs!#yfEm)GukiljIYQ^>P3n1qa8A%NCf(qA4CHPEHdfrMEL5CD zK}80C0MIVapLb^M^EC1{&YXsQkQ}jp+<63$eQ~bnj2`&)nLJ;ZFHW$3+kS;<=vS)@ zr(u928rX}H20=KJVqgrVGUPnwUo+tI-vjv;|MIlR?i$5>wBEyCNQnKy!t3b}4}PWF zNfeg~N_0i%xhe)>FHm+f1!2t#eQvE=#YpBkD%eL5u(we@%Bst=gQClraaAZUegoy|6a8d4d>}9J0U) zB|zn==!g!B8=R)_;2iCpvW+*Wzd3u{}y+z(nQJWWz*&Q;kE+=fjp;sX=~N3 z!{Rns_zaJwdqJ^BL6|4eD-EFbqSj5awGUSw=RfYX!~9gnj(@?ItFR+_I-W&ad_^K; zYouC*YljIY^NlijKFr}bmOjbkN@2)X!atM9Kvh-M+@Ew# zx>ww(1!LOC%Mn=s+c)C0tv1kPJX20}t@=u-d(RJj%hnYK&%1{sWIHa32Vk?mHrXvv zl+Y7OD?JAQC8TC6yeACRhig*P=Hl1)>4_U65RVbf3j}^%;JC0TH7D-E88h*`*L?c3 zu^*}QN_xr$sgfs)Ptn|ZpTA=sdCUNEp$gWO7JW~&yP_k`D0w}V!%De>@Cl&knjy+Z zT3=Yu{KFb4Rz@EuEH>2xV`F38Pb`kerTv(vToJFWF zRrgNMh{3ksw%GK`L&`t5I;nsR&pk0)z-x_B)hMq`#KO~e}2xG?jb z?zPV0&nCLCW|(sMH2*oJ6hI*qED*H)g=g!td7NJBorWD z%`8D5&nofRtW93h7&_8wkC{du-Pwjz&? ztvcT*nQ5H+4B`u_IZNA}IbOkp?Y02=lMQj{JLdu|d|&hWbLdbA1jF9$e8cr;o4yud sG3oW@Rc|xMa>naO8JSmC{~Ou5{}k%@hN8%3?hEG2woWz;R=@n?-{8`NK>z>% diff --git a/icons/mob/inhands/equipment/toolbox_righthand.dmi b/icons/mob/inhands/equipment/toolbox_righthand.dmi index 13dc226fcea31c91b55dbc133a3f2e042c01d415..a678d5de881984bc548bee15445eb0253b136f8b 100644 GIT binary patch delta 1334 zcmZ9Jdr*>D7>7SAFJWXRS!z)WX;yB|R1QY#${KiS3R!YP5{n7fvMt!~f->5dv5vRY z=pvycnzWdAB6Bq<+9u7+B~8*)Tv8)#6ERX`OW7}+@sIuIocGL}bDrn-zE@$>Fwblf zF$4~ChXDWp4-3VU0l)?-0j~4`RbS zaYvrZy}Z0CM>=sh943?J?(Xg#b`TDS4?o8D_4QdSQj5hRVcH3W!WdtGPN#SEzShso zP_)nP-o48&6o%Bx`FuVyI*mvq(&=ZNgHL0z*frvJvk=rKflNFE;BJ4nUueRA6MYMbvcADNf^)5}DE+`HwX+2Un< z8n=EIwX-%uRsybXb?4Q)4Br9S%g?Rc%!xydSFg(W2H&n#&mgdK!}h=76h&gUO_kGY zMhJPfG}6eYEaddYX@j$dJE#QL-AbjZtG`O+>V5uMs z|3gHwXkzde%1hj;)~TEt94wI(oEXo{zvGp&+pVP4>pwU;nkeut_&fiK!sTck!%QY4NQqb@I!Tf~3~ zc1-zrFPUt37%LYJYPiV(!JQO#cXJfV^7c(#b^12f`lg2Qb6*_$2Dhbf{7y1E!v0~N zVV!9nId*>cRj@^&u8Of4h|;%3Drd0Zvda&bMSH%4sZT z%(o|vN)k^nw+m&V@lPf+8tqhGtG@PQ>5iap5s7G7j_rq0i1vCaB&mObXh>C1Ywy({ zZhuD01NJ<^lqO~RC?BSCUA2GX);RWo9p<&02&~Zu4kdM%$#?tnLoKVH&+is2 zMT3e17{z^$4RVQKNRyjS?GEtI8vEX#gzO}RH)@?*?b9#^J3Hq@SRnV*{ z*P6L<+QgBqWK#&z#BF3W;k=%Fm=fw7q8 zhhBu9-%=$W(iG%VcZN2prOw9i@N4#o&Zo*MqWG-ObBzm_ zMzTa-kcwH?;s|BxP^Vu*C8FgewzC+LYRN^oC|m3CqFBX#8!XDznnA8HrMAd^+>*llS~FNnPBY(M*oo4qVi)nu1u!2loYG?@b5&K{zrH5kEmS@0LwMjJpGZ}1RYj1N>5b5LK=4q*f$zBY({;XiJ8 BiDLi& delta 1236 zcmXw&eNfT|7{`A};ts>6Yujm>y-cm<%XF1VCfH#lE-+v61>GnWPY)%O#5DKQT$U5v zfhB4#XxdOnBypxuiYArQN-_oJ3#Q^lN~o!oqzv19?s>WA`Q!QAeV=<4VOL;Ig~2!s z9A*at0016%3>{*sV{7pl#FX9MR`#39A55nZkUzoq`R(NH;|OPG=kW(<6bfZD@@i6{ zc6N4fI6U41P%4#jh016&zFAtTsHk9;RS?&VYMMlh{oT~mgb|6EOy;)O92^d3eUywq zAQD)oicI@A&_Zyb0BTA}GBppg!Xjztg!H(yq%*W6N-6+kRuw;g0>V1K+hj5Oc6m#H zeq1q7^g~yETj%3JvSkLmM&5dd9@$F`?SkoNemuW|5GB{qfmBP!kLq{i!2 z&2i$WYqtWDqjS7Z_)}dI`_9J9$C11+HoWrguzitM9VZ%7l{~dpRB%lZuf9#T~FpxGm536+gu(8t%WC5XTz%oCA|!Ci@PF zM|%BY?x>HtGfS);@e8axKJ<$Q8-AbpD7Tp5N36cVCJ#)z=~uChQKGsh_{mIf5y`Nr z7GM4>cmLw9-Z*I~!;iahfW_;Sw6kW0>t$ef&DN5jY|wnee_UYJVW6~c|FDbh{Y=K0 z3Oqs*+6#Ny7CF@A0J4WhQl*rBT{P6w=~iCK@QK^~)4G{|_*<7**zskJIKx0rw4gWo zrbzh5Vm!``YOD0g)1F+vm#3gFTo!C+_f0Sa9hSER9VL@Ry+6CTU!;ToLxJFZgDC`z z<@;BU65r+b)Mg#-*-kP~gp(&qeqHI<&NUK=wq4*A5ww}AUtWs6;;U;Z3$sxK{kUj| z7+ukI&o}A$JE>}D_U2lAX8DF3mnM%P_wV!W3<@tM(%n8FO7WKKq*+2P&?w`m_a`2$ zCZg5BigJIevQ(q(3zu~bj3FIoaVEK4)Cp#k`VmY0>e8fvLH}}{8yw&NekRGJC}~br zT{!WO=C`>P$sw#uNo|hYxbTxJ`HNA8Jz?;YcA-Pkb~x%fE;jrdAv@+NDM-HxVjEQr zt#=)XsGLq;D9v55?IInLZF-^hufBabg4}Jpjyiue%I0o?VLB~7BMjvHS;U*{zH2(* z@9gS#bg?Xb{vHK%>`{66tes8RBcHC<%mkDOj74;dn^J*&M1I7I?n#2w+ef%cp@Ml4 w0(IJgtg`Ts^98vMXX&inPzWqrGZZW~ zOmNgho1`RaIXV><7W(>zX=!PRiHY62wC$WeaN_O7K3v&}x3$B=!xk16ll5vmUU|ir zip8vV6<>OIJf4e-3ko8ZAR-q6X4+vQzS4hGQ{GUiRMZiJ^jjfUt{vAyYG&sZYQ*LF z`S~3WGVdE2v42{dot-_myzDvIMFz>_w@q%85+h4X%kpGBDZ5}K5~=DH=j`l!(`L{X z0078kS7$c>JvHpl=N(twahGlUBF=`N550UojBn7f}x`>O>DjKQW3#mF7IZzd)(d^0R*pd6Vq|>^X>g?*PWKVYU`x$rb%=2AF0#ZJ~MSogpNDnt1HhbAFK$XH$CmcMi5KhOe$e@Bpk+SNIZj#1H_s%{bavxnCj97NL`M6uhNOL%H!pJKMcwZ-Z}?Q!B7HLx|3(P zqRnaze>vwybajbXNeWt-D?BE0dt2T(_Ij}@^P11*h8y8@K$_NGr3H?;eoga0j)Ae* zKD5WH6-={uu*0fqmkB{vc%pVt-(S5GJs4o}a3JXMeWh};NM_J_roweP;du%a>B9S`#f<)WD`dPCjABrG$BQ8ZAExu9k5-m2^)<*tJzMD`&KPQVV>GN^$f z*EzC3oX!EPn7>(V&~!WNVDrcOgK+5fKoB8TmSp?{+T-sQ%$?rPz>!+_?0ICFXCgQ{ zI@*VIDlQB9wzv4OM>OXRhlXS*A8xK=r}j?CRkUaikBkrq11Ib)zCP4P`bI@Xtqsk3 zS!BJafhWS^pF9saL@cJYjs`Q%$3rhdNDB-Ba4|hTOeFcOIww=U*q*GJ* zdPNXC0(J2WM8Asm^DXC(p{IJj5Mdk|DklnIDLG35=Czh?fT*%hZ4$1h0(cvrzl$^w zAVigU#P*cJFan^e4Z_inSZ$usq79C5#iv5}!aO@^!}o_5A#21+d<&q~Uz;y&6uZnXhIquVg;Ug{tE53*LfF!w zUz8KZbp1s)`mSpF?uo@Pz#dajcZ=o?k>lRg?RNf9N(UggT+*#Qys7LH{2(l4%vRnM zuU$S_K$(V?SAUfuhRb_Rf-`l*1f#jTaB@tz$cOO^4__a$cp8>qy(KSWQ=Y7;Y^6Y% z$K=tiMpdB70m#M2@fm%Gl zoL|r#&`JwMn9Il7pmJI9FpW(q7-ni}L~$xyLp=oDv|0|4?r2Kd=&N~wDevc}IcTc4 zz(gaucPKs#22{kS%OzuL_9IB(vcyM{L3e{mF2#bU=Sg$@-)(Lua8?DOd4-Dp+D+U)zr*^WB8d`{Jx z%Krn(S0>YtmE_7a1)r(4wkV@Cl9sJMmjJ?y z`J9a+d;_(}hOqi*S^m>Rx?0YmH3Was5jd+K#^LRmT6CM$fA!xH)j1`Hm6J-nD0LZ? zA&%wm9j~#8O@9*oaW(PfDB(tlE=>ho$onLrXc=4xeZ&qlZfLl@exbqBGuVd)R#ykG zS#@_PmMz0xDEIwK?K?ps7)O!Wch0c>ypv#=3uD_h-4+k#N!_S8{GvIOtCI1jplgIy zsIj7L$U@+|XF~VBRnheC96>X&#uP+WUS_MZnKapsuW*dTZu==zaIPa7K0an+vFmx7 zTticOc#R(!(?yr3A=KASz5<)G5g|?=n__qy>t>LN+hj8Lb&7;bFMpLd+%qPxKbZ=( z&*%sxE&}^@itDlgrn*9!0P)4D*Yv(1shWXz%nSH=#h&L+f!)N9<26?1*g1rO5UCN8 zwjh21x}h%gfQdp;4^j*wAxp<@T2~2^cFqw`8x%Y1>+6?WDf}n_ea!RYlm8Sri%-^$ z5p=q^O+gKXPn$FB%gX~fOWIv!x*C|uNJ3 z9QU;y^CKB*ljsod#=kBn6Y@~k0Lt~#f0eHkL9is$vK4U2dIp@36e`mxpvC8*TK9)~ zimjV1`o-cGW1-aXnQqC2k#WR9T5+k>^UXb9J;0VQ7CUSosC@bs|IYw8+B(}*9r8{1 EACTT-JOBUy delta 2261 zcmV;`2rBpD67Ld_BLV>VktJ}Ep%o9<*w{TiJ>afFDZ*Bkpc$|%s!GCVUAPk1j;VGi_T1`#Y>n>BPsfYCy5D89#YH&x$y1f0Ib*m~( zl{o-5eBj@g*Kvwma zwuRP=m_&YY|SkpP92$se= z`}q{zIUD{Mjm<<`H}tGrf5RQfT)&cuv_~PQOh(S^*K&veLGcZs2bEU4F)+9@_#+dK7$+y`2psTL5{Tb(-Fur zVD;$@n$6};wMnS%;9I`_M~KEF3Nj%ZzW&FE{l^q!LNbD&{8w-fLF5Gq6DY5gUR!aghb~9Cm0$PNyXbRMEg>)rayn<>=@r*=zD+)TsX~Q*Uq& z-{1R1W^bR%4-bBoIXD#R?@*49kMRc8+7jlFp?|*Qgp-q#qu-8BD9vYrfQl%fA_}Oe z0;i{^$G;z+Qd-Xyf$aLyC4da+LTQTvszE~#P!0A40oCA86sXn6(nTXc7V^`MDBz^^ zIgVPNW(~^%8Uz6if`A4^fM3HI0vJcFPZhw1?T4H~sAgUOkARaSAl0V`;34Ak2NB@w zM}Gp2a1nBH>q}R8ig1y7m_;nma)kPv-1^ARX&F8)ehsLsQy%~T000000002+Kc z$cBIZA!0BbjYepTD#3^Sjq;I@6M^mvHh%yjv zusfo(bU`U4^y?}kKz*@Ox1Z0#cB%w?p z31tdNC{tvEywdCbA=B+~xqJ4f%$dvO7w3P;oL_MHpg)r74=m;tHhFkN0Tod|MSm1f z8Cc9KJ=LHm2&e|GAfOst2m-7EauG?ci5BxpPlq6&fy*y1FJvw+g#y?GWRzabE#?-c z(BCrpDKr?QyB72BU=4ip0voOYWd&gP0(4l+0RR9100000007{tVLgkq|2{J0cKiDq z=TiTDq-k&G_2=#P|JTcn{r9zVQ-6Qo`2N6pxwij4GUS`}_wD9t|9xb)e_#0f14Z}m z3x9v0=+E9Qf7v8@&=fjO2{{VA%n4hOpKTme}7n_WxHAD6)UQasPiMfqxSF`^NtN zDgtHp_l^C36J_`Jjs1VKz^1LiVso>=w)g)TS65dV0_*~?rTu@#`1M#XupBpA{r{oe z{~xdv7#jpK=Ab4Y8uQ^skKcF^8=gSC%-PSy=Qj)J$j|$^dEbzm9-p-a9+IK?6aWAK z000000D%7mo7VV%Rr8>PHLq{dlY7&ftWbN(REH!Wks&btSKoiH@U3}$lb+n0-eiT^ zQ&yQmA$sL~GzNaIKqa&OLRm#%wGk)@qdxwSAPTm00000007?++uZkBg>CP@8!`0XqbRz$S^l=&n;Ud2=eM`Z z{PtGPlh4vjAV-$#&+orSi^by3T~MOPy~7(RzvuFMDK~vSu?>OT{yQ!(T13eU94%ap zKwfV8d}1pCdHwf@zOWI+jkE$ex#{zXZ3yJ{-^moZyG!N>-G5W2(EWXq(>-Mh<$OM| z1%dqjySsSz?*04s?A&OVX%GbdJP>=2F1ZTbBvXX$ zxl(>hu07FmPZU6e@%1&@(A&Co0nZPDnEmkrvHy-1rYs=*>T;Y*0z!_joM8~h@zvE; z9E2gcrdk%5&wt4?#OM~kjUbHx;^W7U$yFxVlk!iWJ|%gwCkQkeVHn2o`1LqOJ0ZTq zwg8?xaU75l2=`E%nR`MPM*P+`tLRb&?3g88y7PINFYpBFfthdssC