diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index b0e0e483e6..0c735844f8 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -179,3 +179,19 @@ var/list/tmp_gaslist = GLOB.gaslist_cache[gas_id]; out_list[gas_id] = tmp_gaslist.Copy(); #define ASSERT_GAS(gas_id, gas_mixture) if (!gas_mixture.gases[gas_id]) { ADD_GAS(gas_id, gas_mixture.gases) }; + +GLOBAL_LIST_INIT(pipe_paint_colors, list( + "Amethyst" = rgb(130,43,255), //supplymain + "Blue" = rgb(0,0,255), + "Brown" = rgb(178,100,56), + "Cyan" = rgb(0,255,249), + "Dark" = rgb(69,69,69), + "Green" = rgb(30,255,0), + "Grey" = rgb(255,255,255), + "Orange" = rgb(255,129,25), + "Purple" = rgb(128,0,182), + "Red" = rgb(255,0,0), + "Violet" = rgb(64,0,128), + "Yellow" = rgb(255,198,0) + )) + diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index e8406d87ff..eac887acb5 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -162,15 +162,6 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( var/mode = ATMOS_MODE var/p_dir = NORTH var/p_flipped = FALSE - var/list/paint_colors = list( - "Grey" = rgb(255,255,255), - "Red" = rgb(255,0,0), - "Blue" = rgb(0,0,255), - "Cyan" = rgb(0,256,249), - "Green" = rgb(30,255,0), - "Yellow" = rgb(255,198,0), - "Purple" = rgb(130,43,255) - ) var/paint_color="Grey" var/screen = CATEGORY_ATMOS //Starts on the atmos tab. var/piping_layer = PIPING_LAYER_DEFAULT @@ -237,8 +228,8 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( data["categories"] += list(list("cat_name" = c, "recipes" = r)) data["paint_colors"] = list() - for(var/c in paint_colors) - data["paint_colors"] += list(list("color_name" = c, "color_hex" = paint_colors[c], "selected" = (c == paint_color))) + for(var/c in GLOB.pipe_paint_colors) + data["paint_colors"] += list(list("color_name" = c, "color_hex" = GLOB.pipe_paint_colors[c], "selected" = (c == paint_color))) return data @@ -308,7 +299,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( return ..() var/obj/machinery/atmospherics/pipe/P = A playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) - P.paint(paint_colors[paint_color]) + P.paint(GLOB.pipe_paint_colors[paint_color]) user.visible_message("[user] paints \the [P] [paint_color].","You paint \the [P] [paint_color].") return @@ -344,7 +335,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( P.setPipingLayer(temp_piping_layer) else P.setPipingLayer(piping_layer) - P.add_atom_colour(paint_colors[paint_color], FIXED_COLOUR_PRIORITY) + P.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY) if(METER_MODE) //Making pipe meters if(!can_make_pipe) diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 19a81e8640..d76b7174da 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -1,5 +1,3 @@ -GLOBAL_LIST_INIT(pipe_paint_colors, list("grey"=rgb(255,255,255), "red"=rgb(255,0,0), "blue"=rgb(0,0,255), "cyan"=rgb(0,256,249), "green"=rgb(30,255,0), "yellow"=rgb(255,198,0), "purple"=rgb(130,43,255))) - /obj/item/device/pipe_painter name = "pipe painter" icon = 'icons/obj/bureaucracy.dmi' diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm index ff4a4ea1ff..e727c5c331 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold.dm @@ -75,8 +75,8 @@ /obj/machinery/atmospherics/pipe/manifold/supplymain name="main air supply pipe" - pipe_color=rgb(130,43,272) - color=rgb(130,43,272) + pipe_color=rgb(130,43,255) + color=rgb(130,43,255) /obj/machinery/atmospherics/pipe/manifold/supplymain/visible level = PIPE_VISIBLE_LEVEL @@ -97,8 +97,8 @@ level = PIPE_HIDDEN_LEVEL /obj/machinery/atmospherics/pipe/manifold/cyan - pipe_color=rgb(0,256,249) - color=rgb(0,256,249) + pipe_color=rgb(0,255,249) + color=rgb(0,255,249) /obj/machinery/atmospherics/pipe/manifold/cyan/visible level = PIPE_VISIBLE_LEVEL @@ -108,8 +108,8 @@ level = PIPE_HIDDEN_LEVEL /obj/machinery/atmospherics/pipe/manifold/green - pipe_color=rgb(30,256,0) - color=rgb(30,256,0) + pipe_color=rgb(30,255,0) + color=rgb(30,255,0) /obj/machinery/atmospherics/pipe/manifold/green/visible level = PIPE_VISIBLE_LEVEL diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm index f9692da4ab..827e577330 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm @@ -67,8 +67,8 @@ /obj/machinery/atmospherics/pipe/manifold4w/supplymain name="main air supply pipe" - pipe_color=rgb(130,43,272) - color=rgb(130,43,272) + pipe_color=rgb(130,43,255) + color=rgb(130,43,255) /obj/machinery/atmospherics/pipe/manifold4w/supplymain/visible level = PIPE_VISIBLE_LEVEL @@ -89,8 +89,8 @@ level = PIPE_HIDDEN_LEVEL /obj/machinery/atmospherics/pipe/manifold4w/cyan - pipe_color=rgb(0,256,249) - color=rgb(0,256,249) + pipe_color=rgb(0,255,249) + color=rgb(0,255,249) /obj/machinery/atmospherics/pipe/manifold4w/cyan/visible level = PIPE_VISIBLE_LEVEL @@ -100,8 +100,8 @@ level = PIPE_HIDDEN_LEVEL /obj/machinery/atmospherics/pipe/manifold4w/green - pipe_color=rgb(30,256,0) - color=rgb(30,256,0) + pipe_color=rgb(30,255,0) + color=rgb(30,255,0) /obj/machinery/atmospherics/pipe/manifold4w/green/visible level = PIPE_VISIBLE_LEVEL diff --git a/code/modules/atmospherics/machinery/pipes/simple.dm b/code/modules/atmospherics/machinery/pipes/simple.dm index 0d6537b3d1..1d2f88b8da 100644 --- a/code/modules/atmospherics/machinery/pipes/simple.dm +++ b/code/modules/atmospherics/machinery/pipes/simple.dm @@ -65,8 +65,8 @@ The regular pipe you see everywhere, including bent ones. /obj/machinery/atmospherics/pipe/simple/supplymain name="main air supply pipe" - pipe_color=rgb(130,43,272) - color=rgb(130,43,272) + pipe_color=rgb(130,43,255) + color=rgb(130,43,255) /obj/machinery/atmospherics/pipe/simple/supplymain/visible level = PIPE_VISIBLE_LEVEL @@ -87,8 +87,8 @@ The regular pipe you see everywhere, including bent ones. level = PIPE_HIDDEN_LEVEL /obj/machinery/atmospherics/pipe/simple/cyan - pipe_color=rgb(0,256,249) - color=rgb(0,256,249) + pipe_color=rgb(0,255,249) + color=rgb(0,255,249) /obj/machinery/atmospherics/pipe/simple/cyan/visible level = PIPE_VISIBLE_LEVEL @@ -98,8 +98,8 @@ The regular pipe you see everywhere, including bent ones. level = PIPE_HIDDEN_LEVEL /obj/machinery/atmospherics/pipe/simple/green - pipe_color=rgb(30,256,0) - color=rgb(30,256,0) + pipe_color=rgb(30,255,0) + color=rgb(30,255,0) /obj/machinery/atmospherics/pipe/simple/green/visible level = PIPE_VISIBLE_LEVEL