From f1206bf13519c1c76725b8e25f98216fb7349a81 Mon Sep 17 00:00:00 2001 From: SirNightKnight <=> Date: Sun, 15 Dec 2024 09:24:13 -0500 Subject: [PATCH 1/3] testing new decals --- code/game/objects/items/airlock_painter.dm | 8 ++++++++ tgui/packages/tgui/interfaces/DecalPainter.tsx | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index b7150915540a..7d38f06510dd 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -190,11 +190,16 @@ var/decal_list = list( list("Warning Line", "warningline"), list("Warning Line Corner", "warninglinecorner"), + list("Warning Line End", "warn_end"), + list("Warning Line Box", "warn_box"), list("Caution Label", "caution"), list("Directional Arrows", "arrows"), list("Stand Clear Label", "stand_clear"), + list("Loading Area", "loadingarea"), list("Bot", "bot"), list("Box", "box"), + list("Bot Left", "bot_left"), + list("Bot Left", "bot_right"), list("Box Corner", "box_corners"), list("Delivery Marker", "delivery"), list("Warning Box", "warn_full"), @@ -205,6 +210,9 @@ "box", "delivery", "warn_full", + "warn_box", + "bot_left", + "bot_right", ) /obj/item/airlock_painter/decal/Initialize(mapload) diff --git a/tgui/packages/tgui/interfaces/DecalPainter.tsx b/tgui/packages/tgui/interfaces/DecalPainter.tsx index dd835773960c..4d4431109e25 100644 --- a/tgui/packages/tgui/interfaces/DecalPainter.tsx +++ b/tgui/packages/tgui/interfaces/DecalPainter.tsx @@ -51,7 +51,7 @@ export const DecalPainter = (props) => { const preview_color = custom_color_selected ? 'custom' : data.current_color; return ( - +
{data.color_list.map((color) => { From 32391211b871647a953034104ad577a9ae6ee3af Mon Sep 17 00:00:00 2001 From: SirNightKnight <=> Date: Sun, 15 Dec 2024 13:54:22 -0500 Subject: [PATCH 2/3] decal painter fuckery --- code/game/objects/items/airlock_painter.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index 7d38f06510dd..08439bc31da3 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -188,31 +188,31 @@ ) /// 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", "warn_end"), //test list("Warning Line Corner", "warninglinecorner"), list("Warning Line End", "warn_end"), - list("Warning Line Box", "warn_box"), list("Caution Label", "caution"), list("Directional Arrows", "arrows"), list("Stand Clear Label", "stand_clear"), list("Loading Area", "loadingarea"), + list("Box Corner", "box_corners"), + list("Warning Line Box", "warn_box"), list("Bot", "bot"), list("Box", "box"), + list("Bot Right", "bot_right"), list("Bot Left", "bot_left"), - list("Bot Left", "bot_right"), - 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( + "warn_box", "bot", "box", + "bot_right", + "bot_left", "delivery", "warn_full", - "warn_box", - "bot_left", - "bot_right", ) /obj/item/airlock_painter/decal/Initialize(mapload) From d42228244c6b83195d0166dad407c79dc7fdcf34 Mon Sep 17 00:00:00 2001 From: SirNightKnight <=> Date: Fri, 20 Dec 2024 07:57:04 -0500 Subject: [PATCH 3/3] decal painter updates --- code/game/objects/items/airlock_painter.dm | 38 +++++++++++++++++----- config/dev_overrides_readme.txt | 1 + 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index 08439bc31da3..ac78fae220fe 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -188,31 +188,31 @@ ) /// List of decal options as list(user-friendly label, icon state base value to return) var/decal_list = list( - list("Warning Line", "warn_end"), //test + list("Warning Line", "warningline"), list("Warning Line Corner", "warninglinecorner"), list("Warning Line End", "warn_end"), + list("Warning Line Box", "warn_box"), + list("Warning Box", "warn_full"), list("Caution Label", "caution"), list("Directional Arrows", "arrows"), list("Stand Clear Label", "stand_clear"), list("Loading Area", "loadingarea"), list("Box Corner", "box_corners"), - list("Warning Line Box", "warn_box"), list("Bot", "bot"), - list("Box", "box"), list("Bot Right", "bot_right"), list("Bot Left", "bot_left"), + list("Box", "box"), list("Delivery Marker", "delivery"), - list("Warning Box", "warn_full"), ) // These decals only have a south sprite. var/nondirectional_decals = list( "warn_box", + "warn_full", "bot", - "box", "bot_right", "bot_left", + "box", "delivery", - "warn_full", ) /obj/item/airlock_painter/decal/Initialize(mapload) @@ -405,6 +405,7 @@ list("Dark", "#0e0f0f"), list("Bar Burgundy", "#79150082"), list("Sec Red", "#DE3A3A"), + list("Command Blue", "#486091"), list("Cargo Brown", "#A46106"), list("Engi Yellow", "#EFB341"), list("Service Green", "#9FED58"), @@ -417,15 +418,34 @@ list("Opposing Corners", "tile_opposing_corners"), list("3 Corners", "tile_anticorner_contrasted"), list("4 Corners", "tile_fourcorners"), - list("Trimline Corner", "trimline_corner_fill"), + list("Trimeline", "trimline"), + list("Trimeline Middle", "trimline_mid"), + list("Trimeline Corner", "trimline_corner"), + list("Trimeline End", "trimline_end"), + list("Trimeline Box", "trimline_box"), + list("Trimline Middle Fill", "trimline_mid_fill"), + list("Trimline Corner Fill", "trimline_corner_fill"), list("Trimline Fill", "trimline_fill"), list("Trimline Fill L", "trimline_fill__8"), // This is a hack that lives in the spritesheet builder and paint_floor - list("Trimline End", "trimline_end_fill"), - list("Trimline Box", "trimline_box_fill"), + list("Trimline End Fill", "trimline_end_fill"), + list("Trimline Box Fill", "trimline_box_fill"), + list("Trimeline Arrow 1", "trimline_arrow_cw"), + list("Trimeline Arrow 2", "trimline_arrow_ccw"), + list("Trimeline Arrow 1 Fill", "trimline_arrow_cw_fill"), + list("Trimeline Arrow 2 Fill", "trimline_arrow_ccw_fill"), + list("Trimeline Warn", "trimline_warn"), + list("Trimline Warn Fill", "trimline_warn_fill"), + list("Trimline Corner Warn Fill", "trimline_corner_warn_fill"), + list("Trimeline Shrink 1", "trimline_shrink_cw"), + list("Trimline Shrink 2", "trimline_shrink_ccw"), + list("Trimline Tram", "trimline_warn"), + list("Tile Tram", "tile_tram"), ) nondirectional_decals = list( "tile_fourcorners", "trimline_box_fill", + "trimline_box", + "tile_tram", ) /// Regex to split alpha out. diff --git a/config/dev_overrides_readme.txt b/config/dev_overrides_readme.txt index 7a4a82ecf346..524a1bab4213 100644 --- a/config/dev_overrides_readme.txt +++ b/config/dev_overrides_readme.txt @@ -3,3 +3,4 @@ # You do not need this if you are a server operator! You should instead use the $include system. #STATIONNAME My Dev World +CACHE_ASSETS 0