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 3dbd5ea013d..d7ffff0711a 100644 Binary files a/icons/mob/inhands/equipment/toolbox_lefthand.dmi and b/icons/mob/inhands/equipment/toolbox_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/toolbox_righthand.dmi b/icons/mob/inhands/equipment/toolbox_righthand.dmi index 13dc226fcea..a678d5de881 100644 Binary files a/icons/mob/inhands/equipment/toolbox_righthand.dmi and b/icons/mob/inhands/equipment/toolbox_righthand.dmi differ diff --git a/icons/obj/storage/toolbox.dmi b/icons/obj/storage/toolbox.dmi index ccc9c2cc439..c275716ff2b 100644 Binary files a/icons/obj/storage/toolbox.dmi and b/icons/obj/storage/toolbox.dmi differ