From b5a53845d9fdafab7ebb5fd5abb366b0144e4cb0 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Sat, 12 Jul 2025 15:58:56 -0500 Subject: [PATCH] Decal Painter refactor + merge with tile sprayer + more decals to paint (#91915) 1. Decal painter has been refactored. Decals to paint are now datums. 2. Tile sprayer has been deleted, and merged with the decal painter. 3. A bunch of map decals previously un-paintable are now paintable. 4. Some preset map colors are now available for selection Including: - All sidings (Colored, Plating, Wood) - Missing tile decals (Full tile, checkered tile) - And the missing tile decal colors (Dark colors) - Missing warning decals (Loading area) ![image](https://github.com/user-attachments/assets/dc67f913-1e3e-42a4-8bec-1cf65381b5fb) 1. Makes it drastically easier to add more decals in the future. 2. The split always felt needless to me. I always printed one, ran to my construction site, opened up the UI - only to realize I printed the wrong one. 3. Allows for much greater potential while building 4. Makes it easier to match mapped in decals (This code is commissioned, but I also wanted it, soooo) :cl: Melbert refactor: Refactored the decal painter, report any missing decals or ones that come out weird. del: Tile sprayer is dead. Its functionality has been merged with the decal painter. qol: A bunch of decals have been added to the decal painter. Style to your heart's content. /:cl: --- .../SpaceRuins/derelict_construction.dmm | 2 +- .../CatwalkStation/CatwalkStation_2023.dmm | 2 +- .../map_files/NebulaStation/NebulaStation.dmm | 3 - code/__DEFINES/tools.dm | 10 + code/_globalvars/lists/maintenance_loot.dm | 3 +- code/game/objects/items/airlock_painter.dm | 501 --------------- .../items/tools/painter/airlock_painter.dm | 156 +++++ .../items/tools/painter/decal_painter.dm | 143 +++++ .../items/tools/painter/paintable_decals.dm | 605 ++++++++++++++++++ .../designs/autolathe/engineering_designs.dm | 12 - .../research/techweb/nodes/engi_nodes.dm | 1 - icons/obj/devices/tool.dmi | Bin 17638 -> 17689 bytes tgstation.dme | 4 +- .../packages/tgui/interfaces/DecalPainter.tsx | 143 +++-- 14 files changed, 1008 insertions(+), 577 deletions(-) delete mode 100644 code/game/objects/items/airlock_painter.dm create mode 100644 code/game/objects/items/tools/painter/airlock_painter.dm create mode 100644 code/game/objects/items/tools/painter/decal_painter.dm create mode 100644 code/game/objects/items/tools/painter/paintable_decals.dm diff --git a/_maps/RandomRuins/SpaceRuins/derelict_construction.dmm b/_maps/RandomRuins/SpaceRuins/derelict_construction.dmm index 9da222e89c0..c6825c84142 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict_construction.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict_construction.dmm @@ -377,7 +377,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/derelictconstruction) "SK" = ( -/obj/item/airlock_painter/decal/tile, +/obj/item/airlock_painter/decal, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/derelictconstruction) "SX" = ( diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index f3c1f911f4f..0750b0749d7 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -4586,7 +4586,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "bvH" = ( -/obj/item/airlock_painter/decal/tile, +/obj/item/airlock_painter/decal, /obj/item/poster/random_official, /obj/structure/disposalpipe/segment{ dir = 4 diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index 0d2a15af881..a5ec976cee0 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -46546,9 +46546,6 @@ pixel_y = 5 }, /obj/item/airlock_painter/decal, -/obj/item/airlock_painter/decal/tile{ - pixel_y = -6 - }, /obj/effect/turf_decal/trimline/dark/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, diff --git a/code/__DEFINES/tools.dm b/code/__DEFINES/tools.dm index b086860bc7d..9f6b8783e00 100644 --- a/code/__DEFINES/tools.dm +++ b/code/__DEFINES/tools.dm @@ -52,3 +52,13 @@ * This is only used explicitly because some interactions may not want to ever be skipped. */ #define SHOULD_SKIP_INTERACTION(target, item, user) (HAS_TRAIT(target, TRAIT_COMBAT_MODE_SKIP_INTERACTION) && user.combat_mode) + +// Used by the decal painter to get information about the decal being painted +/// Icon state to paint +#define DECAL_INFO_ICON_STATE "icon_state" +/// Color to paint the decal with +#define DECAL_INFO_COLOR "color" +/// Dir of the decal sprite +#define DECAL_INFO_DIR "dir" +/// Alpha of the decal +#define DECAL_INFO_ALPHA "alpha" diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 2eb6eab1d45..3434f8a0c9f 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -52,8 +52,7 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c /obj/item/reagent_containers/cup/glass/drinkingglass = 1, /obj/item/airlock_painter = 1, - /obj/item/airlock_painter/decal = 1, - /obj/item/airlock_painter/decal/tile = 1, + /obj/item/airlock_painter/decal = 2, /obj/item/clothing/mask/breath = 1, /obj/item/rack_parts = 1, /obj/item/shard = 1, diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm deleted file mode 100644 index 04bce0b64a7..00000000000 --- a/code/game/objects/items/airlock_painter.dm +++ /dev/null @@ -1,501 +0,0 @@ -/obj/item/airlock_painter - name = "airlock painter" - desc = "An advanced autopainter preprogrammed with several paintjobs for airlocks. Use it on an airlock during or after construction to change the paintjob." - desc_controls = "Alt-Click to remove the ink cartridge." - icon = 'icons/obj/devices/tool.dmi' - icon_state = "paint_sprayer" - inhand_icon_state = "paint_sprayer" - worn_icon_state = "painter" - w_class = WEIGHT_CLASS_SMALL - - custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.5) - - obj_flags = CONDUCTS_ELECTRICITY - item_flags = NOBLUDGEON - slot_flags = ITEM_SLOT_BELT - usesound = 'sound/effects/spray2.ogg' - - /// The ink cartridge to pull charges from. - var/obj/item/toner/ink = null - /// The type path to instantiate for the ink cartridge the device initially comes with, eg. /obj/item/toner - var/initial_ink_type = /obj/item/toner - /// Associate list of all paint jobs the airlock painter can apply. The key is the name of the airlock the user will see. The value is the type path of the airlock - var/list/available_paint_jobs = list( - "Public" = /obj/machinery/door/airlock/public, - "Engineering" = /obj/machinery/door/airlock/engineering, - "Atmospherics" = /obj/machinery/door/airlock/atmos, - "Security" = /obj/machinery/door/airlock/security, - "Command" = /obj/machinery/door/airlock/command, - "Medical" = /obj/machinery/door/airlock/medical, - "Virology" = /obj/machinery/door/airlock/virology, - "Research" = /obj/machinery/door/airlock/research, - "Hydroponics" = /obj/machinery/door/airlock/hydroponics, - "Freezer" = /obj/machinery/door/airlock/freezer, - "Science" = /obj/machinery/door/airlock/science, - "Mining" = /obj/machinery/door/airlock/mining, - "Maintenance" = /obj/machinery/door/airlock/maintenance, - "External" = /obj/machinery/door/airlock/external, - "External Maintenance"= /obj/machinery/door/airlock/maintenance/external, - "Standard" = /obj/machinery/door/airlock - ) - -/obj/item/airlock_painter/Initialize(mapload) - . = ..() - ink = new initial_ink_type(src) - - -/obj/item/airlock_painter/Destroy(force) - QDEL_NULL(ink) - return ..() - - -//This proc doesn't just check if the painter can be used, but also uses it. -//Only call this if you are certain that the painter will be used right after this check! -/obj/item/airlock_painter/proc/use_paint(mob/user) - if(can_use(user)) - ink.charges-- - playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE) - return TRUE - else - return FALSE - -//This proc only checks if the painter can be used. -//Call this if you don't want the painter to be used right after this check, for example -//because you're expecting user input. -/obj/item/airlock_painter/proc/can_use(mob/user) - if(!ink) - balloon_alert(user, "no cartridge!") - return FALSE - else if(ink.charges < 1) - balloon_alert(user, "out of ink!") - return FALSE - else - return TRUE - -/obj/item/airlock_painter/suicide_act(mob/living/user) - var/obj/item/organ/lungs/L = user.get_organ_slot(ORGAN_SLOT_LUNGS) - - if(can_use(user) && L) - user.visible_message(span_suicide("[user] is inhaling toner from [src]! It looks like [user.p_theyre()] trying to commit suicide!")) - use(user) - - // Once you've inhaled the toner, you throw up your lungs - // and then die. - - // Find out if there is an open turf in front of us, - // and if not, pick the turf we are standing on. - var/turf/T = get_step(get_turf(src), user.dir) - if(!isopenturf(T)) - T = get_turf(src) - - // they managed to lose their lungs between then and - // now. Good job. - if(!L) - return OXYLOSS - - L.Remove(user) - - // make some colorful reagent, and apply it to the lungs - L.create_reagents(10) - L.reagents.add_reagent(/datum/reagent/colorful_reagent, 10) - L.reagents.expose(L, TOUCH, 1) - - // TODO maybe add some colorful vomit? - - user.visible_message(span_suicide("[user] vomits out [user.p_their()] [L]!")) - playsound(user.loc, 'sound/effects/splat.ogg', 50, TRUE) - - L.forceMove(T) - - return (TOXLOSS|OXYLOSS) - else if(can_use(user) && !L) - user.visible_message(span_suicide("[user] is spraying toner on [user.p_them()]self from [src]! It looks like [user.p_theyre()] trying to commit suicide.")) - user.reagents.add_reagent(/datum/reagent/colorful_reagent, 1) - user.reagents.expose(user, TOUCH, 1) - return TOXLOSS - - else - user.visible_message(span_suicide("[user] is trying to inhale toner from [src]! It might be a suicide attempt if [src] had any toner.")) - return SHAME - - -/obj/item/airlock_painter/examine(mob/user) - . = ..() - if(!ink) - . += span_notice("It doesn't have a toner cartridge installed.") - return - var/ink_level = "high" - if(ink.charges < 1) - ink_level = "empty" - else if((ink.charges/ink.max_charges) <= 0.25) //25% - ink_level = "low" - else if((ink.charges/ink.max_charges) > 1) //Over 100% (admin var edit) - ink_level = "dangerously high" - . += span_notice("Its ink levels look [ink_level].") - - -/obj/item/airlock_painter/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers) - if(istype(W, /obj/item/toner)) - if(ink) - to_chat(user, span_warning("[src] already contains \a [ink]!")) - return - if(!user.transferItemToLoc(W, src)) - return - to_chat(user, span_notice("You install [W] into [src].")) - ink = W - playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) - else - return ..() - -/obj/item/airlock_painter/click_alt(mob/user) - if(!ink) - return CLICK_ACTION_BLOCKING - - playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) - ink.forceMove(user.drop_location()) - user.put_in_hands(ink) - to_chat(user, span_notice("You remove [ink] from [src].")) - ink = null - return CLICK_ACTION_SUCCESS - -/obj/item/airlock_painter/decal - name = "decal painter" - desc = "An airlock painter, reprogrammed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed." - desc_controls = "Alt-Click to remove the ink cartridge." - icon = 'icons/obj/devices/tool.dmi' - icon_state = "decal_sprayer" - inhand_icon_state = "decal_sprayer" - custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.5) - initial_ink_type = /obj/item/toner/large - /// The current direction of the decal being printed - var/stored_dir = 2 - /// The current color of the decal being printed. - var/stored_color = "yellow" - /// The current base icon state of the decal being printed. - var/stored_decal = "warningline" - /// The full icon state of the decal being printed. - var/stored_decal_total = "warningline" - /// The type path of the spritesheet being used for the frontend. - var/spritesheet_type = /datum/asset/spritesheet_batched/decals // spritesheet containing previews - /// Does this printer implementation support custom colors? - var/supports_custom_color = FALSE - /// Current custom color - var/stored_custom_color - /// List of color options as list(user-friendly label, color value to return) - var/color_list = list( - list("Yellow", "yellow"), - list("Red", "red"), - list("White", "white"), - ) - /// List of direction options as list(user-friendly label, dir value to return) - var/dir_list = list( - list("North", NORTH), - list("South", SOUTH), - list("East", EAST), - list("West", WEST), - ) - /// List of decal options as list(user-friendly label, icon state base value to return) - var/decal_list = list( - list("Warning Line", "warningline"), - list("Warning Line Corner", "warninglinecorner"), - list("Caution Label", "caution"), - list("Directional Arrows", "arrows"), - list("Stand Clear Label", "stand_clear"), - list("Bot", "bot"), - list("Box", "box"), - list("Box Corner", "box_corners"), - list("Delivery Marker", "delivery"), - list("Warning Box", "warn_full"), - ) - // These decals only have a south sprite. - var/nondirectional_decals = list( - "bot", - "box", - "delivery", - "warn_full", - ) - -/obj/item/airlock_painter/decal/Initialize(mapload) - . = ..() - stored_custom_color = stored_color - -/obj/item/airlock_painter/decal/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) - if(isfloorturf(interacting_with) && use_paint(user)) - paint_floor(interacting_with) - return ITEM_INTERACT_SUCCESS - return NONE - -/** - * Actually add current decal to the floor. - * - * Responsible for actually adding the element to the turf for maximum flexibility.area - * Can be overridden for different decal behaviors. - * Arguments: - * * target - The turf being painted to -*/ -/obj/item/airlock_painter/decal/proc/paint_floor(turf/open/floor/target) - target.AddElement(/datum/element/decal, 'icons/turf/decals.dmi', stored_decal_total, stored_dir, null, null, alpha, color, null, FALSE, null) - -/** - * Return the final icon_state for the given decal options - * - * Arguments: - * * decal - the selected decal base icon state - * * color - the selected color - * * dir - the selected dir - */ -/obj/item/airlock_painter/decal/proc/get_decal_path(decal, color, dir) - // Special case due to icon_state names - if(color == "yellow") - color = "" - - return "[decal][color ? "_" : ""][color]" - -/obj/item/airlock_painter/decal/proc/update_decal_path() - stored_decal_total = get_decal_path(stored_decal, stored_color, stored_dir) - -/obj/item/airlock_painter/decal/ui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "DecalPainter", name) - ui.open() - -/obj/item/airlock_painter/decal/ui_assets(mob/user) - . = ..() - . += get_asset_datum(spritesheet_type) - -/obj/item/airlock_painter/decal/ui_static_data(mob/user) - . = ..() - var/datum/asset/spritesheet_batched/icon_assets = get_asset_datum(spritesheet_type) - - .["icon_prefix"] = "[icon_assets.name]32x32" - .["supports_custom_color"] = supports_custom_color - .["decal_list"] = list() - .["color_list"] = list() - .["dir_list"] = list() - .["nondirectional_decals"] = nondirectional_decals - - for(var/decal in decal_list) - .["decal_list"] += list(list( - "name" = decal[1], - "decal" = decal[2], - )) - for(var/color in color_list) - .["color_list"] += list(list( - "name" = color[1], - "color" = color[2], - )) - for(var/dir in dir_list) - .["dir_list"] += list(list( - "name" = dir[1], - "dir" = dir[2], - )) - -/obj/item/airlock_painter/decal/ui_data(mob/user) - . = ..() - .["current_decal"] = stored_decal - .["current_color"] = stored_color - .["current_dir"] = stored_dir - .["current_custom_color"] = stored_custom_color - -/obj/item/airlock_painter/decal/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) - . = ..() - if(.) - return - - switch(action) - //Lists of decals and designs - if("select decal") - . = TRUE - for(var/decal_set in decal_list) - if(decal_set[2] == params["decal"]) - stored_decal = params["decal"] - break - for(var/dir_set in dir_list) - if(dir_set[2] == text2num(params["dir"])) - stored_dir = text2num(params["dir"]) - break - - if("select color") - . = TRUE - stored_color = params["color"] - - if("pick custom color") - if(supports_custom_color) - pick_painting_tool_color(usr, stored_custom_color) - - update_decal_path() - . = TRUE - -/obj/item/airlock_painter/decal/set_painting_tool_color(chosen_color) - . = ..() - stored_custom_color = chosen_color - stored_color = chosen_color - -/datum/asset/spritesheet_batched/decals - name = "floor_decals" - ignore_dir_errors = TRUE - /// The floor icon used for previews - var/preview_floor_icon = 'icons/turf/floors.dmi' - /// The floor icon state used for previews - var/preview_floor_state = "floor" - /// The associated decal painter type to grab decals, colors, etc from. - var/obj/item/airlock_painter/decal/painter_type = /obj/item/airlock_painter/decal - -/** - * Insert a specific state into the spritesheet. - * - * Arguments: - * * decal - the given decal base state. - * * dir - the given direction. - * * color - the given color. - */ -/datum/asset/spritesheet_batched/decals/proc/insert_state(decal, dir, color) - // Special case due to icon_state names - var/icon_state_color = color == "yellow" ? "" : color - - var/datum/universal_icon/floor = uni_icon(preview_floor_icon, preview_floor_state) - floor.blend_icon(uni_icon('icons/turf/decals.dmi', "[decal][icon_state_color ? "_" : ""][icon_state_color]", dir), ICON_OVERLAY) - insert_icon("[decal]_[dir]_[color]", floor) - -/datum/asset/spritesheet_batched/decals/create_spritesheets() - // Must actually create because initial(type) doesn't work for /lists for some reason. - var/obj/item/airlock_painter/decal/painter = new painter_type() - - for(var/list/decal in painter.decal_list) - for(var/list/dir in painter.dir_list) - for(var/list/color in painter.color_list) - insert_state(decal[2], dir[2], color[2]) - if(painter.supports_custom_color) - insert_state(decal[2], dir[2], "custom") - - qdel(painter) - -/obj/item/airlock_painter/decal/debug - name = "extreme decal painter" - icon_state = "decal_sprayer_ex" - initial_ink_type = /obj/item/toner/extreme - -/obj/item/airlock_painter/decal/tile - name = "tile sprayer" - desc = "An airlock painter, reprogrammed to use a different style of paint in order to spray colors on floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed." - desc_controls = "Alt-Click to remove the ink cartridge." - icon_state = "tile_sprayer" - stored_dir = 2 - stored_color = "#D4D4D432" - stored_decal = "tile_corner" - spritesheet_type = /datum/asset/spritesheet_batched/decals/tiles - supports_custom_color = TRUE - // Colors can have a an alpha component as RGBA, or just be RGB and use default alpha - color_list = list( - list("Neutral", "#D4D4D432"), - list("Dark", "#0e0f0f"), - list("Bar Burgundy", "#79150082"), - list("Sec Blue", "#486091"), // SKYRAT EDIT CHANGE - list("Sec Red", "#DE3A3A"), - list("Cargo Brown", "#A46106"), - list("Engi Yellow", "#EFB341"), - list("Service Green", "#9FED58"), - list("Med Blue", "#52B4E9"), - list("R&D Purple", "#D381C9"), - ) - decal_list = list( - //Primary Category - list("4 Corners", "tile_fourcorners"), - list("Corner", "tile_corner"), - list("Half", "tile_half_contrasted"), - list("Opposing Corners", "tile_opposing_corners"), - list("3 Corners", "tile_anticorner_contrasted"), - //Trimlines Category - list("Trimline Filled Box", "trimline_box_fill"), - list("Trimline Filled Corner", "trimline_corner_fill"), - list("Trimline Filled", "trimline_fill"), - list("Trimline Filled L ", "trimline_fill__8"), // This is a hack that lives in the spritesheet builder and paint_floor - list("Trimline Filled End", "trimline_end_fill"), - list("Trimline Box", "trimline_box"), - list("Trimline Corner", "trimline_corner"), - list("Trimline", "trimline"), - list("Trimline L ", "trimline__8"), - list("Trimline End", "trimline_end"), - //A few misc decals to break up the UI a touch - list("Diagonal Centre", "diagonal_centre"), - list("Diagonal Edge", "diagonal_edge"), - list("Full Tile", "tile_full"), - list("Full Half", "tile_half"), - list("Full Anticorner", "tile_anticorner"), - //Decorative Trimlines Category - list("Trimline Connector L", "trimline_shrink_cw"), - list("Trimline Connector R", "trimline_shrink_ccw"), - list("Trimline Arrow L Filled", "trimline_arrow_cw_fill"), - list("Trimline Arrow R Filled", "trimline_arrow_ccw_fill"), - list("Trimline Warn Filled", "trimline_warn_fill"), - list("Trimline Warn Filled L", "trimline_warn_fill__8"), - list("Trimline Warn", "trimline_warn"), - list("Trimline Warn L", "trimline_warn__8"), - list("Trimline Arrow L", "trimline_arrow_cw"), - list("Trimline Arrow R", "trimline_arrow_ccw"), - ) - nondirectional_decals = list( - "tile_fourcorners", - "trimline_box_fill", - "trimline_box", - "diagonal_centre", - "diagonal_edge", - "tile_full", - ) - - /// Regex to split alpha out. - var/static/regex/rgba_regex = new(@"(#[0-9a-fA-F]{6})([0-9a-fA-F]{2})") - - /// Default alpha for /obj/effect/turf_decal/tile - var/default_alpha = 110 - -/obj/item/airlock_painter/decal/tile/paint_floor(turf/open/floor/target) - // Account for 8-sided decals. - var/source_decal = stored_decal - var/source_dir = stored_dir - if(copytext(stored_decal, -3) == "__8") - source_decal = splicetext(stored_decal, -3, 0, "") - source_dir = turn(stored_dir, 45) - - var/decal_color = stored_color - var/decal_alpha = default_alpha - // Handle the RGBA case. - if(rgba_regex.Find(decal_color)) - decal_color = rgba_regex.group[1] - decal_alpha = text2num(rgba_regex.group[2], 16) - - target.AddElement(/datum/element/decal, 'icons/turf/decals.dmi', source_decal, source_dir, null, null, decal_alpha, decal_color, null, FALSE, null) - -/datum/asset/spritesheet_batched/decals/tiles - name = "floor_tile_decals" - ignore_dir_errors = TRUE - painter_type = /obj/item/airlock_painter/decal/tile - -/datum/asset/spritesheet_batched/decals/tiles/insert_state(decal, dir, color) - // Account for 8-sided decals. - var/source_decal = decal - var/source_dir = dir - if(copytext(decal, -3) == "__8") - source_decal = splicetext(decal, -3, 0, "") - source_dir = turn(dir, 45) - - // Handle the RGBA case. - var/obj/item/airlock_painter/decal/tile/tile_type = painter_type - var/render_color = color - var/render_alpha = initial(tile_type.default_alpha) - if(tile_type.rgba_regex.Find(color)) - render_color = tile_type.rgba_regex.group[1] - render_alpha = text2num(tile_type.rgba_regex.group[2], 16) - - var/datum/universal_icon/colored_icon = uni_icon('icons/turf/decals.dmi', source_decal, dir=source_dir) - colored_icon.change_opacity(render_alpha / 255) - if(color == "custom") - // Do a fun rainbow pattern to stand out while still being static. - colored_icon.blend_icon(uni_icon('icons/effects/random_spawners.dmi', "rainbow"), ICON_MULTIPLY) - else - colored_icon.blend_color(render_color, ICON_MULTIPLY) - - var/datum/universal_icon/floor = uni_icon(preview_floor_icon, preview_floor_state) - floor.blend_icon(colored_icon, ICON_OVERLAY) - insert_icon("[decal]_[dir]_[replacetext(color, "#", "")]", floor) diff --git a/code/game/objects/items/tools/painter/airlock_painter.dm b/code/game/objects/items/tools/painter/airlock_painter.dm new file mode 100644 index 00000000000..246ab170465 --- /dev/null +++ b/code/game/objects/items/tools/painter/airlock_painter.dm @@ -0,0 +1,156 @@ +/obj/item/airlock_painter + name = "airlock painter" + desc = "An advanced autopainter preprogrammed with several paintjobs for airlocks. Use it on an airlock during or after construction to change the paintjob." + desc_controls = "Alt-Click to remove the ink cartridge." + icon = 'icons/obj/devices/tool.dmi' + icon_state = "paint_sprayer" + inhand_icon_state = "paint_sprayer" + worn_icon_state = "painter" + w_class = WEIGHT_CLASS_SMALL + + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.5) + + obj_flags = CONDUCTS_ELECTRICITY + item_flags = NOBLUDGEON + slot_flags = ITEM_SLOT_BELT + usesound = 'sound/effects/spray2.ogg' + + /// The ink cartridge to pull charges from. + var/obj/item/toner/ink = null + /// The type path to instantiate for the ink cartridge the device initially comes with, eg. /obj/item/toner + var/initial_ink_type = /obj/item/toner + /// Associate list of all paint jobs the airlock painter can apply. The key is the name of the airlock the user will see. The value is the type path of the airlock + var/list/available_paint_jobs = list( + "Public" = /obj/machinery/door/airlock/public, + "Engineering" = /obj/machinery/door/airlock/engineering, + "Atmospherics" = /obj/machinery/door/airlock/atmos, + "Security" = /obj/machinery/door/airlock/security, + "Command" = /obj/machinery/door/airlock/command, + "Medical" = /obj/machinery/door/airlock/medical, + "Virology" = /obj/machinery/door/airlock/virology, + "Research" = /obj/machinery/door/airlock/research, + "Hydroponics" = /obj/machinery/door/airlock/hydroponics, + "Freezer" = /obj/machinery/door/airlock/freezer, + "Science" = /obj/machinery/door/airlock/science, + "Mining" = /obj/machinery/door/airlock/mining, + "Maintenance" = /obj/machinery/door/airlock/maintenance, + "External" = /obj/machinery/door/airlock/external, + "External Maintenance"= /obj/machinery/door/airlock/maintenance/external, + "Standard" = /obj/machinery/door/airlock + ) + +/obj/item/airlock_painter/Initialize(mapload) + . = ..() + ink = new initial_ink_type(src) + +/obj/item/airlock_painter/Destroy(force) + QDEL_NULL(ink) + return ..() + +//This proc doesn't just check if the painter can be used, but also uses it. +//Only call this if you are certain that the painter will be used right after this check! +/obj/item/airlock_painter/proc/use_paint(mob/user) + if(can_use(user)) + ink.charges-- + playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE) + return TRUE + else + return FALSE + +//This proc only checks if the painter can be used. +//Call this if you don't want the painter to be used right after this check, for example +//because you're expecting user input. +/obj/item/airlock_painter/proc/can_use(mob/user) + if(!ink) + balloon_alert(user, "no cartridge!") + return FALSE + else if(ink.charges < 1) + balloon_alert(user, "out of ink!") + return FALSE + else + return TRUE + +/obj/item/airlock_painter/suicide_act(mob/living/user) + var/obj/item/organ/lungs/L = user.get_organ_slot(ORGAN_SLOT_LUNGS) + + if(can_use(user) && L) + user.visible_message(span_suicide("[user] is inhaling toner from [src]! It looks like [user.p_theyre()] trying to commit suicide!")) + use(user) + + // Once you've inhaled the toner, you throw up your lungs + // and then die. + + // Find out if there is an open turf in front of us, + // and if not, pick the turf we are standing on. + var/turf/T = get_step(get_turf(src), user.dir) + if(!isopenturf(T)) + T = get_turf(src) + + // they managed to lose their lungs between then and + // now. Good job. + if(!L) + return OXYLOSS + + L.Remove(user) + + // make some colorful reagent, and apply it to the lungs + L.create_reagents(10) + L.reagents.add_reagent(/datum/reagent/colorful_reagent, 10) + L.reagents.expose(L, TOUCH, 1) + + // TODO maybe add some colorful vomit? + + user.visible_message(span_suicide("[user] vomits out [user.p_their()] [L]!")) + playsound(user.loc, 'sound/effects/splat.ogg', 50, TRUE) + + L.forceMove(T) + + return (TOXLOSS|OXYLOSS) + else if(can_use(user) && !L) + user.visible_message(span_suicide("[user] is spraying toner on [user.p_them()]self from [src]! It looks like [user.p_theyre()] trying to commit suicide.")) + user.reagents.add_reagent(/datum/reagent/colorful_reagent, 1) + user.reagents.expose(user, TOUCH, 1) + return TOXLOSS + + else + user.visible_message(span_suicide("[user] is trying to inhale toner from [src]! It might be a suicide attempt if [src] had any toner.")) + return SHAME + + +/obj/item/airlock_painter/examine(mob/user) + . = ..() + if(!ink) + . += span_notice("It doesn't have a toner cartridge installed.") + return + var/ink_level = "high" + if(ink.charges < 1) + ink_level = "empty" + else if((ink.charges/ink.max_charges) <= 0.25) //25% + ink_level = "low" + else if((ink.charges/ink.max_charges) > 1) //Over 100% (admin var edit) + ink_level = "dangerously high" + . += span_notice("Its ink levels look [ink_level].") + +/obj/item/airlock_painter/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers) + if(istype(W, /obj/item/toner)) + if(ink) + to_chat(user, span_warning("[src] already contains \a [ink]!")) + return + if(!user.transferItemToLoc(W, src)) + return + to_chat(user, span_notice("You install [W] into [src].")) + ink = W + playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) + else + return ..() + +/obj/item/airlock_painter/click_alt(mob/user) + if(!ink) + return CLICK_ACTION_BLOCKING + + playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) + ink.forceMove(user.drop_location()) + user.put_in_hands(ink) + to_chat(user, span_notice("You remove [ink] from [src].")) + ink = null + return CLICK_ACTION_SUCCESS diff --git a/code/game/objects/items/tools/painter/decal_painter.dm b/code/game/objects/items/tools/painter/decal_painter.dm new file mode 100644 index 00000000000..fe547664702 --- /dev/null +++ b/code/game/objects/items/tools/painter/decal_painter.dm @@ -0,0 +1,143 @@ +/obj/item/airlock_painter/decal + name = "decal painter" + desc = "An airlock painter, reprogrammed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed." + desc_controls = "Alt-Click to remove the ink cartridge." + icon = 'icons/obj/devices/tool.dmi' + icon_state = "decal_sprayer" + inhand_icon_state = "decal_sprayer" + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5) + initial_ink_type = /obj/item/toner/large + /// The current direction of the decal being printed + VAR_PRIVATE/selected_dir = SOUTH + /// The current color of the decal being printed. + VAR_PRIVATE/selected_color = "yellow" + /// The current base icon state of the decal being printed. + VAR_PRIVATE/selected_decal_icon_state = "warningline" + /// Current custom color + VAR_PRIVATE/selected_custom_color + + /// Current active decal category. Reference to a global singleton + VAR_PRIVATE/datum/paintable_decal_category/current_category + +/obj/item/airlock_painter/decal/Initialize(mapload) + . = ..() + set_category(GLOB.paintable_decals[1]) + +/obj/item/airlock_painter/decal/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(isfloorturf(interacting_with) && use_paint(user)) + paint_floor(interacting_with) + return ITEM_INTERACT_SUCCESS + return NONE + +/** + * Actually add current decal to the floor. + * + * Responsible for actually adding the element to the turf for maximum flexibility.area + * Can be overridden for different decal behaviors. + * Arguments: + * * target - The turf being painted to +*/ +/obj/item/airlock_painter/decal/proc/paint_floor(turf/open/floor/target) + var/list/decal_data = current_category.get_decal_info( + state = selected_decal_icon_state, + color = selected_color, + dir = selected_dir, + ) + + target.AddElement( \ + /datum/element/decal, \ + _icon = 'icons/turf/decals.dmi', \ + _icon_state = decal_data[DECAL_INFO_ICON_STATE], \ + _dir = decal_data[DECAL_INFO_DIR], \ + _alpha = decal_data[DECAL_INFO_ALPHA], \ + _color = decal_data[DECAL_INFO_COLOR], \ + _cleanable = FALSE, \ + ) + +/obj/item/airlock_painter/decal/proc/set_category(datum/paintable_decal_category/category) + current_category = category + selected_color = category.possible_colors?[category.possible_colors[1]] + selected_decal_icon_state = category.get_ui_data()["decal_list"][1]["icon_state"] + return TRUE + +/obj/item/airlock_painter/decal/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "DecalPainter", name) + ui.open() + +/obj/item/airlock_painter/decal/ui_assets(mob/user) + . = ..() + . += get_asset_datum(/datum/asset/spritesheet_batched/decals) + +/obj/item/airlock_painter/decal/ui_static_data(mob/user) + var/list/data = list() + + data["categories"] = list() + for(var/datum/paintable_decal_category/category as anything in GLOB.paintable_decals) + var/list/category_data = category.get_ui_data() + data["categories"] += list(list( + "category" = category.category, + "decal_list" = category_data["decal_list"], + "color_list" = category_data["color_list"], + "dir_list" = category_data["dir_list"], + )) + + var/datum/asset/spritesheet_batched/icon_assets = get_asset_datum(/datum/asset/spritesheet_batched/decals) + data["icon_prefix"] = "[icon_assets.name]32x32" + + return data + +/obj/item/airlock_painter/decal/ui_data(mob/user) + var/list/data = list() + data["current_decal"] = selected_decal_icon_state + data["current_color"] = selected_color + data["current_dir"] = selected_dir + data["current_custom_color"] = selected_custom_color + data["active_category"] = current_category.category + return data + +/obj/item/airlock_painter/decal/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + switch(action) + if("select_category") + var/new_category = params["category"] + for(var/datum/paintable_decal_category/category as anything in GLOB.paintable_decals) + if(category.category != new_category) + continue + + set_category(category) + return TRUE + + if("select_decal") + var/new_state = params["decal"] + var/new_dir = text2num(params["dir"]) + if(current_category.is_state_valid(new_state)) + selected_decal_icon_state = new_state + if(current_category.is_dir_valid(new_dir)) + selected_dir = new_dir + return TRUE + + if("select_color") + var/new_color = params["color"] + if(current_category.is_color_valid(new_color)) + selected_color = new_color + return TRUE + + if("pick_custom_color") + if("Custom" in current_category.possible_colors) + pick_painting_tool_color(usr, selected_custom_color) + return TRUE + +/obj/item/airlock_painter/decal/set_painting_tool_color(chosen_color) + . = ..() + selected_custom_color = chosen_color + selected_color = chosen_color + +/obj/item/airlock_painter/decal/debug + name = "extreme decal painter" + icon_state = "decal_sprayer_ex" + initial_ink_type = /obj/item/toner/extreme diff --git a/code/game/objects/items/tools/painter/paintable_decals.dm b/code/game/objects/items/tools/painter/paintable_decals.dm new file mode 100644 index 00000000000..2f65327265b --- /dev/null +++ b/code/game/objects/items/tools/painter/paintable_decals.dm @@ -0,0 +1,605 @@ +/** + * ## Paintable Decal Category + * + * Holds a bunch of information the decal painter uses to determine what it can and can't paint, and how to paint it. + */ +/datum/paintable_decal_category + /// Human readable category name + var/category = "Generic" + /// The type of paintable decal this category contains - should be a subtype of /datum/paintable_decal + var/paintable_decal_type + /// Color options for this category - formatted as readable label - color value + var/list/possible_colors + /// Direction options for this category - formatted as readable label - dir value to return + var/list/dir_list = list( + "North" = NORTH, + "South" = SOUTH, + "East" = EAST, + "West" = WEST, + ) + /// Alpha for decals painted from this category (assuming no custom color is used) + var/default_alpha = 255 + + /// Icon used for previews + var/preview_floor_icon = 'icons/turf/floors.dmi' + /// Icon state used for previews + var/preview_floor_state = "floor" + + /// Caches UI data to avoid regenerating it every time. It doesn't change anyways + VAR_PRIVATE/list/cached_category_data + +/// Returns a key for the spritesheet icon, used to avoid duplicates +/datum/paintable_decal_category/proc/spritesheet_key(dir, state, color) + SHOULD_NOT_OVERRIDE(TRUE) + PRIVATE_PROC(TRUE) + + return "[state]_[dir]_[replacetext(color, "#", "")]" + +/// Returns a list of preview icons for every single variety of every decal in this category for use in a spritesheet +/datum/paintable_decal_category/proc/generate_all_spritesheet_icons() + SHOULD_NOT_OVERRIDE(TRUE) + + . = list() + for(var/datum/paintable_decal/decal_type as anything in subtypesof(paintable_decal_type)) + var/state = decal_type::icon_state + if(!state) + continue + if(decal_type::directional) + for(var/dirname in dir_list) + . += generate_independent_decal_spritesheet_icons(dir_list[dirname], state) + else + . += generate_independent_decal_spritesheet_icons(SOUTH, state) + +/// Returns a list of preview icon for a specific decal state and direction +/datum/paintable_decal_category/proc/generate_independent_decal_spritesheet_icons(dir, state) + SHOULD_NOT_OVERRIDE(TRUE) + PRIVATE_PROC(TRUE) + + . = list() + for(var/colorname in possible_colors) + .[spritesheet_key(dir, state, possible_colors[colorname])] = generate_colored_decal_spritesheet_icon(state, dir, possible_colors[colorname]) + +/// Actually generates the preview icon for a specific decal state, direction, and color +/datum/paintable_decal_category/proc/generate_colored_decal_spritesheet_icon(state, dir, color) + PROTECTED_PROC(TRUE) + + var/list/decal_data = get_decal_info(state, color, dir) + var/datum/universal_icon/colored_decal = uni_icon('icons/turf/decals.dmi', decal_data[DECAL_INFO_ICON_STATE], dir = decal_data[DECAL_INFO_DIR]) + colored_decal.change_opacity(decal_data[DECAL_INFO_ALPHA] / 255) + if(color == "custom") + // Do a fun rainbow pattern to stand out while still being static. + colored_decal.blend_icon(uni_icon('icons/effects/random_spawners.dmi', "rainbow"), ICON_MULTIPLY) + else if(decal_data[DECAL_INFO_COLOR]) + colored_decal.blend_color(decal_data[DECAL_INFO_COLOR], ICON_MULTIPLY) + + var/datum/universal_icon/floor = uni_icon(preview_floor_icon, preview_floor_state) + floor.blend_icon(colored_decal, ICON_OVERLAY) + return floor + +/// Constructs and returns this category's UI data +/datum/paintable_decal_category/proc/get_ui_data() as /list + SHOULD_NOT_OVERRIDE(TRUE) + + if(cached_category_data) + return cached_category_data.Copy() + + cached_category_data = list() + + cached_category_data["decal_list"] = list() + cached_category_data["color_list"] = list() + cached_category_data["dir_list"] = list() + + for(var/datum/paintable_decal/decal_type as anything in subtypesof(paintable_decal_type)) + var/name = decal_type::name + var/state = decal_type::icon_state + if(!name || !state) + continue + + cached_category_data["decal_list"] += list(list( + "name" = name, + "icon_state" = state, + "directional" = decal_type::directional, + )) + + for(var/color in possible_colors) + cached_category_data["color_list"] += list(list( + "name" = color, + "color" = possible_colors[color], + )) + + for(var/dirname in dir_list) + cached_category_data["dir_list"] += list(list( + "name" = dirname, + "dir" = dir_list[dirname], + )) + + return cached_category_data.Copy() + +/// Checks if the passed icon state is one of this category's decals +/datum/paintable_decal_category/proc/is_state_valid(state) + SHOULD_NOT_OVERRIDE(TRUE) + // Ui data has all icon states so let's just piggyback off of that + for(var/list/decal_data as anything in get_ui_data()["decal_list"]) + if(decal_data["icon_state"] == state) + return TRUE + return FALSE + +/// Checks if the passed direction is one of this category's directions +/datum/paintable_decal_category/proc/is_dir_valid(dir) + SHOULD_NOT_OVERRIDE(TRUE) + for(var/dirname in dir_list) + if(dir_list[dirname] == dir) + return TRUE + return FALSE + +/// Checks if the passed color is one of this category's colors +/datum/paintable_decal_category/proc/is_color_valid(color) + SHOULD_NOT_OVERRIDE(TRUE) + for(var/colorname in possible_colors) + if(possible_colors[colorname] == color) + return TRUE + return FALSE + +/** + * Used by the decal painter to modify the state of the decal based on the... state. + */ +/datum/paintable_decal_category/proc/get_decal_info(state, color, dir) + // Special case for 8-dir sprites. Rather than add support for both 4-dir and 8-dir, + // 8-dir are affixed with "__8" at the end of the icon state. Then we handle it in this proc. + if(copytext(state, -3) == "__8") + state = splicetext(state, -3, 0, "") + dir = turn(dir, 45) + + var/static/regex/rgba_regex = new(@"(#[0-9a-fA-F]{6})([0-9a-fA-F]{2})") + var/alpha = default_alpha + // Special case for RGBA colors + if(rgba_regex.Find(color)) + color = rgba_regex.group[1] + alpha = text2num(rgba_regex.group[2], 16) + + return list( + "[DECAL_INFO_ICON_STATE]" = state, + "[DECAL_INFO_DIR]" = dir, + "[DECAL_INFO_COLOR]" = color, + "[DECAL_INFO_ALPHA]" = alpha, + ) + +// Basic tile decals +/datum/paintable_decal_category/tile + paintable_decal_type = /datum/paintable_decal/tile + category = "Tiles" + default_alpha = /obj/effect/turf_decal/tile::alpha + possible_colors = list( + "Neutral" = /obj/effect/turf_decal/tile/neutral::color, + "White" = "#FFFFFF", + "Dark" = /obj/effect/turf_decal/tile/dark::color, + "Bar Burgundy" = /obj/effect/turf_decal/tile/bar::color, + "Cargo Brown" = /obj/effect/turf_decal/tile/brown::color, + "Dark Blue" = /obj/effect/turf_decal/tile/dark_blue::color, + "Dark Green" = /obj/effect/turf_decal/tile/dark_green::color, + "Dark Red" = /obj/effect/turf_decal/tile/dark_red::color, + "Engi Yellow" = /obj/effect/turf_decal/tile/yellow::color, + "Med Blue" = /obj/effect/turf_decal/tile/blue::color, + "R&D Purple" = /obj/effect/turf_decal/tile/purple::color, + "Sec Blue" = "#486091", // BUBBER EDIT CHANGE + "Sec Red" = /obj/effect/turf_decal/tile/red::color, + "Service Green" = /obj/effect/turf_decal/tile/green::color, + "Custom" = "custom", + ) + +// Tile trimlines +/datum/paintable_decal_category/tile/trimline + category = "Trimlines" + paintable_decal_type = /datum/paintable_decal/trimline + +// Generic warning stripes +/datum/paintable_decal_category/warning + paintable_decal_type = /datum/paintable_decal/warning + category = "Warning Stripes" + possible_colors = list( + "Yellow" = "yellow", + "Red" = "red", + "White" = "white", + ) + +/datum/paintable_decal_category/warning/generate_colored_decal_spritesheet_icon(state, dir, color) + var/list/decal_data = get_decal_info(state, color, dir) + var/datum/universal_icon/floor = uni_icon(preview_floor_icon, preview_floor_state) + var/datum/universal_icon/decal = uni_icon('icons/turf/decals.dmi', decal_data[DECAL_INFO_ICON_STATE], dir = decal_data[DECAL_INFO_DIR]) + floor.blend_icon(decal, ICON_OVERLAY) + return floor + +/datum/paintable_decal_category/warning/get_decal_info(state, color, dir) + // Special case. Default warning stripes are yellow, so don't append anything if passed yellow + if(color == "yellow") + color = "" + + return list( + "[DECAL_INFO_ICON_STATE]" = "[state][color ? "_" : ""][color]", + "[DECAL_INFO_DIR]" = dir, + "[DECAL_INFO_COLOR]" = color, + "[DECAL_INFO_ALPHA]" = default_alpha, + ) + +// Plain colored siding +/datum/paintable_decal_category/siding + paintable_decal_type = /datum/paintable_decal/colored_siding + category = "Colored Sidings" + possible_colors = list( + "Dim White" = /obj/effect/turf_decal/siding/white::color, + "White" = "#FFFFFF", + "Black" = /obj/effect/turf_decal/siding/dark::color, + "Cargo Brown" = /obj/effect/turf_decal/siding/brown::color, + "Dark Blue" = /obj/effect/turf_decal/siding/dark_blue::color, + "Dark Green" = /obj/effect/turf_decal/siding/dark_green::color, + "Dark Red" = /obj/effect/turf_decal/siding/dark_red::color, + "Engi Yellow" = /obj/effect/turf_decal/siding/yellow::color, + "Med Blue" = /obj/effect/turf_decal/siding/blue::color, + "R&D Purple" = /obj/effect/turf_decal/siding/purple::color, + "Sec Blue" = "#486091", // BUBBER EDIT CHANGE + "Sec Red" = /obj/effect/turf_decal/siding/red::color, + "Service Green" = /obj/effect/turf_decal/siding/green::color, + "Custom" = "custom", + ) + +// Sidings which are not colored / have a specific pattern, texture, etc +/datum/paintable_decal_category/normal_siding + paintable_decal_type = /datum/paintable_decal/siding + category = "Normal Sidings" + possible_colors = list( + "Default" = /obj/effect/turf_decal/siding/wood::color, + ) + +// Plating sidings and all color variations +/datum/paintable_decal_category/plating + paintable_decal_type = /datum/paintable_decal/plating + category = "Plating Sidings" + possible_colors = list( + "Default" = "#949494", + "White" = "#FFFFFF", + "Terracotta" = "#b84221", + "Dark" = "#36373a", + "Light" = "#e2e2e2", + ) + +/// Global list of all paintable decal categories singletons +GLOBAL_LIST_INIT(paintable_decals, init_subtypes(/datum/paintable_decal_category)) + +// Spritesheet used by the decal painter +/datum/asset/spritesheet_batched/decals + name = "paintable_decals" + ignore_dir_errors = TRUE + +/datum/asset/spritesheet_batched/decals/create_spritesheets() + for(var/datum/paintable_decal_category/category as anything in GLOB.paintable_decals) + var/list/generated_icons = category.generate_all_spritesheet_icons() + for(var/sprite_key in generated_icons) + insert_icon(sprite_key, generated_icons[sprite_key]) + +/** + * ## Paintable Decal + * + * Basically just holds a bunch of info pertaining to each decal for the decal painter to use. + */ +/datum/paintable_decal + /// Human readable name of the decal + var/name + /// Icon state of the decal in decals.dmi + var/icon_state + /// If TRUE, the decal's sprite changes depending on its dir + var/directional = TRUE + +// Basic tile decals +/datum/paintable_decal/tile + +/datum/paintable_decal/tile/four_corners + name = "4 Corners" + icon_state = "tile_fourcorners" + directional = FALSE + +/datum/paintable_decal/tile/full + name = "Full Tile" + icon_state = "tile_full" + directional = FALSE + +/datum/paintable_decal/tile/corner + name = "Corner" + icon_state = "tile_corner" + +/datum/paintable_decal/tile/half + name = "Half" + icon_state = "tile_half_contrasted" + +/datum/paintable_decal/tile/half_full + name = "Full Half" + icon_state = "tile_half" + +/datum/paintable_decal/tile/opposing_corners + name = "Opposing Corners" + icon_state = "tile_opposing_corners" + +/datum/paintable_decal/tile/anticorner + name = "3 Corners" + icon_state = "tile_anticorner_contrasted" + +/datum/paintable_decal/tile/tram + name = "Tram" + icon_state = "tile_tram" + +/datum/paintable_decal/tile/diagonal_centre + name = "Diagonal Centre" + icon_state = "diagonal_centre" + directional = FALSE + +/datum/paintable_decal/tile/diagonal_edge + name = "Diagonal Edge" + icon_state = "diagonal_edge" + directional = FALSE + +// Tile trimlines +/datum/paintable_decal/trimline + +/datum/paintable_decal/trimline/filled_box + name = "Trimline Filled Box" + icon_state = "trimline_box_fill" + directional = FALSE + +/datum/paintable_decal/trimline/filled_corner + name = "Trimline Filled Corner" + icon_state = "trimline_corner_fill" + +/datum/paintable_decal/trimline/filled + name = "Trimline Filled" + icon_state = "trimline_fill" + +/datum/paintable_decal/trimline/filled_l + name = "Trimline Filled L" + icon_state = "trimline_fill__8" // 8 dir sprite + +/datum/paintable_decal/trimline/filled_end + name = "Trimline Filled End" + icon_state = "trimline_end_fill" + +/datum/paintable_decal/trimline/box + name = "Trimline Box" + icon_state = "trimline_box" + directional = FALSE + +/datum/paintable_decal/trimline/corner + name = "Trimline Corner" + icon_state = "trimline_corner" + +/datum/paintable_decal/trimline/circle + name = "Trimline Circle" + icon_state = "trimline" + +/datum/paintable_decal/trimline/l + name = "Trimline L" + icon_state = "trimline__8" // 8 dir sprite + +/datum/paintable_decal/trimline/end + name = "Trimline End" + icon_state = "trimline_end" + +/datum/paintable_decal/trimline/connector_l + name = "Trimline Connector L" + icon_state = "trimline_shrink_cw" + +/datum/paintable_decal/trimline/connector_r + name = "Trimline Connector R" + icon_state = "trimline_shrink_ccw" + +/datum/paintable_decal/trimline/arrow_l_filled + name = "Trimline Arrow L Filled" + icon_state = "trimline_arrow_cw_fill" + +/datum/paintable_decal/trimline/arrow_r_filled + name = "Trimline Arrow R Filled" + icon_state = "trimline_arrow_ccw_fill" + +/datum/paintable_decal/trimline/warn_filled + name = "Trimline Warn Filled" + icon_state = "trimline_warn_fill" + +/datum/paintable_decal/trimline/warn_filled_l + name = "Trimline Warn Filled L" + icon_state = "trimline_warn_fill__8" // 8 dir sprite + +/datum/paintable_decal/trimline/warn_filled_corner + name = "Trimline Warn Filled Corner" + icon_state = "trimline_corner_warn_fill" + +/datum/paintable_decal/trimline/warn + name = "Trimline Warn" + icon_state = "trimline_warn" + +/datum/paintable_decal/trimline/warn_l + name = "Trimline Warn L" + icon_state = "trimline_warn__8" // 8 dir sprite + +/datum/paintable_decal/trimline/arrow_l + name = "Trimline Arrow L" + icon_state = "trimline_arrow_cw" + +/datum/paintable_decal/trimline/arrow_r + name = "Trimline Arrow R" + icon_state = "trimline_arrow_ccw" + +/datum/paintable_decal/trimline/mid_joiner + name = "Trimline Mid Joiner" + icon_state = "trimline_mid" + +/datum/paintable_decal/trimline/mid_joiner_filled + name = "Trimline Mid Joiner Filled" + icon_state = "trimline_mid_fill" + +/datum/paintable_decal/trimline/tram + name = "Trimline Tram" + icon_state = "trimline_tram" + +// Generic warning decals of each color +/datum/paintable_decal/warning + +/datum/paintable_decal/warning/line + name = "Warning Line" + icon_state = "warningline" + +/datum/paintable_decal/warning/line_corner + name = "Warning Line Corner" + icon_state = "warninglinecorner" + +/datum/paintable_decal/warning/caution + name = "Caution Label" + icon_state = "caution" + +/datum/paintable_decal/warning/arrows + name = "Directional Arrows" + icon_state = "arrows" + +/datum/paintable_decal/warning/stand_clear + name = "Stand Clear Label" + icon_state = "stand_clear" + +/datum/paintable_decal/warning/bot + name = "Bot" + icon_state = "bot" + directional = FALSE + +/datum/paintable_decal/warning/loading + name = "Loading Zone" + icon_state = "loadingarea" + +/datum/paintable_decal/warning/box + name = "Box" + icon_state = "box" + directional = FALSE + +/datum/paintable_decal/warning/box_corners + name = "Box Corner" + icon_state = "box_corners" + +/datum/paintable_decal/warning/delivery + name = "Delivery Marker" + icon_state = "delivery" + directional = FALSE + +/datum/paintable_decal/warning/warn_full + name = "Warning Box" + icon_state = "warn_full" + directional = FALSE + +// Plain colored siding +/datum/paintable_decal/colored_siding + +/datum/paintable_decal/colored_siding/line + name = "Siding" + icon_state = "siding_plain" + +/datum/paintable_decal/colored_siding/line_corner + name = "Siding Corner" + icon_state = "siding_plain_corner" + +/datum/paintable_decal/colored_siding/line_end + name = "Siding End" + icon_state = "siding_plain_end" + +/datum/paintable_decal/colored_siding/line_inner_corner + name = "Siding Inner Corner" + icon_state = "siding_plain_corner_inner" + +// Sidings which are not colored / have a specific pattern, texture, etc +/datum/paintable_decal/siding + +/datum/paintable_decal/siding/wood + +/datum/paintable_decal/siding/wood/line + name = "Wood Siding" + icon_state = "siding_wood" + +/datum/paintable_decal/siding/wood/line_corner + name = "Wood Siding Corner" + icon_state = "siding_wood_corner" + +/datum/paintable_decal/siding/wood/line_end + name = "Wood Siding End" + icon_state = "siding_wood_end" + +/datum/paintable_decal/siding/wood/line_inner_corner + name = "Wood Siding Inner Corner" + icon_state = "siding_wood__8" // 8 dir sprite + +// Thin plating sidings and all color variations +/datum/paintable_decal/plating/thinplating + +/datum/paintable_decal/plating/thinplating/line + name = "Thin Plating Siding" + icon_state = "siding_thinplating" + +/datum/paintable_decal/plating/thinplating/line_corner + name = "Thin Plating Siding Corner" + icon_state = "siding_thinplating_corner" + +/datum/paintable_decal/plating/thinplating/line_end + name = "Thin Plating Siding End" + icon_state = "siding_thinplating_end" + +/datum/paintable_decal/plating/thinplating/line_inner_corner + name = "Thin Plating Siding Inner Corner" + icon_state = "siding_thinplating__8" // 8 dir sprite + +// Alt / new thin plating sidings and all color variations +/datum/paintable_decal/plating/thinplatingalt + +/datum/paintable_decal/plating/thinplatingalt/line + name = "Thin Plating Alt Siding" + icon_state = "siding_thinplating_new" + +/datum/paintable_decal/plating/thinplatingalt/line_corner + name = "Thin Plating Alt Siding Corner" + icon_state = "siding_thinplating_new_corner" + +/datum/paintable_decal/plating/thinplatingalt/line_end + name = "Thin Plating Alt Siding End" + icon_state = "siding_thinplating_new_end" + +/datum/paintable_decal/plating/thinplatingalt/line_inner_corner + name = "Thin Plating Alt Siding Inner Corner" + icon_state = "siding_thinplating_new__8" // 8 dir sprite + +// Wide plating sidings and all color variations +/datum/paintable_decal/plating/wideplating + +/datum/paintable_decal/plating/wideplating/line + name = "Wide Plating Siding" + icon_state = "siding_wideplating" + +/datum/paintable_decal/plating/wideplating/line_corner + name = "Wide Plating Siding Corner" + icon_state = "siding_wideplating_corner" + +/datum/paintable_decal/plating/wideplating/line_end + name = "Wide Plating Siding End" + icon_state = "siding_wideplating_end" + +/datum/paintable_decal/plating/wideplating/line_inner_corner + name = "Wide Plating Siding Inner Corner" + icon_state = "siding_wideplating__8" // 8 dir sprite + +// Alt / new wide plating sidings and all color variations +/datum/paintable_decal/plating/wideplatingalt + +/datum/paintable_decal/plating/wideplatingalt/line + name = "Wide Plating Alt Siding" + icon_state = "siding_wideplating_new" + +/datum/paintable_decal/plating/wideplatingalt/line_corner + name = "Wide Plating Alt Siding Corner" + icon_state = "siding_wideplating_new_corner" + +/datum/paintable_decal/plating/wideplatingalt/line_end + name = "Wide Plating Alt Siding End" + icon_state = "siding_wideplating_new_end" + +/datum/paintable_decal/plating/wideplatingalt/line_inner_corner + name = "Wide Plating Alt Siding Inner Corner" + icon_state = "siding_wideplating_new__8" // 8 dir sprite diff --git a/code/modules/research/designs/autolathe/engineering_designs.dm b/code/modules/research/designs/autolathe/engineering_designs.dm index c376a1ac1c5..1ad5c3f2ab9 100644 --- a/code/modules/research/designs/autolathe/engineering_designs.dm +++ b/code/modules/research/designs/autolathe/engineering_designs.dm @@ -143,18 +143,6 @@ ) departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING -/datum/design/airlock_painter/decal/tile - name = "Tile Sprayer" - id = "tile_sprayer" - build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.5) - build_path = /obj/item/airlock_painter/decal/tile - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING, - ) - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING - /datum/design/apc_board name = "APC Module" id = "power_control" diff --git a/code/modules/research/techweb/nodes/engi_nodes.dm b/code/modules/research/techweb/nodes/engi_nodes.dm index de731b02c6f..7b8b0611615 100644 --- a/code/modules/research/techweb/nodes/engi_nodes.dm +++ b/code/modules/research/techweb/nodes/engi_nodes.dm @@ -131,7 +131,6 @@ "blast", "ignition", "big_manipulator", - "tile_sprayer", "airlock_painter", "decal_painter", "rwd", diff --git a/icons/obj/devices/tool.dmi b/icons/obj/devices/tool.dmi index 0d89f296761bee9bd18c8450a4ad2e566e014494..035f73b0aca2e971a5de6e1a43bde8c0f4e1eb84 100644 GIT binary patch literal 17689 zcmcJ%cUTi$^e#H|E?DSY1r(_Qf*^z{DpjS5bQKh&_ma?2x}bo71VKURML}xlh)9!O zLg<~)AtCJ!pWm%Q7G06$;&>u%y7Vv)X|joC zsmTVK$_lz{TU9(bl4;ggg`#{+}aUT|gpJ9EnCf+g}t zynS5gH+im2pUsHt`*uU%Na8oUVRK2!*-0OD%`eB)&IdX0RL|z3!KT7W(W1%|8;ux= z%PxZx_X}j4&r=uORr_5m+jjlTL7bD{kXz{;IQdm6=?S_N();GlVR_y&^nQ5DhGzNN ztJzPzEQuw|tg>G&Dlr#wqmDThs~wsw_ckI#R4NG2+Yqw)Q>UD&Vp z)QHDad!AQdN#3HIv%j^J_AApbhI2yu&CqXJaCCkq<|J+GNz6 z4XVG(p8q!z?MZzUu$%qf>DdLYcxp;DmV`SZwWc8gwCWP*lt3!lo>%c!%~#*uGcqy) zfNB?=2T5@JqC9gUFeSK|NP2>iF%*3Veojlh`R59~YM1~I+uuFa2PzlqP28r83*PVh zp#ROAToDH8He>eEiy|=XJ&T}o?F$VV7N6h0p2b00%kRX0qEY4Tg*WV8B4VNn6VHX9 z6MLIzTW$AJ;P`y|`#?aJsVBvy74i%V!)PEwS5D+9?agF}|AKZ_Vd8^>E^xkrXG;7P-kna0@+D*lyHW!ZRuX#0HJc zh^Qpc{QA7ePPd3B+2yHV)8Rpar$evNWmo*Gp;Tj=0No3a;DetwzhA+ItRC&9AlgpE z3jx!TJ@r9rQ8M5IaX#GC>Z8);nlY&&dU#*&1lryZ7Z2 zaZUO@Evh1$-&b)xMp=6Bj!wTD2dou)l25n7Z2wgE?I)tp1Uc-;wm4}V?$*R-W!ndY z6gKWTllU7Y$N+RtX<88OOohijUYoOva`?8OwXPB{clx`Tdm7S_P9jX363o;4fiYVKZMW2P{&z zU~alRq`hPRiTSOXD}X_kf^GMdb5!0*G*f*$voCYu1tt{XdxCYRm9_fb1|G5eveSDT z7OqrJH$9>E15I$nXVjQqhiM34c5KU{n)9D-Zuv@3|KR7EO*J}G^U1>vBHLVRrU({r z^UP0KeY$p($s6KuJ!Q9Bq|x0qSm=dFaP;I|)Le=|fQD!Lv_U1~GQ9E+P0BNW+dpEG z=J*ZLxft_2FUhL}VD=#AS|LM_TR<}#pz0l(=;g83gO)6reqH#RLLu`0Y@ds|@iLi8 z$mdz-nh!r#mSc0NcELJwA5RClug7>nSL~X_zw#7F#W35lH80zl09G3XO3kqEtF$WE zPx2(il=qCyM5G}Pk{Niu#yKvd$mJXBG?()J)jB!9Y>@w1T>kIWMGi)6H^RY7_TDw$ zRymm{X6vhjYpsvn`g_?8-YvJus7D66G?|@UwtIuhrEr|lP}f`lT}9pV@; zm43ERdZMqo$-)OO)y#~TyspGGw)9+_-4|uwWH|oJT)!S6ryJGZVTb5&V6pQ5%%c%~ zri0x&D3qBbJV%6wW4}LTHQSvLZ4$wc^2~lHFtxwk;CJ(=OH%AW>j3xuMv-Q>0Wo2- zMgcHiINsl<5C{ft#=sAQ?Us~r8fDgI^xJ}h3MucM#}*R*dKXVf@vij`w-%3jR)u8J zez2Zt=9hvEpO#~no8*Mq?}spJ&|mU!y=PP{CxsW<5G^)TpPJ7S_*8=3T%8TPPPU%{ zV->zVXTNB8Sw|FUX>UTQC))~`ORYGVT@gIsZ#A&JXPR5pt%0;SeSWs**q9{5Q?I!K z4RIBky!uP=9}p3BlKh}ISKyz~*nm}_x94Trx_^>v-8EzI5Zf>D+eqhVlj_3*{2QVpc98C+Y=EZn^_d=C>Z=69~17=~Bb6Gs`TG!M-3*dMU zj0KYFnUKT3*y`{XTZ6c&Y+ssFE%#+SA3B$gKYh&Bl05b@ZOSQ{o?6FMrKn!z;Ps+M zR7zPm2CfqDMCw^P;`#o&OMjnxB3^gy2?(aGzQrqD9}?>940L73+hVtvuuI1xS!J#n zZbT`QPR+aP*2&^K4*Z?;uL*Q38*{A7jKG)4YyC&0K^N=O-Yl}2+frFpecE^ z29=7nAABbOqf~6EO=Qs5OK2;htDA%1#juxqR*```S-yUG!`tFsggIt~?VYGUTawAx z4}4x)-l5F;%;V(8`fc|uXD_|CKrx5l&*5~g`R0o51NycXepF=|zVi=Zwz;Y>^-=^~ zi_LXZyY+(opi^1iI;-yD2UIPGn~rGL)wp?$bgJ?TnjIEpN^d#KFq{F1U>ONp|*7!24U|eRR4mTP#9X6gtBgz%m>=J_L9x`2gp5Zk4>}R z192%+g(vbqoMG)5ZL8DnaJJINGlR+>kb!q-`<@8L^4)XZum=9RNRR6uiJcW((_-|< zkoR7rMFPMANkH;(pSnIAf3%nBb*>$RKceHS&}ajGpm|1IJLe3Ua1$4~_p6(VJ^$gr zdMXT?TWM{~8#(^LO1{K zso9#X7kOs;mcJHMJtq{vRxAgzkC(Z~w9Qe3!Nu7huZ)R^Xov66o!<-)10fx(_{$~vwac$|vhg6wS#_Fd zDmXL$1z0|!35C?Za`Q6xf2mFT!FzvOl80#G8*1MDJ|!=-TG#iN`G__hh&vx(tx>qU_cbNm~*b zy!uxPE)j{|7ZBzIphi4lF?|~Q-s)8Cfuhfi-m6VVyT%rbGpdf)E2$P;_x{g=9t@Lk z$RQ;|t~~QFuPgAyEd_M9&lK@DeY0&_2D)KgI$s{`&6^Nt8Qpe@dVf_Qg7PCG(D1Wk zI{pt9);krqF+-yE^*ImXiyIP$!pON+Jt0P^?##7WF@@^&j8APpW;~UEpzw0JyEF@R z4Dqb+0t?J8>xvBO{My={+PW$GcBJjF{MuvY`rMDje8Ht(g!U<_d-!8ZDcAm|h?g4l zR!c#7H3pPrS$ySG=nqkObYnu20kQ>rW(3+qO%xb;j<{>xbr5J3kVlEBP^#wn6d*Q+3qBp=qniKhOipD-b z{$~dPEdmSLZ*1NmaCEM^m4c~H&WwaNyqiD<_PoviDZKj)Kerlv5)QLb{YB%ZU!O4b z{_u|f54abUdpQx*0%js@=YDr72^Q_@EABj8r%?#Nr@Mr<{1*(e(-TD32$RFZ!lVm( zDb|l*r8_uOzm^9qdw~B6;b=+}_J~OpbOe)znwag^jdC=8D{CX^XC%-sPEkFeLly^ zTDRiuf=s>KO=cJ-Kx<)ppXz7pcK41$j*;j`BhjSlHYINgIZ z8w?NbEFrjYvNiHX+iC>Z4^Fw89r*B!LVqxV*jU`QO)Y8FFuwRw*1|-1 zelA5njCQ-bY(0+>SX^|((7dCKR#FsN(a)UzqSN=GI+ov2*=zpi07#^7zHejj#G(!I`jGh~^&jl49eF$3Gd!egHI^apU3_=Wnx=;)gT1bP-;3+I4u~CBa@{PeZ6M<-?A~`q|69O=1CM75%bZ)>VOmrr_4q z30l$lMglVX^Nqj4pCy_Dj+AcZs-$PO9Wx@4km|0xZ%Fg}mWI~@tBs*y3@+kex_Etx-C z_W8MS2Xvp}!2I^TRni&*(i4b=WWJ~-6-dszJJ+LA=Se5scW=OYNic@Y$ClE0rDtL# ztsF-TSdKaup&?>;9x~fDhsU)ZRMt;nPJ=6!;L*s)$N)*#6EBBgqX5p7@VZtbmdEUj z9v8YEke*eL#&HfAhx~ygMnJ%CR~4GY!}szR_eziQPDi{L3bf2Mf!~ogH0Wv0OxSF-6SXvyyIN&BY%*SNdX*<}?71 za?wg^oT_-DF$p(jpnse2?(-;)2GOKnf%7)oG}S}D{`Kbt5Ar?(z@gm11aNiL+ZYvCxdwpf1Dn;6+Spr&@hc&<-u|^#QKk|Su)ZR2Vr?;K02+164RN|}k z)IP}GR`Tu4ctutuVQ9C3v$+=N>nf>e2))n;~fD_wcO>ARCo;@3P2zzo14|RBIb=F z+vkU-?qB&pS6cu*c6W$23<9RPSf*#y_^VQA&YwsYwIWpr&8xShzHD33KO=_6FhbKBy#Aw`zypCOTEMcXch?N#jp? z^e`Obw@@F_NZL4 zU+T=m<}*=w>(A(t7@&B+CBD;MPB2B2VL(< z$24X!JUv6OP@qE0KQ8pRnmlHXxVnZMwuxj4>Ly9Zrn~4Je%^-s@oOkvsT~TbEDME4 zCW3a)hcWdm@uNOV&eY5vr=+Ilzluq3AyYMKrumt^C!9;JqPp9=E&XRjsA-oKh3C6Z z#vdZylPcMSZLIypMv%e%+(-+=1qL!FO+z4JaTFom!MOQDc34|oQ}AhJgpW60Te3?4 zz@7{8Pp|9aRB^cPhDlL^$+c!M0uTjL&0y|U73>Cbmr`n=*xD@ScVh5P-;mN&@KP5> z6lZ~n@YXQcesRCR!N*RO{|3^;RF>zF5}&exU(O00^ZjUhCwzU?nJc=MkU(tj+Fq`~ z?NQ;5-CxQ<_I42Sh4X#EZEeC=4$(jV8 zwA`>ZBuGDEfHb!QSs2Lf^a#Vk+*Vq+P(Ohj05kJouF?%mh04a8JN5%c(dZS~TFJ>0 z!AcgEi%%DPy&!5oL%VrDHWEBAw%)J&vK1+VXeSv0qxgYhKi7Aw7`{wl)*f}7oj>|{ z`16E$5!#zlxR%w(_b(Et1d0GMOQ3qp(&o0iyR^JrM5*;dC{%@gh1f-Z4dq-!rdN4q#pSq zEq^V6Qc#YKD(9HR=iH~Om|;Ox+m9tCIx35_DuNy~iPO-qq;pji<>dqHQXbUfGhLwQ z0;##fAo7~nft;c)3+13yxdO04+)5s_4HI~E6gJ@yN+ugvUvv~i4aTWmZMk3$Fl?39 ztbyUQ@XW`*DZ&4ZeFYfK$AQ?N=Nm;90W=@n7JI8=~hh}T0M^nJQNiU z2-HD4#EU83un=^1D-LaBE7f!h!6&CZE*2 zWLmIdFtuxIqW|RjC^ntbb@scP5MTp-Z`$p+Z2W2_tx5H(Qv^=5xKLA**a;-{O70&a zZq4)gEc+%8L!P&Yy3AK@jn@Z>{%Oj5wU)Tm(f)Lb30b3`j9VRwXzAh^7nl_#7Ja1>c(WWYtP0vZMDHqe+k6HjW;)}=Jm zhi`@-)rG8RAJ{#e-@xOXmwam*^-N%z63%E>Y2e`vCiZyKRAMJ{BKi+iTd8H+s)VIx z&t)N@tMv5rk61IqnowPcH8rFM#@bKO`~fNdLIrF%&vmygJUC#sLYiG_yde4s(FyVR z?Z~$DkF;W9`TMKMCvfZISB|%Iq^5m!6<#RQw_!hTg6f|I2*uw&g4F|HzX>bBXQjg@}HrzN! zh>7oZ*Who3eUNEJ`^oP}z*1*^h~venXAf4;^Fc4gK|F57PCklY3`*fgd1J4i>WPiL zr$DoRqrHvuV_4nIRUC7WoT&+HwYe(!B=4Ex!jrQ}nZ7h4v0khk-2Jz_sKAC7+#g^C zn!7LV22T6{*%zP37p!9fJJR-CL=xQ}-6cRZOlF^rXz}2lL0n8MDLq;e;fm?>H5oDr z-cqa~E_Ez7N+C!t7~A5Z_P8z1;ub>|$Uy1*`AQVkrLNX-?*0@TCr4T{B^K$^RU$r? zKLFroy*C4Ru4BVi&*931$7s$rjL?C4a+v7l{$>VZaQvPdWnwpqx>mmXQpjT;E#UE( z`3c`2tmi&@b-CYZuWHG8jUW4yyYl2Iig;Ec83&Jl-$mB^&HE$Lrg9|~hz3N+Bzn-squ!fW-Nn8~FkF@~O)uXik;I!~1#nH+xyGrk* zp8iomyEhMu1czs8P@m|NA|EeR^v|8g^FTgOO@nCk=H#)js`RQk0?jx2v~qljS1AF;C4Y z0>vM{o&^ADt7cl@Qi#2Z@p!phoQyo>0rDd0=z^xf2YXY58}9=^e-VM;8?3S1L_5I3 zX&bj7M`Hn$q^W8msC@1+n7E%$d)Wn|ko(IHO+T@T*w;PP6u^-LJO(_t)Qsga5pI$Q zux_p2F#Izc+SpU@$e6AVc}yjL&F9Pw7d^F>$#=8?m&mH@ysg9HEgoVdVZ)U*n%g~Q zM1#{hI8SHT84F!Ja1drzU7W6}#4gPc(@gj~v$2Va!$+=DT%8~zwMPZB1_4cMrIdj4 zxM_=gQ~D?RLEInqEAGXbHF0w9(tnZ`v|sVb4Y?D1FoYVvb5FVwczFOy1?%&A%x+Cl zpjE9U%Z#AWzYPB07)re@lU7-I{R}`t5yaA{Z#20((bw@P#hqHZ1a__QEwlSERC#>2 zL8BQ9$(;xk7lxi5_B0Y)k;je2(62S{U{W|m`%pNA7t==lEr|2@*ziuSeHE)#K~!#4 zk8Jy8V~&QhM$Aa*$E^FLk?>>;=L2UDH8J=)ZOsMqk9uvvT@iVso&qNcbnN0OZ{L2p za^;F6(wY2WzV6xhDu6u1Dp9YwWLA4{qk=B?>9hXql5qqKVTms$`?b_xcdg7Cy_Gh< z-OmL9obPeYYt1`$w;O#; zq>~{%uoO6+qnPkB{Zq*PQ8my9I5Eel%34GRaKK$jE?*=uKQ51RuUfyjzMZ(-Wx%T& zY0=A>1p+JZ!(511S>aAtTV|0FW*X^Av?JB-e^G&6F!#;ugkf#yPP@Tc#f%&PPZ}Lq z{R6)wi{oI)B9fTM_E8TQHf{6E4RMOZhDcij+mq8MJ21BUyh~!rFX;(&YNiDNmEs>%lR$1z0}4mI z&{K##1*uKBmzHM|g6)x|1A*I(UAXh|K{1KyN|)T*3V@In*HYEmTp7RywEoWY&ei;; z!y8>zuent^h@LAi*SD2~jZ9$Uc~iWTl7}d33;~6yK6mL%oz22j9mUR@g@ER~DJr0j zx)$Vs<$i{Rai@i;dyC7+H8beTqz32+`;Ft80HL4kYfcvm&gAdec0wzE87RO8_IClV zxu1pYl7Gg`Mwsky5K<{-DO?Dj_MY&Bgat7gQA-|D>Rv8t3trNP?qyOzZsq|JCa4|Fcz=Th3c2R>Zw!Z) zD|5^A=V;`9pA&hqZsF?LSgVAG1rsEXhHGYS>{v`;es22_mlf6f;q0B3_2@2B-V-J# z;;ptbwWAS)`)P>_noeHCQ6r)XDDrU)_7a zr?07gv!+MjlMun!atER?c58^P_0ei7CSsy|)^lsV)u5=}n7Mg3%x#R-AUt|k7k&TI z#C8aN6#JF@vRLc)ScU)}U)K!7;BaO&?S+;QRVZdG*>11q5@LjPwz?!LG0$GJ>k-lH z)?SSsY%Y!8Lkxer=>YNN%a@P`U)y(;x92?UY3~_Rb!v9qsNY(fs-6ty{fQzHgpEUr z-@L^A;2Rvu@Ch{g7rs?@R~{ha@IiR98)vzzqui?f@?|_?Q^_TT;FfqRA=Z#%A&Lf%4(cVBr~15VStNqyUWnRm88uu7bhGeXkc+6zg?0bRTF9;lw_bU}0Eu zD~N_DB!@w54iiOyd_=$78nVh) zuim|HlLv|T2(f+!JD)Ji?(zAfnrxqXQsXB@G7sD$e=a zP-D>h#tRpTAWao4pFX?V0@V+tS^fjMOy`krvF5GX@BfP7XL;KwS#>LzjLKI$qTxz~ zb)s5nDd1%+P((Qqt5+p|Ov0)R8bFbyqnFg&r_jU+Tx|SFQ7idu-I8EEE^`VxCeHj( z^f$E-;x+Ur(B@7f;RLEv17a+G=ogK9CGF4N`tTGj;6^C_e`?(%G`M`^U#;sYwWDE0 znvLdl!f{%4cgI{~VhUnauxSS3IHbdvmDz$aZ@jF;y@%Md(gL@}!rN9%H(`4dW>n-r zut@D}4f3cgEOUy8@)^t9zRYg#S`lk)7E1od714zHv*o&b`Oc$98Fs{5NY0<}uGgeD zwk5_vh^zJYWw}{ObDh}|$Z<;gN9Z=>OK>{hbP_;h!y>*x1y3#cu)CWZK5*%FoGKLB zbh(9QwGUIP@1eG|R=?x_lg@hrIlHt(1>B(sL5HMi5|^CxZ9WI4@W)DAVgVX9YpBs^ zWKxnRea|wJ+&HuhzoDu!d-08R>6R;c+jZ@zCV2L3H_w#s4~}{YQk^Hv7@Pz?Nijm?zjGM z8Y9dO>X~}4%7eO>QE73qa`%n36(WgK=9!xq@VOYUPKbL^y-=j0BqQV8q`$cB2d!gE zmx?{TPC?BW;QSBS+DhGJ!BviW#czs0sx9}GE`Tv}f`tQ?I ze~-Um3tBrmI(CubH(Y0QEyZcW$~jAX!r#b*%+JsNm}v~$UszgNx)4UGHXg?Y&YJ@j zX;O?^@lyC-Jw5lWtY+2&M@ubrOfRue+FtLawy~hg+1vBDz`o%ELq4FDk&guJ&HuB0 zH>sLMH8eDo1x?TG$;_*G0g&=qHKbPy6VPq_RMqT3W$5pJ6M^gPv{0hPw4XPynQ8EM z^YF+8TOwEM(JhAGkz+<+pfSToOc~?HZ;Dh^6JUFjx zQbqx;N=Rd)C>N(RG%~u-nZP@>?r;nI-9>re*2!w#g)m;)hX$<^MFjv>DH|~Y4e_8h zbacD|*0$V#|5@K#Z<|%qQg?TE9&h+_RC`BFsK#g`i*wMl+LO8y#x+Pn=CXv-5Zgq=YBZ{#S z>%h+Xfjo!7%t_r41GoD5!+jy+gM-dba82B83d26&kFUd%C*S<2AN|abbJAR>sHkX| z%JO!55^%87nJWJEhyQ+R_qP9RsD$6)h#$0}a_>51b7AN_Aob*@z@S&4p}G0<2QXuB zdeoNXv@sq(=3!@L?WhN3b@m^`dK#ck2dfgm2mZPZdNNLFg z*>p6rN(mBl=phHmsv#+eUXyI=DiGoKc>jLtEa%O4@V;`du{ya$XTL>P1oS>cwQ&Qg zB?8IVpnNG7GFogNF6T6Av%lOM1GdMt2-9TQ`uwPZJ*{!Hf=o4pzb2!F`St05Umb9P&YKa1C8 zzUO*BnN~(7fmO*);EZK|7V&zyQR)(-L08;T`2AN>n23ey&Y_`)AMdY-%C0}|ND|bz zT(+#NtjwA*{WwxM4Zk(vdT=kPnoYGgQi@^XyVID5mX_8kvR)oEy*a;ex0Cx@rjuab z2c?BbPFpwhG^eSg>B4P2aR6DmJ<>Chi&c*^4yj%)gCJ;uFSJYqQ!U3;1YmPCf?-41 zKP1H}A{4z;3Vc5FlQnPptr0%1V;`>uVev1#uN0WT-?`%~Z<>BDGKQu|M5bI1dBk8& zz!pyqTT9xz5T=~YR%;j1m%mIxVUk~Ssy4+1Ow_08!jDSHC4apAfgUhiUY2+OZs+tWk$pw}bNtr#6Zu&3 zJLASeH*Tcr+_}@dHdLS&Ai3}{nor%?SxkgcEu;|gFkNa+C>GUI*IF(x%#0WPXNbMKdDv@g9q5cPpHK8a+fS%$`-dc~i#VE5w|BT#5I1Qs)>)z6AgdpuV9@P`$ zd?~!Bs3-skX(7I?GI3l_=hwe;M-_a|%HpD?15|JE*SjM8JAn^r1O~v(0ei97vZ#m_ zy8qPC=A&2@wA<(RDbZmj8slj?raVb zvp(a}l^|6`v5H34r%Ty}UBPn%-%^fiDkxs&g8ZJ5v2CRcI+}0*zMMG4+jqrCyG+Ym z5mk)jQ*H0S+7 zUtgDU=)3dj6OU_9KgFxK1BxW3c;U`P;LnTi;A6>wSFMT0FeZI{H)Rja%`Q??ReSQ6suTxCKczJP~x0AEN6kPGQKaS!adzv@+Ni6qU+wDADEnnW((9n33 znHf7UU^wVyKeS1PRZ0b$x^QGIzJ=;Ornaswx3u&Ovd%l4IJ7wYLJl-(c70uxz6DA! zqs_MmTj3jZ5&od4DLL1Aple9OXsKf0{GYC&HUUa9cOgfH;nMjW8wZNd?Q9Zxr(pz-Vm-Ed3QT6^ij!jn*DyMH6j7z~M#XK!D7_O{|t`HqvDN9$6N@#@;v({JQY_OrHUw9I?u26t6&gOeBs z261LFlg7Q>XM;k5MVqVjwHpLQz=@t%a<{S4>}dwcSBWFN?`8hXR%2S-ZE3mcBb%fs z$!42FJ#@2!CRXXW7@AKjG&B{+_Bwv#Mc-L4qH@-Y zMcOR?=6o%v5%ns+LPolE_Ci!nL4gPaIW&}l;=S=MIr$tVCFN>VEVSh(alStKanmCz zfSOf6V`)u@OGRRwSK{hbX@BKM8b27sv}xB(!Nq;)iE2PLgrszGxbZ6yWCYHJ?xCUc zFv5m4Q+`@n8n>ktW@6a`pJj`XepkT0b5NE09Qlz!+rDRtqP9q-5JTG?Nv8TMMtZd~sM-~3`439!{KkOLkTif2Qx#!D*Kp-F?`I1mW!=%BbaXjcO zKkDoAzI_{hQDcHLS}>R!ChNs86?`?awrD)#;R4e>uEAQ)p59sX9sNq*2aT66#ep3N zr&{0 zxEW+k1dbx`e@+f5v@jiGF*?`5pc2|75k$|z#YHbEDH;B>ch~8=A}MC6M-OV<9xG|r zUHKFUD>@PW=FzOIITwxZ6_BM(} z2+1M6jXIu58EH1`%TcDz?0&{A6aoUKsRfYxFC-uTXhxigim)+UsJMFrE)K5ypJRt& z!^6TfNm~;^@9sr{O%q$h^bim1^n86N-n6M^F+r@J?P~S{tEqwqR1a~d6}GXdn}8OH zHs5clv*+1>;RiDkpR+5Cvo&K?VAI#63MXVn`wRxy_x=bxQJDZ*fw4ShD5EY7 zrG!2BC;CV?t{WOlzEdXIM62f_p{_B)BSl_YTf|zmu&|rV`rMVCfIIH0^;|K09HcAT zn4f_uJqJV(B{Jr~Q7%$lyy(X70Uv^7`5EURZ2pG(5T242S6+UwR z>s!OGZ#hVsFeB5n-Fk<^&!7G9yIo9N(%7kJ6o+#f^MEmzm6cWQy*se?2~nV#c;}Jr z9xn%Ls(0y)1n0CGA%q*}L#g`HLHHk(1#n|hB4*00V#7iKHcYp0w7YV@Dpwi)6J}-p!och~= z5{zxUVWjMgbl0hGs_#IkXgDAmb z&-35Lx32daAwsgcBL`16sUNI;wYvki}P(?>ZhE1(-I%dyQGTVa%F&Sz2`vQJ=2&l zpm3g|xnZ5zk!FmXdm)sjZnin!c~GIPzu({-;@s?*+8G%3HAw^9Qjlc_K2@0{5P4{s zm{<>K&ZA#QA8=>yAV~4t^2K{HrXVV0jI>zPKwC_3;G{wI`bs!U2z2NDg1iziLBE!k zI%;+F=N!AlV-~sMv`cM_skRQ6CiWIxNyNfJQ4l2egL@*_+qiKCWw5O)7NcB{oFbo8 zF^gv{y)4DYV1}O;iF$Ue8HQirr=M$FiHI-kaVnad-%fO5Xv5lWEwT&`55G?jzph3#iF*PS1-Mlgprn(VS-lz;{JH)=N>-Q(?V};uR>EO zz<%qcpJTeuz`($iYCGiYEvY(6d#JN%!M(hYN-WPIw{_?`U6b+ejnmTDNgX$iqtZv4 z(JKzUOgBrk`c7{Yc{{J7``%>cDWJ1U68TRK)4Am`Z0b~zeK9GzNvJP=6rd#V{Za3G zZt?`Q2yH7deVBOwh2js%nPb+KuY2rLioUA%@#9A~U*DPurmKg9UL?z#-fc&yx;7Y% z(*U)#wYN#{zukZf96Xl;2n2#VNT^7p33s>whDTp;vJ+cdD@{vJ9|n@*h@ikhjZdc2 z4Y;yK&LxbV(DeWbM16Lx_(UmLQhNH&k19>&6O=zcw^5|0xBE|4($gaGky>Y^m)TX?LX|IkR>oPVbNIz|-yg#GAJMmf zl#E_Vv+e}bNEJ{*faCW^#gA*x(b3V}(bZktV_}C zXcL3_yaS&-+!))%@AvzDdFd^y3%(*p4`I6%_QDY4CDqUK;Xg6!xfJR1l^z@)`dJF0 z1=#`gfM(l+OJ9hatu5g+H<_84r+wk2U%k-N@8M%57VaglAich(ch`i@OwtHW7d6KuqOwP(MO+UfRN|= zGi^ILwr1aU^cpx+$Z*HO)BtE#v^CMgUkGr&)5L*xFl3#?VRGJ%E8&6JqOzt|FghP7 zvxWpI`3og6Bc0CgU|J~^Zr+>=rQvHXe22307!Ef)yl=Zy=z11g>Ed^cM)E}3Om!^Q zx0J6lAS4&~BZ{}`cvS7jD@3B1bZc~2N7?XVj23%U3$RhlrMwl7eqylT#m)q+Q5Y%K z(zUD=G!QdZ$h^~e&0t}2u7xA`31gqccmyt(hTO49ao9Kv@~CR<;(>4AVf5!GzusOA zDj!#3bb9fE<-qpwP=sk{Mn?W%_kHHQ9<8Qn*&xD+cVH=-txo76Xf@28WI zk>%P$4U`Wryx{8jI63*q!f}!@mQDP@r~G^mmzb&9Wel=Mt~3!uU|kw%#38q zi*sz?OShGUG$CL1&hiBg=~dx>SX&$g`up#)T6sbPy#vWYEIIi#emFHa&Sj?a$T5Kq zU~AghMN7x|j3sDuJg4M`U&Y#fBoi-?z^DA;VcJbv-{_ZmK|u}Vuh{jJ{B{J`S8J(- zzL(hy=4!=&#NwgkupzqleoDk1Oha7=+5%E23_m|utIPOeRA*blCg%8!Ws_@S4r5`l zTV)?8j(zFPrm%q^ErsjTPRVtSS2UwS!5*LQKUj~3->~+*67pCC04T^#|1SV}J{(>) zvOxj(`}+?#%EpXY!#;R|(jHvlHa$I!Nf_7|EqOS;ezG>of~KC5!DlRBSKy|f@~vjM z3^4P%F7-Q36SPo{bfH7hvup!)KvY!JMR|GZM~y1Jg{U;nmy50II#b>^-GuXZWyF-u z|C+hB9_^3|_r6>49c~=jc}nnHu;uC}TA=fsfyt{_|8R1S>sfmDBY2JR2uAo$4vb3r zr(|-o_X@erJWI(jt8uZ+{OYnu3+c?^3p9LyqlXY};6Z>YwCS;vW_ql7eRDDW5IHsP z8+T#qkl@0y>O}|M?0D~p<$ld6K!uWff^;}WZ*K})Z7XaNxvfHJ5tYpXqJKQ6%x&3t z5kK8m^DdzgHHWFS32oC&8fa@h-iGHdBoVvE$_l%6j~g*uSTf~@rxKi zf&C+9RVxg8$oeeC+AMgYr$3A(L~Uo{m+NM`mS=ruhy>njgl1I~ai}x12rVfNEeVs7 zmVT3|;C}H4jf@3f_a_G+S?TFly3u7>#@0HE57)-fj?zF;Vc{$qJu_Y-9)*}t>#5HH z`r5w*EC3H#a2@iO99`Higxr;vaAbxCANa;29B&b8z;Pa4jz=$i589b{!S44vT^gJ- zU?(RhKTTn8BJ0^hO8IS6RRJ)R-GZ`#69J{u+X#}2mr|Y2mgtmsGez#IkHgj*@TD^y z9i6%D?S9iR)geo3Muj0SC9xwbr?WVVCSKN}Uy8}r`~=H|PSsoU*Gf19 zf-xiO>({S&7!(Q3N&yF7EDe%mO|kD4K{mbbD4X%j;a9MZpZ2ju4AC7zh#7bkaZGUm zy;uFYs%?uZK&r0c8%KyH?kOQz9=lV$beE;I+7S4~U`aow_P%kRg8o*RBUONy@ZXt; f|6$)lq6lrf@~HI9P7?SpPk_5x`kJNcHevq{0;xh> literal 17638 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 { @@ -43,87 +50,113 @@ const filterBoxColor = (color: string) => { export const DecalPainter = (props) => { const { act, data } = useBackend(); - const custom_color_selected = !data.color_list.some( - (color) => color.color === data.current_color, - ); - const supports_custom_color = !!data.supports_custom_color; - - // Handle custom color icon correctly - const preview_color = custom_color_selected ? 'custom' : data.current_color; - const { - color_list, - current_custom_color, + categories, + active_category, current_color, + current_custom_color, current_decal, current_dir, - decal_list, - dir_list, } = data; + const active_category_info = categories.find( + (category) => category.category === active_category, + ); + const decal_list = active_category_info?.decal_list || []; + const color_list = active_category_info?.color_list || []; + const dir_list = active_category_info?.dir_list || []; + + const custom_color_selected = !color_list.some( + (color) => color.color === current_color, + ); + + // Handle custom color icon correctly + const preview_color = custom_color_selected ? 'custom' : current_color; + return ( - + -
- {color_list.map((color) => { - return ( - - ); - })} - {supports_custom_color && ( +
+ {categories.map((category) => ( - )} + ))}
+ {color_list.length > 1 && ( + +
+ {color_list.map((color) => { + if (color.color === 'custom') { + return ( + + ); + } + return ( + + ); + })} +
+ + )} -
+
{decal_list.map((decal) => { - const nondirectional = data.nondirectional_decals.includes( - decal.decal, - ); + const nondirectional = decal.directional === 0; return nondirectional ? ( // Tallll button for nondirectional ) : ( // 4 buttons for directional - + {dir_list.map((dir) => { const selected = - decal.decal === current_decal && + decal.icon_state === current_decal && dir.dir === current_dir; return ( { }; type IconButtonParams = { - decal: string; + icon_state: string; dir: number; color: string; label: string; @@ -157,7 +190,7 @@ const IconButton = (props: IconButtonParams) => { const generateIconKey = (decal: string, dir: number, color: string) => `${data.icon_prefix} ${decal}_${dir}_${color.replace('#', '')}`; - const icon = generateIconKey(props.decal, props.dir, props.color); + const icon = generateIconKey(props.icon_state, props.dir, props.color); return (