Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NK-misc3 #4577

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 34 additions & 6 deletions code/game/objects/items/airlock_painter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -190,21 +190,29 @@
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("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("Bot", "bot"),
list("Bot Right", "bot_right"),
list("Bot Left", "bot_left"),
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(
"warn_box",
"warn_full",
"bot",
"bot_right",
"bot_left",
"box",
"delivery",
"warn_full",
)

/obj/item/airlock_painter/decal/Initialize(mapload)
Expand Down Expand Up @@ -397,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"),
Expand All @@ -409,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.
Expand Down
1 change: 1 addition & 0 deletions config/dev_overrides_readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/DecalPainter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const DecalPainter = (props) => {
const preview_color = custom_color_selected ? 'custom' : data.current_color;

return (
<Window width={550} height={400}>
<Window width={750} height={400}>
<Window.Content>
<Section title="Decal Color">
{data.color_list.map((color) => {
Expand Down
Loading