mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 16:18:01 +01:00
Crafter's Toolbox (#90639)
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.  Crafter Toolbox includes Crayons, Camera, Film Cartridge, Chisel, and various colors of Pipe Cleaners.  (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  ## Changelog 🆑 add: Adds a crafters toolbox storing chisels and pipecleaners. Artistic toolbox now stores various painting supplies instead. /🆑
This commit is contained in:
@@ -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" = (
|
||||
|
||||
@@ -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
|
||||
},
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.3 KiB |
Reference in New Issue
Block a user