diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index b8a9f0d6c4..d8f2658006 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -1,4 +1,38 @@ // This is eventualy for wjohn to add more color standardization stuff like I keep asking him >:( #define COLOR_INPUT_DISABLED "#F0F0F0" -#define COLOR_INPUT_ENABLED "#D3B5B5" \ No newline at end of file +#define COLOR_INPUT_ENABLED "#D3B5B5" + +#define COLOR_WHITE "#FFFFFF" +#define COLOR_SILVER "#C0C0C0" +#define COLOR_GRAY "#808080" +#define COLOR_FLOORTILE_GRAY "#8D8C8C" +#define COLOR_ALMOST_BLACK "#333333" +#define COLOR_BLACK "#000000" +#define COLOR_RED "#FF0000" +#define COLOR_RED_LIGHT "#FF3333" +#define COLOR_MAROON "#800000" +#define COLOR_YELLOW "#FFFF00" +#define COLOR_OLIVE "#808000" +#define COLOR_LIME "#00FF00" +#define COLOR_GREEN "#008000" +#define COLOR_CYAN "#00FFFF" +#define COLOR_TEAL "#008080" +#define COLOR_BLUE "#0000FF" +#define COLOR_BLUE_LIGHT "#33CCFF" +#define COLOR_NAVY "#000080" +#define COLOR_PINK "#FF00FF" +#define COLOR_PURPLE "#800080" +#define COLOR_ORANGE "#FF9900" +#define COLOR_BEIGE "#CEB689" +#define COLOR_BLUE_GRAY "#6A97B0" +#define COLOR_BROWN "#B19664" +#define COLOR_DARK_BROWN "#917448" +#define COLOR_DARK_ORANGE "#B95A00" +#define COLOR_GREEN_GRAY "#8DAF6A" +#define COLOR_RED_GRAY "#AA5F61" +#define COLOR_PALE_BLUE_GRAY "#8BBBD5" +#define COLOR_PALE_GREEN_GRAY "#AED18B" +#define COLOR_PALE_RED_GRAY "#CC9090" +#define COLOR_PALE_PURPLE_GRAY "#BDA2BA" +#define COLOR_PURPLE_GRAY "#A2819E" diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index 06c3b9a689..fed77da115 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -39,164 +39,4 @@ var/turf/T = loc if(!istype(T)) //you know this will happen somehow CRASH("Turf decal initialized in an object/nullspace") - T.AddComponent(/datum/component/decal, icon, icon_state, dir) - -/obj/effect/turf_decal/stripes/line - icon_state = "warningline" - -/obj/effect/turf_decal/stripes/end - icon_state = "warn_end" - -/obj/effect/turf_decal/stripes/corner - icon_state = "warninglinecorner" - -/obj/effect/turf_decal/stripes/box - icon_state = "warn_box" - -/obj/effect/turf_decal/stripes/full - icon_state = "warn_full" - -/obj/effect/turf_decal/stripes/asteroid/line - icon_state = "ast_warn" - -/obj/effect/turf_decal/stripes/asteroid/end - icon_state = "ast_warn_end" - -/obj/effect/turf_decal/stripes/asteroid/corner - icon_state = "ast_warn_corner" - -/obj/effect/turf_decal/stripes/asteroid/box - icon_state = "ast_warn_box" - -/obj/effect/turf_decal/stripes/asteroid/full - icon_state = "ast_warn_full" - -/obj/effect/turf_decal/stripes/white/line - icon_state = "warningline_white" - -/obj/effect/turf_decal/stripes/white/end - icon_state = "warn_end_white" - -/obj/effect/turf_decal/stripes/white/corner - icon_state = "warninglinecorner_white" - -/obj/effect/turf_decal/stripes/white/box - icon_state = "warn_box_white" - -/obj/effect/turf_decal/stripes/white/full - icon_state = "warn_full_white" - -/obj/effect/turf_decal/stripes/red/line - icon_state = "warningline_red" - -/obj/effect/turf_decal/stripes/red/end - icon_state = "warn_end_red" - -/obj/effect/turf_decal/stripes/red/corner - icon_state = "warninglinecorner_red" - -/obj/effect/turf_decal/stripes/red/box - icon_state = "warn_box_red" - -/obj/effect/turf_decal/stripes/red/full - icon_state = "warn_full_red" - -/obj/effect/turf_decal/delivery - icon_state = "delivery" - -/obj/effect/turf_decal/delivery/white - icon_state = "delivery_white" - -/obj/effect/turf_decal/delivery/red - icon_state = "delivery_red" - -/obj/effect/turf_decal/bot - icon_state = "bot" - -/obj/effect/turf_decal/bot/right - icon_state = "bot_right" - -/obj/effect/turf_decal/bot/left - icon_state = "bot_left" - -/obj/effect/turf_decal/bot_white - icon_state = "bot_white" - -/obj/effect/turf_decal/bot_white/right - icon_state = "bot_right_white" - -/obj/effect/turf_decal/bot_white/left - icon_state = "bot_left_white" - -/obj/effect/turf_decal/bot_red - icon_state = "bot_red" - -/obj/effect/turf_decal/bot_red/right - icon_state = "bot_right_red" - -/obj/effect/turf_decal/bot_red/left - icon_state = "bot_left_red" - -/obj/effect/turf_decal/loading_area - icon_state = "loadingarea" - -/obj/effect/turf_decal/loading_area/white - icon_state = "loadingarea_white" - -/obj/effect/turf_decal/loading_area/red - icon_state = "loadingarea_red" - -/obj/effect/turf_decal/sand - icon_state = "sandyfloor" - -/obj/effect/turf_decal/sand/plating - icon_state = "sandyplating" - -/obj/effect/turf_decal/plaque - icon_state = "plaque" - -/obj/effect/turf_decal/caution - icon_state = "caution" - -/obj/effect/turf_decal/caution/white - icon_state = "caution_white" - -/obj/effect/turf_decal/caution/red - icon_state = "caution_red" - -/obj/effect/turf_decal/caution/stand_clear - icon_state = "stand_clear" - -/obj/effect/turf_decal/caution/stand_clear/white - icon_state = "stand_clear_white" - -/obj/effect/turf_decal/caution/stand_clear/red - icon_state = "stand_clear_red" - -/obj/effect/turf_decal/arrows - icon_state = "arrows" - -/obj/effect/turf_decal/arrows/white - icon_state = "arrows_white" - -/obj/effect/turf_decal/arrows/red - icon_state = "arrows_red" - -/obj/effect/turf_decal/box - icon_state = "box" - -/obj/effect/turf_decal/box/corners - icon_state = "box_corners" - -/obj/effect/turf_decal/box/white - icon_state = "box_white" - -/obj/effect/turf_decal/box/white/corners - icon_state = "box_corners_white" - -/obj/effect/turf_decal/box/red - icon_state = "box_red" - -/obj/effect/turf_decal/box/red/corners - icon_state = "box_corners_red" - + T.AddComponent(/datum/component/decal, icon, icon_state, dir, CLEAN_GOD, color) diff --git a/code/game/objects/effects/decals/turfdecal/dirt.dm b/code/game/objects/effects/decals/turfdecal/dirt.dm new file mode 100644 index 0000000000..156c04d1ba --- /dev/null +++ b/code/game/objects/effects/decals/turfdecal/dirt.dm @@ -0,0 +1,5 @@ +/obj/effect/turf_decal/sand + icon_state = "sandyfloor" + +/obj/effect/turf_decal/sand/plating + icon_state = "sandyplating" diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm new file mode 100644 index 0000000000..196d22b580 --- /dev/null +++ b/code/game/objects/effects/decals/turfdecal/markings.dm @@ -0,0 +1,152 @@ +/obj/effect/turf_decal/stripes/line + icon_state = "warningline" + +/obj/effect/turf_decal/stripes/end + icon_state = "warn_end" + +/obj/effect/turf_decal/stripes/corner + icon_state = "warninglinecorner" + +/obj/effect/turf_decal/stripes/box + icon_state = "warn_box" + +/obj/effect/turf_decal/stripes/full + icon_state = "warn_full" + +/obj/effect/turf_decal/stripes/asteroid/line + icon_state = "ast_warn" + +/obj/effect/turf_decal/stripes/asteroid/end + icon_state = "ast_warn_end" + +/obj/effect/turf_decal/stripes/asteroid/corner + icon_state = "ast_warn_corner" + +/obj/effect/turf_decal/stripes/asteroid/box + icon_state = "ast_warn_box" + +/obj/effect/turf_decal/stripes/asteroid/full + icon_state = "ast_warn_full" + +/obj/effect/turf_decal/stripes/white/line + icon_state = "warningline_white" + +/obj/effect/turf_decal/stripes/white/end + icon_state = "warn_end_white" + +/obj/effect/turf_decal/stripes/white/corner + icon_state = "warninglinecorner_white" + +/obj/effect/turf_decal/stripes/white/box + icon_state = "warn_box_white" + +/obj/effect/turf_decal/stripes/white/full + icon_state = "warn_full_white" + +/obj/effect/turf_decal/stripes/red/line + icon_state = "warningline_red" + +/obj/effect/turf_decal/stripes/red/end + icon_state = "warn_end_red" + +/obj/effect/turf_decal/stripes/red/corner + icon_state = "warninglinecorner_red" + +/obj/effect/turf_decal/stripes/red/box + icon_state = "warn_box_red" + +/obj/effect/turf_decal/stripes/red/full + icon_state = "warn_full_red" + +/obj/effect/turf_decal/delivery + icon_state = "delivery" + +/obj/effect/turf_decal/delivery/white + icon_state = "delivery_white" + +/obj/effect/turf_decal/delivery/red + icon_state = "delivery_red" + +/obj/effect/turf_decal/bot + icon_state = "bot" + +/obj/effect/turf_decal/bot/right + icon_state = "bot_right" + +/obj/effect/turf_decal/bot/left + icon_state = "bot_left" + +/obj/effect/turf_decal/bot_white + icon_state = "bot_white" + +/obj/effect/turf_decal/bot_white/right + icon_state = "bot_right_white" + +/obj/effect/turf_decal/bot_white/left + icon_state = "bot_left_white" + +/obj/effect/turf_decal/bot_red + icon_state = "bot_red" + +/obj/effect/turf_decal/bot_red/right + icon_state = "bot_right_red" + +/obj/effect/turf_decal/bot_red/left + icon_state = "bot_left_red" + +/obj/effect/turf_decal/loading_area + icon_state = "loadingarea" + +/obj/effect/turf_decal/loading_area/white + icon_state = "loadingarea_white" + +/obj/effect/turf_decal/loading_area/red + icon_state = "loadingarea_red" + +/obj/effect/turf_decal/caution + icon_state = "caution" + +/obj/effect/turf_decal/caution/white + icon_state = "caution_white" + +/obj/effect/turf_decal/caution/red + icon_state = "caution_red" + +/obj/effect/turf_decal/caution/stand_clear + icon_state = "stand_clear" + +/obj/effect/turf_decal/caution/stand_clear/white + icon_state = "stand_clear_white" + +/obj/effect/turf_decal/caution/stand_clear/red + icon_state = "stand_clear_red" + +/obj/effect/turf_decal/arrows + icon_state = "arrows" + +/obj/effect/turf_decal/arrows/white + icon_state = "arrows_white" + +/obj/effect/turf_decal/arrows/red + icon_state = "arrows_red" + +/obj/effect/turf_decal/box + icon_state = "box" + +/obj/effect/turf_decal/box/corners + icon_state = "box_corners" + +/obj/effect/turf_decal/box/white + icon_state = "box_white" + +/obj/effect/turf_decal/box/white/corners + icon_state = "box_corners_white" + +/obj/effect/turf_decal/box/red + icon_state = "box_red" + +/obj/effect/turf_decal/box/red/corners + icon_state = "box_corners_red" + +/obj/effect/turf_decal/plaque + icon_state = "plaque" diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm new file mode 100644 index 0000000000..49af7a7ed7 --- /dev/null +++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -0,0 +1,198 @@ +/obj/effect/turf_decal/tile + name = "tile decal" + icon_state = "corner_white_full" + +/obj/effect/turf_decal/tile/black + name = "black tile decal" + color = COLOR_ALMOST_BLACK + +/obj/effect/turf_decal/tile/black/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/black/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/black/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/blue + name = "blue tile decal" + color = COLOR_BLUE_GRAY + +/obj/effect/turf_decal/tile/blue/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/blue/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/blue/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/paleblue + name = "pale blue tile decal" + color = COLOR_PALE_BLUE_GRAY + +/obj/effect/turf_decal/tile/paleblue/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/paleblue/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/paleblue/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/green + name = "green tile decal" + color = COLOR_GREEN_GRAY + +/obj/effect/turf_decal/tile/green/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/green/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/green/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/lime + name = "lime tile decal" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/turf_decal/tile/lime/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/lime/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/lime/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/yellow + name = "yellow tile decal" + color = COLOR_BROWN + +/obj/effect/turf_decal/tile/yellow/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/yellow/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/yellow/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/beige + name = "beige tile decal" + color = COLOR_BEIGE + +/obj/effect/turf_decal/tile/beige/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/beige/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/beige/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/red + name = "red tile decal" + color = COLOR_RED_GRAY + +/obj/effect/turf_decal/tile/red/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/red/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/red/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/pink + name = "pink tile decal" + color = COLOR_PALE_RED_GRAY + +/obj/effect/turf_decal/tile/pink/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/pink/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/pink/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/purple + name = "purple tile decal" + color = COLOR_PURPLE_GRAY + +/obj/effect/turf_decal/tile/purple/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/purple/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/purple/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/mauve + name = "mauve tile decal" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/turf_decal/tile/mauve/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/mauve/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/mauve/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/orange + name = "orange tile decal" + color = COLOR_DARK_ORANGE + +/obj/effect/turf_decal/tile/orange/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/orange/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/orange/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/brown + name = "brown tile decal" + color = COLOR_DARK_BROWN + +/obj/effect/turf_decal/tile/brown/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/brown/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/brown/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/white + name = "white tile decal" + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/white/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/white/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/white/corner + icon_state = "corner_white" + +/obj/effect/turf_decal/tile/gray + name = "gray tile decal" + color = COLOR_FLOORTILE_GRAY + +/obj/effect/turf_decal/tile/gray/diagonal + icon_state = "corner_white_diagonal" + +/obj/effect/turf_decal/tile/gray/side + icon_state = "corner_white_side" + +/obj/effect/turf_decal/tile/gray/corner + icon_state = "corner_white" diff --git a/icons/turf/decals.dmi b/icons/turf/decals.dmi index 8de88bd2ca..c5564051e4 100644 Binary files a/icons/turf/decals.dmi and b/icons/turf/decals.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 61e38c3718..30a3d3639b 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -845,6 +845,9 @@ #include "code\game\objects\effects\decals\cleanable\humans.dm" #include "code\game\objects\effects\decals\cleanable\misc.dm" #include "code\game\objects\effects\decals\cleanable\robots.dm" +#include "code\game\objects\effects\decals\turfdecal\dirt.dm" +#include "code\game\objects\effects\decals\turfdecal\markings.dm" +#include "code\game\objects\effects\decals\turfdecal\tilecoloring.dm" #include "code\game\objects\effects\effect_system\effect_system.dm" #include "code\game\objects\effects\effect_system\effects_explosion.dm" #include "code\game\objects\effects\effect_system\effects_foam.dm"