diff --git a/aurorastation.dme b/aurorastation.dme index e200507db2b..157cb78a07d 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1366,10 +1366,15 @@ #include "code\game\turfs\turf_changing.dm" #include "code\game\turfs\turf_flick_animations.dm" #include "code\game\turfs\unsimulated.dm" -#include "code\game\turfs\flooring\flooring.dm" -#include "code\game\turfs\flooring\flooring_decals.dm" +#include "code\game\turfs\flooring\flooring_.dm" +#include "code\game\turfs\flooring\flooring_decals_.dm" #include "code\game\turfs\flooring\flooring_decals_big.dm" -#include "code\game\turfs\flooring\flooring_premade.dm" +#include "code\game\turfs\flooring\flooring_decals_industrial.dm" +#include "code\game\turfs\flooring\flooring_premade_.dm" +#include "code\game\turfs\flooring\flooring_premade_fancy.dm" +#include "code\game\turfs\flooring\flooring_premade_material.dm" +#include "code\game\turfs\flooring\flooring_premade_other.dm" +#include "code\game\turfs\flooring\flooring_premade_reinforced.dm" #include "code\game\turfs\flooring\urban.dm" #include "code\game\turfs\initialization\dirty.dm" #include "code\game\turfs\initialization\init.dm" diff --git a/code/__DEFINES/color.dm b/code/__DEFINES/color.dm index 7328e6d8d44..e25671b7088 100644 --- a/code/__DEFINES/color.dm +++ b/code/__DEFINES/color.dm @@ -9,7 +9,11 @@ #define COLOR_OLIVE "#808000" #define COLOR_BROWN_ORANGE "#824b28" #define COLOR_DARK_ORANGE "#b95a00" +#define COLOR_GRAY70 "#b3b3b3" +#define COLOR_GRAY60 "#999999" +#define COLOR_GRAY50 "#7f7f7f" #define COLOR_GRAY40 "#666666" +#define COLOR_GRAY30 "#4d4d4d" #define COLOR_GRAY20 "#333333" #define COLOR_GRAY15 "#151515" #define COLOR_SEDONA "#cc6600" @@ -28,6 +32,7 @@ #define COLOR_PALE_YELLOW "#c1bb7a" #define COLOR_WARM_YELLOW "#b3863c" #define COLOR_YELLOW_ENGI "#efbf2f" +#define COLOR_YELLOW_KHAKI "#cfcf55" #define COLOR_GRAY "#808080" #define COLOR_RED_GRAY "#aa5f61" #define COLOR_BROWN "#b19664" @@ -54,8 +59,10 @@ #define COLOR_GOLD "#ffcc33" #define COLOR_CLOSET_GOLD "#6d6133" #define COLOR_DARK_RED "#9d2300" +#define COLOR_CRIMSON "#990C0C" #define COLOR_BOTTLE_GREEN "#1f6b4f" #define COLOR_PALE_BTL_GREEN "#57967f" +#define COLOR_SLATE "#708090" #define COLOR_GUNMETAL "#545c68" #define COLOR_WALL_GUNMETAL "#353a42" #define COLOR_STEEL "#a8b0b2" @@ -110,7 +117,6 @@ // Wood Colours - #define WOOD_COLOR_GENERIC "#8f5847" #define WOOD_COLOR_GENCONTRAST "#683b2e" #define WOOD_COLOR_BIRCH "#d5a66e" diff --git a/code/game/objects/items/devices/paint_sprayer.dm b/code/game/objects/items/devices/paint_sprayer.dm index 6994521e504..b7b24ebee8d 100644 --- a/code/game/objects/items/devices/paint_sprayer.dm +++ b/code/game/objects/items/devices/paint_sprayer.dm @@ -16,14 +16,22 @@ var/paint_colour = COLOR_WHITE var/list/decals = list( - "quarter-turf" = list("path" = /obj/effect/floor_decal/corner, "precise" = 1, "coloured" = 1), - "wide quarter-turf" = list("path" = /obj/effect/floor_decal/corner_wide, "precise" = 1, "coloured" = 1), - "full quarter-turf" = list("path" = /obj/effect/floor_decal/corner_full, "precise" = 1, "coloured" = 1), - "hazard stripes" = list("path" = /obj/effect/floor_decal/industrial/warning), - "corner, hazard" = list("path" = /obj/effect/floor_decal/industrial/warning/corner), - "hatched marking" = list("path" = /obj/effect/floor_decal/industrial/hatch, "coloured" = 1), - "dotted outline" = list("path" = /obj/effect/floor_decal/industrial/outline, "coloured" = 1), + // quarter + "quarter-turf" = list("path" = /obj/effect/floor_decal/corner, "precise" = 1, "coloured" = 1), + "wide quarter-turf" = list("path" = /obj/effect/floor_decal/corner_wide, "precise" = 1, "coloured" = 1), + "full quarter-turf" = list("path" = /obj/effect/floor_decal/corner_full, "precise" = 1, "coloured" = 1), + // hazard + "hazard stripes" = list("path" = /obj/effect/floor_decal/industrial/warning), + "corner, hazard" = list("path" = /obj/effect/floor_decal/industrial/warning/corner), + // hatch + "hatched marking" = list("path" = /obj/effect/floor_decal/industrial/hatch, "coloured" = 1), + "hatched marking small" = list("path" = /obj/effect/floor_decal/industrial/hatch_small, "coloured" = 1), + "hatched marking tiny" = list("path" = /obj/effect/floor_decal/industrial/hatch_tiny, "coloured" = 1), + // outline + "dotted outline" = list("path" = /obj/effect/floor_decal/industrial/outline, "coloured" = 1), + "arrow" = list("path" = /obj/effect/floor_decal/industrial/arrow, "precise" = 1, "coloured" = 1), "loading sign" = list("path" = /obj/effect/floor_decal/industrial/loading), + // signs "1" = list("path" = /obj/effect/floor_decal/sign), "2" = list("path" = /obj/effect/floor_decal/sign/two), "A" = list("path" = /obj/effect/floor_decal/sign/a), @@ -35,6 +43,7 @@ "CMO" = list("path" = /obj/effect/floor_decal/sign/cmo), "V" = list("path" = /obj/effect/floor_decal/sign/v), "Psy" = list("path" = /obj/effect/floor_decal/sign/p), + // remove all "remove all decals" = list("path" = /obj/effect/floor_decal/reset) ) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 2dc389aa5a4..a90581363cc 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -329,6 +329,12 @@ icon_state = "tile_lightmarble" matter = list(MATERIAL_MARBLE = TILE_MATERIAL_AMOUNT) +/obj/item/stack/tile/marble/dark + name = "dark marble floor tile" + singular_name = "dark marble floor tile" + icon_state = "tile_darkmarble" + matter = list(MATERIAL_MARBLE = TILE_MATERIAL_AMOUNT) + /* * Cyborg modules */ diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index ca4f4a0dccc..686f691c569 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -169,7 +169,7 @@ icon_state = "grate_light" base_icon_state = "grate_light" return_amount = 1 - color = COLOR_GUNMETAL + color = COLOR_GRAY50 /obj/structure/lattice/catwalk/indoor/grate/light/old/Initialize() . = ..() @@ -186,6 +186,12 @@ /obj/structure/lattice/catwalk/indoor/grate/dark color = COLOR_DARK_GUNMETAL +/obj/structure/lattice/catwalk/indoor/grate/gunmetal + color = COLOR_DARK_GUNMETAL + +/obj/structure/lattice/catwalk/indoor/grate/slate + color = COLOR_SLATE + /obj/structure/lattice/catwalk/indoor/urban name = "grate" desc = "A metal grate." diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring_.dm similarity index 89% rename from code/game/turfs/flooring/flooring.dm rename to code/game/turfs/flooring/flooring_.dm index be4f90c064e..7dc67827d55 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring_.dm @@ -229,6 +229,71 @@ icon_base = "monotile_dark" build_type = /obj/item/stack/tile/floor_dark/full +/singleton/flooring/tiling/light + icon_base = "tiled" + color = COLOR_GRAY70 + build_type = null + +/singleton/flooring/tiling/light/full + icon_base = "monotile" + +/singleton/flooring/tiling/gunmetal + icon_base = "tiled" + color = COLOR_GUNMETAL + build_type = null + +/singleton/flooring/tiling/gunmetal/full + icon_base = "monotile" + +/singleton/flooring/tiling/slate + icon_base = "tiled" + color = COLOR_SLATE + build_type = null + +/singleton/flooring/tiling/slate/full + icon_base = "monotile" + +/singleton/flooring/tiling/cargo + icon_base = "cargo" + color = COLOR_ALUMINIUM + build_type = null + +/singleton/flooring/tiling/cargo/full + icon_base = "cargo_monotile" + +/singleton/flooring/tiling/cargo/brass + icon_base = "cargo" + color = COLOR_BRASS + build_type = null + +/singleton/flooring/tiling/cargo/brass/full + icon_base = "cargo_monotile" + +/singleton/flooring/tiling/bitile + icon_base = "bitile" + color = COLOR_TILED + build_type = null + +/singleton/flooring/tiling/gridded + icon_base = "grid" + color = COLOR_GRAY40 + build_type = null + +/singleton/flooring/tiling/ridged + icon_base = "ridged" + color = COLOR_GUNMETAL + build_type = null + +/singleton/flooring/tiling/techmaint + icon_base = "techmaint" + color = COLOR_GRAY30 + build_type = null + +/singleton/flooring/tiling/techfloor + icon_base = "techfloor" + color = COLOR_GRAY40 + build_type = null + /singleton/flooring/tiling/freezer name = "floor" desc = "Don't slip." @@ -294,12 +359,16 @@ can_paint = TRUE footstep_sound = /singleton/sound_category/plating_footstep +/singleton/flooring/reinforced/large + icon = 'icons/turf/flooring/tiles.dmi' + icon_base = "reinforced_large" + build_type = null + /singleton/flooring/reinforced/circuit name = "processing strata" desc = "A durable surface covered in various circuity and wiring." icon = 'icons/turf/flooring/circuit.dmi' icon_base = "bcircuit" - build_type = null build_cost = 1 flags = TURF_ACID_IMMUNE | TURF_CAN_BREAK | TURF_REMOVE_CROWBAR can_paint = TRUE @@ -403,12 +472,16 @@ /singleton/flooring/marble name = "marble floor" desc = "A robust floor made from marble." - color = COLOR_GRAY + color = COLOR_GRAY80 icon = 'icons/turf/flooring/tiles.dmi' icon_base = "textured" flags = TURF_REMOVE_CROWBAR build_type = /obj/item/stack/tile/marble +/singleton/flooring/marble/dark + color = COLOR_DARK_GRAY + build_type = /obj/item/stack/tile/marble/dark + /singleton/flooring/concrete name = "concrete" desc = "Stone-like artificial material. Brutalist and utilitarian." diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals_.dm similarity index 89% rename from code/game/turfs/flooring/flooring_decals.dm rename to code/game/turfs/flooring/flooring_decals_.dm index 870a3337839..99df24c7c35 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals_.dm @@ -763,118 +763,6 @@ /obj/effect/floor_decal/spline/fancy/wood/full icon_state = "spline_fancy_full" -// Hazard Stripes. Sh-sha! - -/obj/effect/floor_decal/industrial/warning - name = "hazard stripes" - icon_state = "warning" - -/obj/effect/floor_decal/industrial/warning/corner - icon_state = "warningcorner" - -/obj/effect/floor_decal/industrial/warning/full - icon_state = "warningfull" - -/obj/effect/floor_decal/industrial/warning/cee - icon_state = "warningcee" - -/obj/effect/floor_decal/industrial/warning/dust - name = "hazard stripes" - icon_state = "warning_dust" - -/obj/effect/floor_decal/industrial/warning/dust/corner - name = "hazard stripes" - icon_state = "warningcorner_dust" - -/obj/effect/floor_decal/industrial/hatch - name = "hatched marking" - icon_state = "delivery" - -/obj/effect/floor_decal/industrial/hatch/yellow - color = "#CFCF55" - -/obj/effect/floor_decal/industrial/hatch/grey - color = "#808080" - -/obj/effect/floor_decal/industrial/hatch/red - color = "#990C0C" - -// -// Outline -// -/obj/effect/floor_decal/industrial/outline - name = "white outline" - icon_state = "outline" - -// Outline - Colours -/obj/effect/floor_decal/industrial/outline/blue - name = "cyan outline" - color = "#b6efe1" - -/obj/effect/floor_decal/industrial/outline/yellow - name = "yellow outline" - color = "#CFCF55" - -/obj/effect/floor_decal/industrial/outline/grey - name = "grey outline" - color = COLOR_GRAY - -/obj/effect/floor_decal/industrial/outline/red - name = "red outline" - color = "#990C0C" - -// Outline - Departmental -/obj/effect/floor_decal/industrial/outline/custodial - name = "custodial purple outline" - color = COLOR_PURPLE_GRAY - -/obj/effect/floor_decal/industrial/outline/medical - name = "medical lime outline" - color = COLOR_PALE_GREEN_GRAY - -/obj/effect/floor_decal/industrial/outline/medical/dark_green - name = "medical dark green outline" - color = COLOR_DARK_GREEN_GRAY - -/obj/effect/floor_decal/industrial/outline/engineering - name = "engineering yellow outline" - color = COLOR_BROWN - -/obj/effect/floor_decal/industrial/outline/service - name = "service green outline" - color = COLOR_GREEN_GRAY - -/obj/effect/floor_decal/industrial/outline/research - name = "research mauve outline" - color = COLOR_PALE_PURPLE_GRAY - -/obj/effect/floor_decal/industrial/outline/security - name = "security blue outline" - color = COLOR_BLUE_GRAY - -// Outline - Informative -/obj/effect/floor_decal/industrial/outline/emergency_closet - name = "blue emergency closet outline" - color = COLOR_BABY_BLUE - -/obj/effect/floor_decal/industrial/outline/firefighting_closet - name = "red firefighting closet outline" - color = COLOR_RED_LIGHT - -/obj/effect/floor_decal/industrial/loading - name = "loading area" - icon_state = "loadingarea" - -/obj/effect/floor_decal/industrial/loading/yellow - color = "#CFCF55" - -/obj/effect/floor_decal/industrial/loading/grey - color = COLOR_GRAY - -/obj/effect/floor_decal/industrial/loading/security - name = "security blue loading area" - color = COLOR_BLUE_GRAY - /obj/effect/floor_decal/plaque name = "plaque" icon_state = "plaque" diff --git a/code/game/turfs/flooring/flooring_decals_industrial.dm b/code/game/turfs/flooring/flooring_decals_industrial.dm new file mode 100644 index 00000000000..b8e6e37b3f0 --- /dev/null +++ b/code/game/turfs/flooring/flooring_decals_industrial.dm @@ -0,0 +1,243 @@ + +// ------------------------ warning edge hazard stripes + +/obj/effect/floor_decal/industrial/warning + name = "hazard stripes" + icon_state = "warning" + +/obj/effect/floor_decal/industrial/warning/corner + icon_state = "warningcorner" + +/obj/effect/floor_decal/industrial/warning/full + icon_state = "warningfull" + +/obj/effect/floor_decal/industrial/warning/cee + icon_state = "warningcee" + +/obj/effect/floor_decal/industrial/warning/dust + name = "hazard stripes" + icon_state = "warning_dust" + +/obj/effect/floor_decal/industrial/warning/dust/corner + name = "hazard stripes" + icon_state = "warningcorner_dust" + +// ------------------------ hatching stripes main + +/obj/effect/floor_decal/industrial/hatch + name = "hatched marking" + icon_state = "delivery" + +/obj/effect/floor_decal/industrial/hatch/yellow + color = COLOR_YELLOW_KHAKI + +/obj/effect/floor_decal/industrial/hatch/grey + color = COLOR_GRAY + +/obj/effect/floor_decal/industrial/hatch/red + color = COLOR_CRIMSON + +// ------------------------ hatching stripes small + +/obj/effect/floor_decal/industrial/hatch_small + name = "hatched marking small" + icon_state = "delivery_small" + +/obj/effect/floor_decal/industrial/hatch_small/yellow + color = COLOR_YELLOW_KHAKI + +/obj/effect/floor_decal/industrial/hatch_small/grey + color = COLOR_GRAY + +/obj/effect/floor_decal/industrial/hatch_small/red + color = COLOR_CRIMSON + +// ------------------------ hatching stripes tiny + +/obj/effect/floor_decal/industrial/hatch_tiny + name = "hatched marking tiny" + icon_state = "delivery_tiny" + +/obj/effect/floor_decal/industrial/hatch_tiny/yellow + color = COLOR_YELLOW_KHAKI + +/obj/effect/floor_decal/industrial/hatch_tiny/grey + color = COLOR_GRAY + +/obj/effect/floor_decal/industrial/hatch_tiny/red + color = COLOR_CRIMSON + +// ------------------------ hatching stripes door + +/obj/effect/floor_decal/industrial/hatch_door + name = "hatched marking door" + icon_state = "delivery_door" + +/obj/effect/floor_decal/industrial/hatch_door/yellow + color = COLOR_YELLOW_KHAKI + +/obj/effect/floor_decal/industrial/hatch_door/grey + color = COLOR_GRAY + +/obj/effect/floor_decal/industrial/hatch_door/red + color = COLOR_CRIMSON + +// ------------------------ outline main + +/obj/effect/floor_decal/industrial/outline + name = "white outline" + icon_state = "outline_full" + +/obj/effect/floor_decal/industrial/outline/blue + name = "cyan outline" + color = "#b6efe1" + +/obj/effect/floor_decal/industrial/outline/yellow + name = "yellow outline" + color = COLOR_YELLOW_KHAKI + +/obj/effect/floor_decal/industrial/outline/grey + name = "grey outline" + color = COLOR_GRAY + +/obj/effect/floor_decal/industrial/outline/red + name = "red outline" + color = COLOR_CRIMSON + +/obj/effect/floor_decal/industrial/outline/custodial + name = "custodial purple outline" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/outline/medical + name = "medical lime outline" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline/medical/dark_green + name = "medical dark green outline" + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline/engineering + name = "engineering yellow outline" + color = COLOR_BROWN + +/obj/effect/floor_decal/industrial/outline/service + name = "service green outline" + color = COLOR_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline/research + name = "research mauve outline" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/outline/security + name = "security blue outline" + color = COLOR_BLUE_GRAY + +/obj/effect/floor_decal/industrial/outline/emergency_closet + name = "blue emergency closet outline" + color = COLOR_BABY_BLUE + +/obj/effect/floor_decal/industrial/outline/firefighting_closet + name = "red firefighting closet outline" + color = COLOR_RED_LIGHT + +// ------------------------ outline corner + +/obj/effect/floor_decal/industrial/outline_corner + name = "white outline" + icon_state = "outline_corner" + +/obj/effect/floor_decal/industrial/outline_corner/yellow + name = "yellow outline" + color = COLOR_YELLOW_KHAKI + +/obj/effect/floor_decal/industrial/outline_corner/grey + name = "grey outline" + color = COLOR_GRAY + +/obj/effect/floor_decal/industrial/outline_corner/red + name = "red outline" + color = COLOR_CRIMSON + +// ------------------------ outline straight + +/obj/effect/floor_decal/industrial/outline_straight + name = "white outline" + icon_state = "outline_straight" + +/obj/effect/floor_decal/industrial/outline_straight/yellow + name = "yellow outline" + color = COLOR_YELLOW_KHAKI + +/obj/effect/floor_decal/industrial/outline_straight/grey + name = "grey outline" + color = COLOR_GRAY + +/obj/effect/floor_decal/industrial/outline_straight/red + name = "red outline" + color = COLOR_CRIMSON + +// ------------------------ outline segment + +/obj/effect/floor_decal/industrial/outline_segment + name = "white outline" + icon_state = "outline_segment" + +/obj/effect/floor_decal/industrial/outline_segment/yellow + name = "yellow outline" + color = COLOR_YELLOW_KHAKI + +/obj/effect/floor_decal/industrial/outline_segment/grey + name = "grey outline" + color = COLOR_GRAY + +/obj/effect/floor_decal/industrial/outline_segment/red + name = "red outline" + color = COLOR_CRIMSON + +// ------------------------ outline door + +/obj/effect/floor_decal/industrial/outline_door + name = "white door outline" + icon_state = "outline_door" + +/obj/effect/floor_decal/industrial/outline_door/yellow + name = "yellow door outline" + color = COLOR_YELLOW_KHAKI + +/obj/effect/floor_decal/industrial/outline_door/grey + name = "grey door outline" + color = COLOR_GRAY + +/obj/effect/floor_decal/industrial/outline_door/red + name = "red door outline" + color = COLOR_CRIMSON + +// ------------------------ loading + +/obj/effect/floor_decal/industrial/loading + name = "loading area" + icon_state = "loadingarea" + +/obj/effect/floor_decal/industrial/loading/yellow + color = COLOR_YELLOW_KHAKI + +/obj/effect/floor_decal/industrial/loading/grey + color = COLOR_GRAY + +/obj/effect/floor_decal/industrial/loading/security + name = "security blue loading area" + color = COLOR_BLUE_GRAY + +// ------------------------ arrow + +/obj/effect/floor_decal/industrial/arrow + name = "arrow" + icon_state = "arrow" + +/obj/effect/floor_decal/industrial/arrow/yellow + color = COLOR_YELLOW_KHAKI + +/obj/effect/floor_decal/industrial/arrow/grey + color = COLOR_GRAY + +// ------------------------ diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm deleted file mode 100644 index c48e7a3773d..00000000000 --- a/code/game/turfs/flooring/flooring_premade.dm +++ /dev/null @@ -1,494 +0,0 @@ -/turf/simulated/floor/plating - footstep_sound = /singleton/sound_category/plating_footstep - -//Carpets -/turf/simulated/floor/carpet - name = "carpet" - icon = 'icons/turf/flooring/carpet.dmi' - icon_state = "carpet" - tile_outline = "carpet" - broken_overlay = "carpet" - initial_flooring = /singleton/flooring/carpet - footstep_sound = /singleton/sound_category/carpet_footstep - -/turf/simulated/floor/carpet/cyan - name = "cyan carpet" - icon_state = "carpet_cyan" - initial_flooring = /singleton/flooring/carpet/cyan - -/turf/simulated/floor/carpet/cyan/airless - initial_gas = null - -/turf/simulated/floor/carpet/rubber - name = "rubber carpet" - icon_state = "rub_carpet" - initial_flooring = /singleton/flooring/carpet/rubber - -/turf/simulated/floor/carpet/art - icon_state = "artcarpet" - initial_flooring = /singleton/flooring/carpet/art - -/turf/simulated/floor/carpet/brown - icon_state = "brown" - initial_flooring = /singleton/flooring/carpet/brown - -/turf/simulated/floor/carpet/red - icon_state = "red" - initial_flooring = /singleton/flooring/carpet/red - -/turf/simulated/floor/carpet/darkblue - icon_state = "blue1" - initial_flooring = /singleton/flooring/carpet/darkblue - -/turf/simulated/floor/carpet/lightblue - icon_state = "blue2" - initial_flooring = /singleton/flooring/carpet/lightblue - -/turf/simulated/floor/carpet/aquablue - icon_state = "blue3" - initial_flooring = /singleton/flooring/carpet/aquablue - -/turf/simulated/floor/carpet/green - icon_state = "green" - initial_flooring = /singleton/flooring/carpet/green - -/turf/simulated/floor/carpet/magenta - icon_state = "magenta" - initial_flooring = /singleton/flooring/carpet/magenta - -/turf/simulated/floor/carpet/purple - icon_state = "purple" - initial_flooring = /singleton/flooring/carpet/purple - -/turf/simulated/floor/carpet/orange - icon_state = "orange" - initial_flooring = /singleton/flooring/carpet/orange - -//Grids -/turf/simulated/floor/bluegrid - name = "mainframe floor" - icon = 'icons/turf/flooring/circuit.dmi' - icon_state = "bcircuit" - initial_flooring = /singleton/flooring/reinforced/circuit - -/turf/simulated/floor/bluegrid/cooled - name = "cooled mainframe floor" - temperature = 278 - -/turf/simulated/floor/bluegrid/server - name = "cooled mainframe floor" - temperature = 80 - initial_gas = list("nitrogen" = MOLES_CELLSTANDARD) //one atmosphere of nitrogen - -/turf/simulated/floor/greengrid - name = "mainframe floor" - icon = 'icons/turf/flooring/circuit.dmi' - icon_state = "gcircuit" - initial_flooring = /singleton/flooring/reinforced/circuit/green - -/turf/simulated/floor/redgrid - name = "mainframe floor" - icon = 'icons/turf/flooring/circuit.dmi' - icon_state = "rcircuit" - initial_flooring = /singleton/flooring/reinforced/circuit/red - -//Wood Flooring -/turf/simulated/floor/wood - name = "wooden floor" - icon = 'icons/turf/flooring/tiles.dmi' - icon_state = "wood_preview" - initial_flooring = /singleton/flooring/wood - footstep_sound = /singleton/sound_category/wood_footstep - tile_outline = "wood" - tile_decal_state = "wood" - broken_overlay = "wood" - tile_outline_alpha = 75 - -/turf/simulated/floor/wood/airless - initial_gas = null - -/turf/simulated/floor/wood/birch - initial_flooring = /singleton/flooring/wood/birch - -/turf/simulated/floor/wood/mahogany - initial_flooring = /singleton/flooring/wood/mahogany - -/turf/simulated/floor/wood/walnut - initial_flooring = /singleton/flooring/wood/walnut - -/turf/simulated/floor/wood/bamboo - initial_flooring = /singleton/flooring/wood/bamboo - -/turf/simulated/floor/wood/ebony - initial_flooring = /singleton/flooring/wood/ebony - -/turf/simulated/floor/wood/walnut - initial_flooring = /singleton/flooring/wood/walnut - -/turf/simulated/floor/wood/yew - initial_flooring = /singleton/flooring/wood/yew - -//Grass -/turf/simulated/floor/grass - name = "grass patch" - icon = 'icons/turf/flooring/grass.dmi' - icon_state = "grass0" - initial_flooring = /singleton/flooring/grass - footstep_sound = /singleton/sound_category/grass_footstep - -/turf/simulated/floor/diona - name = "biomass flooring" - icon = 'icons/turf/flooring/diona.dmi' - icon_state = "diona0" - footstep_sound = /singleton/sound_category/grass_footstep - initial_flooring = /singleton/flooring/diona - turf_flags = TURF_REMOVE_SHOVEL|TURF_REMOVE_WELDER - -/turf/simulated/floor/diona/airless - initial_gas = null - temperature = TCMB - -//Tiles -/turf/simulated/floor/tiled - name = "steel tiles" - icon = 'icons/turf/flooring/tiles.dmi' - icon_state = "tiled_preview" - initial_flooring = /singleton/flooring/tiling - tile_outline = "tiled" - tile_decal_state = "tiled_light" - tile_outline_alpha = 125 - broken_overlay = "tiled" - burned_overlay = "tiled" - -/turf/simulated/floor/tiled/cooled - name = "cooled steel tiles" - temperature = 278 - -/turf/simulated/floor/tiled/full - name = "full steel tile" - icon_state = "monotile_preview" - initial_flooring = /singleton/flooring/tiling/mono - tile_outline = "monotile" - tile_decal_state = "monotile_light" - broken_overlay = null - burned_overlay = null - -/turf/simulated/floor/tiled/full/airless - name = "airless full steel tile" - initial_gas = null - -/turf/simulated/floor/reinforced - name = "reinforced floor" - icon = 'icons/turf/flooring/tiles.dmi' - icon_state = "reinforced" - initial_flooring = /singleton/flooring/reinforced - footstep_sound = /singleton/sound_category/plating_footstep - tile_outline = "reinforced" - tile_decal_state = "reinforced_light" - -/turf/simulated/floor/reinforced/cooled - name = "cooled reinforced floor" - temperature = 278 - -/turf/simulated/floor/reinforced/airless - initial_gas = null - - roof_type = null - -/turf/simulated/floor/reinforced/airmix - initial_gas = list("oxygen" = MOLES_O2ATMOS, "nitrogen" = MOLES_N2ATMOS) - -/turf/simulated/floor/reinforced/nitrogen - initial_gas = list("nitrogen" = ATMOSTANK_NITROGEN) - -// Reinforced Reactor Flooring -/turf/simulated/floor/reinforced/reactor - name = "reinforced reactor floor" - initial_gas = list("nitrogen" = MOLES_CELLSTANDARD) // One atmosphere of nitrogen. - -/turf/simulated/floor/reinforced/oxygen - initial_gas = list("oxygen" = ATMOSTANK_OXYGEN) - -/turf/simulated/floor/reinforced/phoron - initial_gas = list("phoron" = ATMOSTANK_PHORON) - -/turf/simulated/floor/reinforced/phoron/scarce - initial_gas = list("phoron" = ATMOSTANK_PHORON_SCARCE) - -/turf/simulated/floor/reinforced/carbon_dioxide - initial_gas = list("carbon_dioxide" = ATMOSTANK_CO2) - -/turf/simulated/floor/reinforced/n20 - initial_gas = list("sleeping_agent" = ATMOSTANK_NITROUSOXIDE) - -/turf/simulated/floor/reinforced/hydrogen - initial_gas = list("hydrogen" = ATMOSTANK_HYDROGEN) - -/turf/simulated/floor/cult - name = "engraved floor" - icon = 'icons/turf/flooring/cult.dmi' - icon_state = "cult" - initial_flooring = /singleton/flooring/reinforced/cult - appearance_flags = NO_CLIENT_COLOR - -/turf/simulated/floor/cult/cultify() - return - -/turf/simulated/floor/tiled/dark - name = "plasteel tiles" - icon_state = "dark_preview" - initial_flooring = /singleton/flooring/tiling/dark - tile_decal_state = "dark_light" - -/turf/simulated/floor/tiled/dark/cooled - name = "cooled plasteel tiles" - temperature = 278 - -/turf/simulated/floor/tiled/dark/airless - initial_gas = null - -/turf/simulated/floor/tiled/dark/full - name = "full plasteel tile" - icon_state = "monotile_dark_preview" - initial_flooring = /singleton/flooring/tiling/dark/full - tile_outline = "monotile" - tile_decal_state = "monotile_dark_light" - broken_overlay = null - burned_overlay = null - -/turf/simulated/floor/tiled/dark/full/airless - name = "airless full plasteel tile" - initial_gas = null - -/turf/simulated/floor/tiled/red - name = "red floor" - color = COLOR_RED_GRAY - initial_flooring = /singleton/flooring/tiling/red - -/turf/simulated/floor/tiled/rust - name = "rusted steel floor" - initial_flooring = /singleton/flooring/tiling/steel - -/turf/simulated/floor/tiled/steel/airless - initial_gas = null - -/turf/simulated/floor/tiled/rust/update_icon() - . = ..() - var/image/rust = image('icons/turf/decals/damage.dmi', "rust") - rust.appearance_flags = RESET_COLOR - add_overlay(rust) - -/turf/simulated/floor/tiled/rust/airless - initial_gas = null - roof_type = null - -/turf/simulated/floor/tiled/asteroid - icon_state = "asteroidfloor" - initial_flooring = /singleton/flooring/tiling/asteroid - broken_overlay = null - burned_overlay = null - -/turf/simulated/floor/tiled/asteroid/airless - initial_gas = null - roof_type = null - -/turf/simulated/floor/plating/cooled - name = "cooled plating" - temperature = 278 - -/turf/simulated/floor/plating/asteroid - icon_state = "asteroidplating" - -/turf/simulated/floor/tiled/white - name = "white floor" - icon_state = "white_preview" - tile_outline_alpha = 75 - tile_decal_state = "white" - initial_flooring = /singleton/flooring/tiling/white - broken_overlay = null - burned_overlay = null - -/turf/simulated/floor/tiled/yellow - name = "yellow floor" - color = COLOR_BROWN - initial_flooring = /singleton/flooring/tiling/yellow - -/turf/simulated/floor/tiled/freezer - name = "tiles" - icon_state = "freezer" - tile_decal_state = "freezer_white" - initial_flooring = /singleton/flooring/tiling/freezer - -/turf/simulated/floor/tiled/ramp - name = "foot ramp" - icon = 'icons/turf/flooring/tiles.dmi' - icon_state = "ramptop" - initial_flooring = /singleton/flooring/reinforced/ramp - -/turf/simulated/floor/tiled/ramp/bottom - name = "foot ramp" - icon = 'icons/turf/flooring/tiles.dmi' - icon_state = "rampbot" - initial_flooring = /singleton/flooring/reinforced/ramp/bottom - -/turf/simulated/floor/lino - name = "linoleum" - icon = 'icons/turf/flooring/linoleum.dmi' - icon_state = "lino_preview" - initial_flooring = /singleton/flooring/linoleum - tile_outline = "linoleum" - -/turf/simulated/floor/lino/diamond - icon_state = "lino_diamond_preview" - initial_flooring = /singleton/flooring/linoleum/diamond - tile_outline = "tiled" - broken_overlay = "tiled" - burned_overlay = "tiled" - -//ATMOS PREMADES -/turf/simulated/floor/reinforced/airless - name = "vacuum floor" - initial_gas = null - temperature = TCMB - roof_type = null - -/turf/simulated/floor/airless - name = "airless plating" - initial_gas = null - temperature = TCMB - footstep_sound = /singleton/sound_category/plating_footstep - - roof_type = null - -/turf/simulated/floor/tiled/airless - name = "airless floor" - initial_gas = null - temperature = TCMB - -/turf/simulated/floor/bluegrid/airless - name = "airless floor" - initial_gas = null - temperature = TCMB - -/turf/simulated/floor/greengrid/airless - name = "airless floor" - initial_gas = null - temperature = TCMB - -/turf/simulated/floor/greengrid/nitrogen - initial_gas = list("nitrogen" = MOLES_N2STANDARD) - -/turf/simulated/floor/tiled/white/airless - name = "airless floor" - initial_gas = null - temperature = TCMB - -// Terrain - -/turf/simulated/floor/airless/lava - name = "lava" - icon = 'icons/turf/flooring/lava.dmi' - icon_state = "lava" - -/turf/simulated/floor/ice - name = "ice" - icon = 'icons/turf/flooring/snow.dmi' - icon_state = "ice" - -/turf/simulated/floor/airless/ice - name = "ice" - icon = 'icons/turf/flooring/snow.dmi' - icon_state = "ice" - -/turf/simulated/floor/snow - name = "snow" - icon = 'icons/turf/flooring/snow.dmi' - icon_state = "snow0" - does_footprint = TRUE - footprint_color = COLOR_SNOW - track_distance = 4 - -/turf/simulated/floor/plating/snow - icon = 'icons/turf/flooring/snow.dmi' - icon_state = "snowplating" - footstep_sound = /singleton/sound_category/snow_footstep - -/turf/simulated/floor/airless/ceiling - icon_state = "asteroidplating" - baseturf = /turf/space - -// Material - -/turf/simulated/floor/silver - name = "silver floor" - icon = 'icons/turf/flooring/material.dmi' - icon_state = "silver" - initial_flooring = /singleton/flooring/silver - -/turf/simulated/floor/gold - name = "golden floor" - icon = 'icons/turf/flooring/material.dmi' - icon_state = "gold" - initial_flooring = /singleton/flooring/gold - -/turf/simulated/floor/uranium - name = "uranium floor" - icon = 'icons/turf/flooring/material.dmi' - icon_state = "uranium" - initial_flooring =/singleton/flooring/uranium - -/turf/simulated/floor/phoron - name = "phoron floor" - icon = 'icons/turf/flooring/material.dmi' - icon_state = "plasma" - initial_flooring = /singleton/flooring/phoron - -/turf/simulated/floor/diamond - name = "diamond floor" - icon = 'icons/turf/flooring/material.dmi' - icon_state = "diamond" - initial_flooring = /singleton/flooring/diamond - -//chessboard - -/turf/simulated/floor/marble - name = "marble floor" - icon = 'icons/turf/flooring/tiles.dmi' - icon_state = "textured" - initial_flooring = /singleton/flooring/marble - -/turf/simulated/floor/marble/dark - color = COLOR_DARK_GRAY - -// other - -/turf/simulated/floor/vaurca - name = "alien floor" - icon = 'icons/turf/flooring/tiles.dmi' - icon_state = "vaurca" - -/turf/simulated/floor/foamedmetal - name = "foamed metal" - icon = 'icons/effects/effects.dmi' - icon_state = "metalfoam" - -/turf/simulated/floor/foamedmetal/attack_hand(var/mob/user) - user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - if(ishuman(user)) - ChangeTurf(/turf/space) - to_chat(user, SPAN_NOTICE("You clear away the metal foam.")) - -/turf/simulated/floor/concrete // The more conk they crete the more brutalismer it is - name = "concrete" - icon = 'icons/turf/flooring/concrete.dmi' - icon_state = "concrete0" - initial_flooring = /singleton/flooring/concrete - -/turf/simulated/floor/concrete/square - icon_state = "concrete3" - tile_outline = "tiled" - tile_decal_state = "tiled_light" - tile_outline_alpha = 125 - broken_overlay = "tiled" - burned_overlay = "tiled" - initial_flooring = /singleton/flooring/concrete/square diff --git a/code/game/turfs/flooring/flooring_premade_.dm b/code/game/turfs/flooring/flooring_premade_.dm new file mode 100644 index 00000000000..7b1ed04e68f --- /dev/null +++ b/code/game/turfs/flooring/flooring_premade_.dm @@ -0,0 +1,351 @@ +/turf/simulated/floor/plating + footstep_sound = /singleton/sound_category/plating_footstep + +// ------------------------------- grids + +/turf/simulated/floor/bluegrid + name = "mainframe floor" + icon = 'icons/turf/flooring/circuit.dmi' + icon_state = "bcircuit" + initial_flooring = /singleton/flooring/reinforced/circuit + +/turf/simulated/floor/bluegrid/cooled + name = "cooled mainframe floor" + temperature = 278 + +/turf/simulated/floor/bluegrid/server + name = "cooled mainframe floor" + temperature = 80 + initial_gas = list("nitrogen" = MOLES_CELLSTANDARD) //one atmosphere of nitrogen + +/turf/simulated/floor/greengrid + name = "mainframe floor" + icon = 'icons/turf/flooring/circuit.dmi' + icon_state = "gcircuit" + initial_flooring = /singleton/flooring/reinforced/circuit/green + +/turf/simulated/floor/redgrid + name = "mainframe floor" + icon = 'icons/turf/flooring/circuit.dmi' + icon_state = "rcircuit" + initial_flooring = /singleton/flooring/reinforced/circuit/red + +/turf/simulated/floor/bluegrid/airless + name = "airless floor" + initial_gas = null + temperature = TCMB + +/turf/simulated/floor/greengrid/airless + name = "airless floor" + initial_gas = null + temperature = TCMB + +/turf/simulated/floor/greengrid/nitrogen + initial_gas = list("nitrogen" = MOLES_N2STANDARD) + +// ------------------------------- tiled + +/turf/simulated/floor/tiled + name = "steel tiles" + icon = 'icons/turf/flooring/tiles.dmi' + icon_state = "tiled" + initial_flooring = /singleton/flooring/tiling + tile_outline = "tiled" + tile_decal_state = "tiled_light" + tile_outline_alpha = 125 + broken_overlay = "tiled" + burned_overlay = "tiled" + color = COLOR_TILED + +/turf/simulated/floor/tiled/cooled + name = "cooled steel tiles" + temperature = 278 + +/turf/simulated/floor/tiled/full + name = "full steel tile" + icon_state = "monotile" + initial_flooring = /singleton/flooring/tiling/mono + tile_outline = "monotile" + tile_decal_state = "monotile_light" + broken_overlay = null + burned_overlay = null + +/turf/simulated/floor/tiled/full/airless + name = "airless full steel tile" + initial_gas = null + +/turf/simulated/floor/cult + name = "engraved floor" + icon = 'icons/turf/flooring/cult.dmi' + icon_state = "cult" + initial_flooring = /singleton/flooring/reinforced/cult + appearance_flags = NO_CLIENT_COLOR + +/turf/simulated/floor/cult/cultify() + return + +/turf/simulated/floor/tiled/red + name = "red floor" + color = COLOR_RED_GRAY + initial_flooring = /singleton/flooring/tiling/red + +/turf/simulated/floor/tiled/rust + name = "rusted steel floor" + initial_flooring = /singleton/flooring/tiling/steel + +/turf/simulated/floor/tiled/steel/airless + initial_gas = null + +/turf/simulated/floor/tiled/rust/update_icon() + . = ..() + var/image/rust = image('icons/turf/decals/damage.dmi', "rust") + rust.appearance_flags = RESET_COLOR + add_overlay(rust) + +/turf/simulated/floor/tiled/rust/airless + initial_gas = null + roof_type = null + +/turf/simulated/floor/tiled/asteroid + icon_state = "asteroidfloor" + initial_flooring = /singleton/flooring/tiling/asteroid + broken_overlay = null + burned_overlay = null + +/turf/simulated/floor/tiled/asteroid/airless + initial_gas = null + roof_type = null + +/turf/simulated/floor/plating/cooled + name = "cooled plating" + temperature = 278 + +/turf/simulated/floor/plating/asteroid + icon_state = "asteroidplating" + +/turf/simulated/floor/tiled/white + name = "white floor" + icon_state = "white" + tile_outline_alpha = 75 + tile_decal_state = "white" + initial_flooring = /singleton/flooring/tiling/white + broken_overlay = null + burned_overlay = null + color = COLOR_STERILE + +/turf/simulated/floor/tiled/yellow + name = "yellow floor" + color = COLOR_BROWN + initial_flooring = /singleton/flooring/tiling/yellow + +/turf/simulated/floor/tiled/freezer + name = "tiles" + icon_state = "freezer" + tile_decal_state = "freezer_white" + initial_flooring = /singleton/flooring/tiling/freezer + color = null + +/turf/simulated/floor/tiled/ramp + name = "foot ramp" + icon = 'icons/turf/flooring/tiles.dmi' + icon_state = "ramptop" + initial_flooring = /singleton/flooring/reinforced/ramp + +/turf/simulated/floor/tiled/ramp/bottom + name = "foot ramp" + icon = 'icons/turf/flooring/tiles.dmi' + icon_state = "rampbot" + initial_flooring = /singleton/flooring/reinforced/ramp/bottom + +/turf/simulated/floor/lino + name = "linoleum" + icon = 'icons/turf/flooring/linoleum.dmi' + icon_state = "lino_preview" + initial_flooring = /singleton/flooring/linoleum + tile_outline = "linoleum" + +/turf/simulated/floor/lino/diamond + icon_state = "lino_diamond_preview" + initial_flooring = /singleton/flooring/linoleum/diamond + tile_outline = "tiled" + broken_overlay = "tiled" + burned_overlay = "tiled" + +//ATMOS PREMADES + +/turf/simulated/floor/airless + name = "airless plating" + initial_gas = null + temperature = TCMB + footstep_sound = /singleton/sound_category/plating_footstep + roof_type = null + +/turf/simulated/floor/tiled/airless + name = "airless floor" + initial_gas = null + temperature = TCMB + +/turf/simulated/floor/tiled/white/airless + name = "airless floor" + initial_gas = null + temperature = TCMB + +/turf/simulated/floor/airless/ceiling + icon_state = "asteroidplating" + baseturf = /turf/space + +// ------------------------------- tiled/dark + +/turf/simulated/floor/tiled/dark + name = "plasteel tiles" + icon_state = "dark" + initial_flooring = /singleton/flooring/tiling/dark + tile_decal_state = "dark_light" + color = COLOR_DARK_GUNMETAL + +/turf/simulated/floor/tiled/dark/cooled + name = "cooled plasteel tiles" + temperature = 278 + +/turf/simulated/floor/tiled/dark/airless + initial_gas = null + +/turf/simulated/floor/tiled/dark/full + name = "full plasteel tile" + icon_state = "monotile_dark" + initial_flooring = /singleton/flooring/tiling/dark/full + tile_outline = "monotile" + tile_decal_state = "monotile_dark_light" + broken_overlay = null + burned_overlay = null + +/turf/simulated/floor/tiled/dark/full/airless + name = "airless full plasteel tile" + initial_gas = null + +// ------------------------------- tiled/light + +/turf/simulated/floor/tiled/light + name = "tiles" + icon_state = "tiled" + initial_flooring = /singleton/flooring/tiling/light + tile_decal_state = "tiled_light" + color = COLOR_GRAY70 + +/turf/simulated/floor/tiled/light/full + name = "full tile" + icon_state = "monotile" + initial_flooring = /singleton/flooring/tiling/light/full + tile_outline = "monotile" + tile_decal_state = "monotile_light" + broken_overlay = null + burned_overlay = null + +// ------------------------------- tiled/gunmetal + +/turf/simulated/floor/tiled/gunmetal + name = "tiles" + icon_state = "tiled" + initial_flooring = /singleton/flooring/tiling/gunmetal + tile_decal_state = "tiled_light" + color = COLOR_GUNMETAL + +/turf/simulated/floor/tiled/gunmetal/full + name = "full tile" + icon_state = "monotile" + initial_flooring = /singleton/flooring/tiling/gunmetal/full + tile_outline = "monotile" + tile_decal_state = "monotile_light" + broken_overlay = null + burned_overlay = null + +// ------------------------------- tiled/slate + +/turf/simulated/floor/tiled/slate + name = "tiles" + icon_state = "tiled" + initial_flooring = /singleton/flooring/tiling/slate + tile_decal_state = "tiled_light" + color = COLOR_SLATE + +/turf/simulated/floor/tiled/slate/full + name = "full tile" + icon_state = "monotile" + initial_flooring = /singleton/flooring/tiling/slate/full + tile_outline = "monotile" + tile_decal_state = "monotile_light" + broken_overlay = null + burned_overlay = null + +// ------------------------------- cargo + +/turf/simulated/floor/tiled/cargo + name = "cargo tiles" + icon_state = "cargo" + initial_flooring = /singleton/flooring/tiling/cargo + tile_decal_state = "tiled_light" + color = COLOR_ALUMINIUM + +/turf/simulated/floor/tiled/cargo/full + name = "cargo tile" + icon_state = "cargo_monotile" + initial_flooring = /singleton/flooring/tiling/cargo/full + tile_decal_state = "monotile_light" + +// ------------------------------- cargo/brass + +/turf/simulated/floor/tiled/cargo/brass + name = "cargo tiles" + icon_state = "cargo" + initial_flooring = /singleton/flooring/tiling/cargo/brass + tile_decal_state = "tiled_light" + color = COLOR_BRASS + +/turf/simulated/floor/tiled/cargo/brass/full + name = "cargo tile" + icon_state = "cargo_monotile" + initial_flooring = /singleton/flooring/tiling/cargo/brass/full + tile_decal_state = "monotile_light" + +// ------------------------------- bitile + +/turf/simulated/floor/tiled/bitile + name = "bitile" + icon_state = "bitile" + initial_flooring = /singleton/flooring/tiling/bitile + tile_decal_state = "bitile_light" + color = COLOR_TILED + +// ------------------------------- gridded/ridged + +/turf/simulated/floor/tiled/gridded + name = "gridded tiles" + icon_state = "grid" + initial_flooring = /singleton/flooring/tiling/gridded + tile_decal_state = "grid_light" + color = COLOR_GRAY40 + +/turf/simulated/floor/tiled/ridged + name = "ridged tiles" + icon_state = "ridged" + initial_flooring = /singleton/flooring/tiling/ridged + tile_decal_state = "ridged_light" + color = COLOR_GUNMETAL + +// ------------------------------- tech + +/turf/simulated/floor/tiled/techmaint + name = "techmaint tiles" + icon_state = "techmaint" + initial_flooring = /singleton/flooring/tiling/techmaint + tile_decal_state = "techmaint_light" + color = COLOR_GRAY30 + +/turf/simulated/floor/tiled/techfloor + name = "techfloor tiles" + icon_state = "techfloor" + initial_flooring = /singleton/flooring/tiling/techfloor + tile_decal_state = "techfloor_light" + color = COLOR_GRAY40 + +// ------------------------------- diff --git a/code/game/turfs/flooring/flooring_premade_fancy.dm b/code/game/turfs/flooring/flooring_premade_fancy.dm new file mode 100644 index 00000000000..8c59ce3cb0a --- /dev/null +++ b/code/game/turfs/flooring/flooring_premade_fancy.dm @@ -0,0 +1,122 @@ + +// ------------------------------- carpets + +/turf/simulated/floor/carpet + name = "carpet" + icon = 'icons/turf/flooring/carpet.dmi' + icon_state = "carpet" + tile_outline = "carpet" + broken_overlay = "carpet" + initial_flooring = /singleton/flooring/carpet + footstep_sound = /singleton/sound_category/carpet_footstep + +/turf/simulated/floor/carpet/cyan + name = "cyan carpet" + icon_state = "carpet_cyan" + initial_flooring = /singleton/flooring/carpet/cyan + +/turf/simulated/floor/carpet/cyan/airless + initial_gas = null + +/turf/simulated/floor/carpet/rubber + name = "rubber carpet" + icon_state = "rub_carpet" + initial_flooring = /singleton/flooring/carpet/rubber + +/turf/simulated/floor/carpet/art + icon_state = "artcarpet" + initial_flooring = /singleton/flooring/carpet/art + +/turf/simulated/floor/carpet/brown + icon_state = "brown" + initial_flooring = /singleton/flooring/carpet/brown + +/turf/simulated/floor/carpet/red + icon_state = "red" + initial_flooring = /singleton/flooring/carpet/red + +/turf/simulated/floor/carpet/darkblue + icon_state = "blue1" + initial_flooring = /singleton/flooring/carpet/darkblue + +/turf/simulated/floor/carpet/lightblue + icon_state = "blue2" + initial_flooring = /singleton/flooring/carpet/lightblue + +/turf/simulated/floor/carpet/aquablue + icon_state = "blue3" + initial_flooring = /singleton/flooring/carpet/aquablue + +/turf/simulated/floor/carpet/green + icon_state = "green" + initial_flooring = /singleton/flooring/carpet/green + +/turf/simulated/floor/carpet/magenta + icon_state = "magenta" + initial_flooring = /singleton/flooring/carpet/magenta + +/turf/simulated/floor/carpet/purple + icon_state = "purple" + initial_flooring = /singleton/flooring/carpet/purple + +/turf/simulated/floor/carpet/orange + icon_state = "orange" + initial_flooring = /singleton/flooring/carpet/orange + +// ------------------------------- wood + +/turf/simulated/floor/wood + name = "wooden floor" + icon = 'icons/turf/flooring/tiles.dmi' + icon_state = "wood" + initial_flooring = /singleton/flooring/wood + footstep_sound = /singleton/sound_category/wood_footstep + tile_outline = "wood" + tile_decal_state = "wood" + broken_overlay = "wood" + tile_outline_alpha = 75 + color = WOOD_COLOR_GENERIC + +/turf/simulated/floor/wood/airless + initial_gas = null + +/turf/simulated/floor/wood/birch + initial_flooring = /singleton/flooring/wood/birch + color = WOOD_COLOR_GENERIC + +/turf/simulated/floor/wood/mahogany + initial_flooring = /singleton/flooring/wood/mahogany + color = WOOD_COLOR_RICH + +/turf/simulated/floor/wood/maple + initial_flooring = /singleton/flooring/wood/maple + color = WOOD_COLOR_PALE + +/turf/simulated/floor/wood/bamboo + initial_flooring = /singleton/flooring/wood/bamboo + color = WOOD_COLOR_PALE2 + +/turf/simulated/floor/wood/ebony + initial_flooring = /singleton/flooring/wood/ebony + color = WOOD_COLOR_BLACK + +/turf/simulated/floor/wood/walnut + initial_flooring = /singleton/flooring/wood/walnut + color = WOOD_COLOR_CHOCOLATE + +/turf/simulated/floor/wood/yew + initial_flooring = /singleton/flooring/wood/yew + color = WOOD_COLOR_YELLOW + +// ------------------------------- marble + +/turf/simulated/floor/marble + name = "marble floor" + icon = 'icons/turf/flooring/tiles.dmi' + icon_state = "textured" + initial_flooring = /singleton/flooring/marble + color = COLOR_GRAY80 + +/turf/simulated/floor/marble/dark + initial_flooring = /singleton/flooring/marble/dark + color = COLOR_DARK_GRAY diff --git a/code/game/turfs/flooring/flooring_premade_material.dm b/code/game/turfs/flooring/flooring_premade_material.dm new file mode 100644 index 00000000000..6cd6c00ec07 --- /dev/null +++ b/code/game/turfs/flooring/flooring_premade_material.dm @@ -0,0 +1,30 @@ + +/turf/simulated/floor/silver + name = "silver floor" + icon = 'icons/turf/flooring/material.dmi' + icon_state = "silver" + initial_flooring = /singleton/flooring/silver + +/turf/simulated/floor/gold + name = "golden floor" + icon = 'icons/turf/flooring/material.dmi' + icon_state = "gold" + initial_flooring = /singleton/flooring/gold + +/turf/simulated/floor/uranium + name = "uranium floor" + icon = 'icons/turf/flooring/material.dmi' + icon_state = "uranium" + initial_flooring =/singleton/flooring/uranium + +/turf/simulated/floor/phoron + name = "phoron floor" + icon = 'icons/turf/flooring/material.dmi' + icon_state = "plasma" + initial_flooring = /singleton/flooring/phoron + +/turf/simulated/floor/diamond + name = "diamond floor" + icon = 'icons/turf/flooring/material.dmi' + icon_state = "diamond" + initial_flooring = /singleton/flooring/diamond diff --git a/code/game/turfs/flooring/flooring_premade_other.dm b/code/game/turfs/flooring/flooring_premade_other.dm new file mode 100644 index 00000000000..9b69c145da9 --- /dev/null +++ b/code/game/turfs/flooring/flooring_premade_other.dm @@ -0,0 +1,63 @@ + +/turf/simulated/floor/airless/lava + name = "lava" + icon = 'icons/turf/flooring/lava.dmi' + icon_state = "lava" + +/turf/simulated/floor/ice + name = "ice" + icon = 'icons/turf/flooring/snow.dmi' + icon_state = "ice" + +/turf/simulated/floor/airless/ice + name = "ice" + icon = 'icons/turf/flooring/snow.dmi' + icon_state = "ice" + +/turf/simulated/floor/snow + name = "snow" + icon = 'icons/turf/flooring/snow.dmi' + icon_state = "snow0" + does_footprint = TRUE + footprint_color = COLOR_SNOW + track_distance = 4 + +/turf/simulated/floor/plating/snow + icon = 'icons/turf/flooring/snow.dmi' + icon_state = "snowplating" + footstep_sound = /singleton/sound_category/snow_footstep + +/turf/simulated/floor/vaurca + name = "alien floor" + icon = 'icons/turf/flooring/tiles.dmi' + icon_state = "vaurca" + +/turf/simulated/floor/foamedmetal + name = "foamed metal" + icon = 'icons/effects/effects.dmi' + icon_state = "metalfoam" + +/turf/simulated/floor/foamedmetal/attack_hand(var/mob/user) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) + if(ishuman(user)) + ChangeTurf(/turf/space) + to_chat(user, SPAN_NOTICE("You clear away the metal foam.")) + +/turf/simulated/floor/grass + name = "grass patch" + icon = 'icons/turf/flooring/grass.dmi' + icon_state = "grass0" + initial_flooring = /singleton/flooring/grass + footstep_sound = /singleton/sound_category/grass_footstep + +/turf/simulated/floor/diona + name = "biomass flooring" + icon = 'icons/turf/flooring/diona.dmi' + icon_state = "diona0" + footstep_sound = /singleton/sound_category/grass_footstep + initial_flooring = /singleton/flooring/diona + turf_flags = TURF_REMOVE_SHOVEL|TURF_REMOVE_WELDER + +/turf/simulated/floor/diona/airless + initial_gas = null + temperature = TCMB diff --git a/code/game/turfs/flooring/flooring_premade_reinforced.dm b/code/game/turfs/flooring/flooring_premade_reinforced.dm new file mode 100644 index 00000000000..88aa8988aae --- /dev/null +++ b/code/game/turfs/flooring/flooring_premade_reinforced.dm @@ -0,0 +1,68 @@ + +// ------------------------------- reinforced base + +/turf/simulated/floor/reinforced + name = "reinforced floor" + icon = 'icons/turf/flooring/tiles.dmi' + icon_state = "reinforced" + initial_flooring = /singleton/flooring/reinforced + footstep_sound = /singleton/sound_category/plating_footstep + tile_outline = "reinforced" + tile_decal_state = "reinforced_light" + +// ------------------------------- reinforced atmos variants + +/turf/simulated/floor/reinforced/cooled + name = "cooled reinforced floor" + temperature = 278 + +/turf/simulated/floor/reinforced/airless + initial_gas = null + temperature = TCMB + roof_type = null + +/turf/simulated/floor/reinforced/airmix + initial_gas = list("oxygen" = MOLES_O2ATMOS, "nitrogen" = MOLES_N2ATMOS) + +/turf/simulated/floor/reinforced/nitrogen + initial_gas = list("nitrogen" = ATMOSTANK_NITROGEN) + +/turf/simulated/floor/reinforced/reactor + name = "reinforced reactor floor" + initial_gas = list("nitrogen" = MOLES_CELLSTANDARD) // One atmosphere of nitrogen. + +/turf/simulated/floor/reinforced/oxygen + initial_gas = list("oxygen" = ATMOSTANK_OXYGEN) + +/turf/simulated/floor/reinforced/phoron + initial_gas = list("phoron" = ATMOSTANK_PHORON) + +/turf/simulated/floor/reinforced/phoron/scarce + initial_gas = list("phoron" = ATMOSTANK_PHORON_SCARCE) + +/turf/simulated/floor/reinforced/carbon_dioxide + initial_gas = list("carbon_dioxide" = ATMOSTANK_CO2) + +/turf/simulated/floor/reinforced/n20 + initial_gas = list("sleeping_agent" = ATMOSTANK_NITROUSOXIDE) + +/turf/simulated/floor/reinforced/hydrogen + initial_gas = list("hydrogen" = ATMOSTANK_HYDROGEN) + +// ------------------------------- reinforced large + +/turf/simulated/floor/reinforced/large + name = "reinforced floor" + icon_state = "reinforced_large" + initial_flooring = /singleton/flooring/reinforced + tile_outline = "reinforced_large" + tile_decal_state = "reinforced_large_light" + +// ------------------------------- reinforced atmos variants + +/turf/simulated/floor/reinforced/large/airless + initial_gas = null + temperature = TCMB + roof_type = null + +// ------------------------------- diff --git a/code/game/turfs/flooring/urban.dm b/code/game/turfs/flooring/urban.dm index 7e77ef15061..242b5194034 100644 --- a/code/game/turfs/flooring/urban.dm +++ b/code/game/turfs/flooring/urban.dm @@ -115,3 +115,18 @@ /obj/structure/ledge/roof/corner icon_state = "roof_ledge_corner" + +/turf/simulated/floor/concrete // The more conk they crete the more brutalismer it is + name = "concrete" + icon = 'icons/turf/flooring/concrete.dmi' + icon_state = "concrete0" + initial_flooring = /singleton/flooring/concrete + +/turf/simulated/floor/concrete/square + icon_state = "concrete3" + tile_outline = "tiled" + tile_decal_state = "tiled_light" + tile_outline_alpha = 125 + broken_overlay = "tiled" + burned_overlay = "tiled" + initial_flooring = /singleton/flooring/concrete/square diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index 150d223e5c8..e458ceff06a 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -2,7 +2,7 @@ name = "Acetone" description = "A colorless liquid solvent used in chemical synthesis." reagent_state = LIQUID - color = "#808080" + color = COLOR_GRAY metabolism = REM * 0.2 taste_description = "acid" fallback_specific_heat = 0.567 @@ -272,7 +272,7 @@ name = "Hydrazine" description = "A toxic, colorless, flammable liquid with a strong ammonia-like odor, in hydrate form." reagent_state = LIQUID - color = "#808080" + color = COLOR_GRAY metabolism = REM * 0.2 touch_met = 5 taste_description = "sweet tasting metal" @@ -317,7 +317,7 @@ name = "Lithium" description = "A chemical element, used as an antidepressant." reagent_state = SOLID - color = "#808080" + color = COLOR_GRAY taste_description = "metal" fallback_specific_heat = 0.633 @@ -502,7 +502,7 @@ name = "Hydrochloric Acid" description = "A very corrosive mineral acid with the molecular formula HCl." reagent_state = LIQUID - color = "#808080" + color = COLOR_GRAY power = 3 meltdose = 8 taste_description = "stomach acid" @@ -535,7 +535,7 @@ name = "Sodium" description = "A chemical element, readily reacts with water." reagent_state = SOLID - color = "#808080" + color = COLOR_GRAY taste_description = "salty metal" fallback_specific_heat = 0.483 diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm index 06dec49a8ca..6e6c30e3ea0 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm @@ -41,7 +41,7 @@ /singleton/reagent/crayon_dust/grey //Mime name = "Grey Crayon Dust" - color = "#808080" + color = COLOR_GRAY taste_description = "chalky crushed dreams" /singleton/reagent/crayon_dust/brown //Rainbow @@ -53,7 +53,7 @@ name = "Paint" description = "This paint will stick to almost any object." reagent_state = LIQUID - color = "#808080" + color = COLOR_GRAY overdose = REAGENTS_OVERDOSE * 0.5 color_weight = 0 taste_description = "chalk" @@ -441,14 +441,14 @@ name = "Glycerol" description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity." reagent_state = LIQUID - color = "#808080" + color = COLOR_GRAY taste_description = "sweetness" /singleton/reagent/nitroglycerin name = "Nitroglycerin" description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol." reagent_state = LIQUID - color = "#808080" + color = COLOR_GRAY taste_description = "oil" /singleton/reagent/nitroglycerin/proc/explode(var/datum/reagents/holder) diff --git a/html/changelogs/DreamySkrell-decals-floors.yml b/html/changelogs/DreamySkrell-decals-floors.yml new file mode 100644 index 00000000000..6cbb1d7f91c --- /dev/null +++ b/html/changelogs/DreamySkrell-decals-floors.yml @@ -0,0 +1,9 @@ + + +author: DreamySkrell + +delete-after: True + +changes: + - rscadd: "Adds floors, and recolores of existing floors." + - rscadd: "Adds floor markings and decals." diff --git a/icons/turf/decals/decals.dmi b/icons/turf/decals/decals.dmi index 42c1c37edb1..cb29f13dcbc 100644 Binary files a/icons/turf/decals/decals.dmi and b/icons/turf/decals/decals.dmi differ diff --git a/icons/turf/flooring/tiles.dmi b/icons/turf/flooring/tiles.dmi index 2f182fb124a..f175a7e38a3 100644 Binary files a/icons/turf/flooring/tiles.dmi and b/icons/turf/flooring/tiles.dmi differ diff --git a/maps/runtime/runtime-1.dmm b/maps/runtime/runtime-1.dmm index 745bafe0820..89217917a43 100644 --- a/maps/runtime/runtime-1.dmm +++ b/maps/runtime/runtime-1.dmm @@ -1465,6 +1465,9 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/gravity_gen) +"fM" = ( +/turf/unsimulated/wall/steel, +/area/template_noop) "fV" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/air/airlock, @@ -1622,10 +1625,6 @@ /obj/machinery/computer/ship/sensors/terminal, /turf/simulated/floor/tiled, /area/storage/primary) -"sT" = ( -/obj/effect/landmark/lobby_mobs_location, -/turf/unsimulated/floor, -/area/template_noop) "sU" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -1854,16 +1853,16 @@ /obj/machinery/computer/ship/helm, /turf/simulated/floor/tiled, /area/bridge) -"IQ" = ( -/obj/effect/landmark{ - name = "Observer-Start" - }, -/turf/simulated/wall/r_wall, -/area/maintenance/maintcentral) "IY" = ( /obj/machinery/computer/ship/engines, /turf/simulated/floor/plating, /area/storage/primary) +"Jd" = ( +/obj/effect/landmark{ + name = "Observer-Start" + }, +/turf/simulated/floor/plating, +/area/construction) "Jx" = ( /obj/machinery/computer/ship/helm, /turf/simulated/floor/shuttle, @@ -1916,6 +1915,10 @@ /obj/machinery/computer/ship/targeting/terminal, /turf/simulated/floor/tiled, /area/storage/primary) +"LM" = ( +/obj/effect/landmark/lobby_mobs_location, +/turf/unsimulated/floor, +/area/template_noop) "ME" = ( /obj/machinery/atmospherics/portables_connector/aux{ dir = 4 @@ -1933,9 +1936,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/maintcentral) -"NF" = ( -/turf/unsimulated/wall/steel, -/area/template_noop) "Ot" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 @@ -7260,7 +7260,7 @@ dA dq dq de -de +Jd de de du @@ -11090,7 +11090,7 @@ ac ac bU bU -IQ +ac wI ai at @@ -13934,8 +13934,8 @@ aa aa aa aa -NF -NF +fM +fM ac Uf Uf @@ -14191,8 +14191,8 @@ aa aa aa aa -NF -sT +fM +LM ac Uf Uf @@ -14448,8 +14448,8 @@ aa aa aa aa -NF -NF +fM +fM ac ac ac diff --git a/maps/runtime/runtime-3.dmm b/maps/runtime/runtime-3.dmm index 0e5b98a1f70..1f03f4aa910 100644 --- a/maps/runtime/runtime-3.dmm +++ b/maps/runtime/runtime-3.dmm @@ -51,6 +51,10 @@ /obj/structure/table/wood, /turf/simulated/floor/wood/birch, /area/construction/solars) +"ar" = ( +/obj/effect/floor_decal/industrial/outline_straight/grey, +/turf/simulated/floor/tiled, +/area/construction/solars) "aJ" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -125,6 +129,26 @@ }, /turf/simulated/floor, /area/construction/hallway) +"bF" = ( +/obj/effect/floor_decal/industrial/outline_straight/yellow, +/obj/effect/floor_decal/industrial/hatch_small/yellow{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) +"cb" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/simulated/floor/airless, +/area/template_noop) +"cB" = ( +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "cC" = ( /obj/structure/cable{ d1 = 1; @@ -151,6 +175,16 @@ }, /turf/simulated/floor/wood/birch, /area/construction/solars) +"dF" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "dN" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -197,6 +231,9 @@ }, /turf/simulated/floor/wood/bamboo, /area/construction/storage) +"eN" = ( +/turf/simulated/floor/tiled/gridded, +/area/construction/solars) "eT" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -264,6 +301,12 @@ }, /turf/simulated/floor/wood/birch, /area/construction/solars) +"fM" = ( +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "fV" = ( /obj/structure/cable{ d1 = 1; @@ -379,6 +422,16 @@ /obj/structure/railing/mapped, /turf/simulated/open, /area/construction/hallway) +"hF" = ( +/obj/effect/floor_decal/industrial/arrow/yellow, +/turf/simulated/floor/tiled, +/area/construction/solars) +"hG" = ( +/obj/effect/floor_decal/corner/grey/full{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "hQ" = ( /turf/simulated/wall, /area/construction/solars) @@ -399,6 +452,15 @@ }, /turf/simulated/floor/wood/birch, /area/construction/solars) +"if" = ( +/obj/effect/floor_decal/industrial/arrow/yellow{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) +"ii" = ( +/turf/simulated/floor/tiled/dark, +/area/construction/solars) "ip" = ( /obj/machinery/light{ brightness_range = 16; @@ -434,17 +496,13 @@ }, /turf/simulated/floor/wood/bamboo, /area/construction/storage) -"iO" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/construction/hallway) +"iF" = ( +/turf/simulated/floor/tiled/gunmetal/full, +/area/construction/solars) +"iG" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/construction/solars) "iV" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -511,6 +569,10 @@ }, /turf/simulated/floor, /area/antag/mercenary) +"ke" = ( +/obj/effect/floor_decal/industrial/outline_corner/yellow, +/turf/simulated/floor/tiled, +/area/construction/solars) "ku" = ( /obj/structure/cable{ d1 = 4; @@ -545,6 +607,18 @@ /obj/structure/bed/stool/bar/padded/red, /turf/simulated/floor/wood/birch, /area/construction/storage) +"lm" = ( +/obj/effect/floor_decal/industrial/outline_corner/yellow{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline_corner/yellow{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline_corner/yellow{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "lB" = ( /obj/machinery/light/small{ dir = 4 @@ -671,6 +745,9 @@ }, /turf/simulated/floor/tiled/full, /area/construction/solarscontrol) +"oy" = ( +/turf/simulated/floor/tiled/cargo, +/area/construction/solars) "oD" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -686,6 +763,12 @@ }, /turf/simulated/floor/reinforced, /area/construction/solars) +"oG" = ( +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "oI" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped{ @@ -730,16 +813,26 @@ "pz" = ( /turf/template_noop, /area/space) +"pE" = ( +/turf/simulated/floor/tiled/full, +/area/construction/solars) "pI" = ( /obj/machinery/door/airlock/generic/maintenance{ dir = 1 }, /turf/simulated/floor, /area/construction/qmaint) +"pL" = ( +/turf/simulated/floor/reinforced/large, +/area/construction/solars) "pM" = ( /obj/structure/lattice, /turf/template_noop, /area/template_noop) +"pT" = ( +/obj/structure/lattice, +/turf/simulated/floor/airless, +/area/template_noop) "pX" = ( /obj/machinery/light/small{ dir = 1 @@ -770,17 +863,35 @@ "qp" = ( /turf/simulated/floor/carpet/aquablue, /area/construction/storage) +"qv" = ( +/turf/simulated/floor/marble, +/area/construction/solars) "qx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/construction/hallway) +"qB" = ( +/turf/simulated/floor/tiled/rust, +/area/construction/solars) +"qD" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "qG" = ( /obj/structure/window{ dir = 4 }, /turf/simulated/floor/reinforced, /area/construction/solars) +"qP" = ( +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "qV" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor, @@ -789,6 +900,9 @@ /obj/structure/platform, /turf/simulated/floor/wood/birch, /area/construction/storage) +"rj" = ( +/turf/simulated/floor/tiled/gunmetal, +/area/construction/solars) "rw" = ( /obj/machinery/door/airlock/generic/maintenance{ dir = 4 @@ -805,12 +919,28 @@ }, /turf/simulated/floor/tiled, /area/construction/solars) +"rK" = ( +/turf/simulated/floor/tiled/light, +/area/construction/solars) +"rO" = ( +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) +"sb" = ( +/turf/simulated/floor/wood/bamboo, +/area/construction/solars) "sm" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/tiled, /area/construction/hallway) +"sn" = ( +/turf/simulated/floor/tiled/ridged, +/area/construction/solars) "sr" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -851,6 +981,21 @@ "sP" = ( /turf/simulated/floor/tiled/full, /area/construction/hallway) +"sQ" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) +"sS" = ( +/turf/simulated/floor/wood/mahogany, +/area/construction/solars) "td" = ( /turf/simulated/open, /area/construction/hallway) @@ -863,6 +1008,18 @@ "tl" = ( /turf/simulated/floor/wood/birch, /area/construction/storage) +"tz" = ( +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) +"tA" = ( +/obj/effect/floor_decal/industrial/outline_corner/yellow{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "tE" = ( /obj/structure/cable{ d1 = 1; @@ -908,6 +1065,33 @@ /obj/machinery/light, /turf/simulated/floor/wood/birch, /area/construction/storage) +"ut" = ( +/turf/simulated/floor/marble/dark, +/area/construction/solars) +"uu" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) +"uE" = ( +/turf/simulated/floor/plating, +/area/construction/solars) +"uT" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "uZ" = ( /obj/structure/table/rack, /obj/machinery/light/small{ @@ -923,6 +1107,11 @@ }, /turf/simulated/floor/tiled, /area/construction/hallway) +"vG" = ( +/turf/simulated/floor/tiled/bitile{ + dir = 1 + }, +/area/construction/solars) "vY" = ( /obj/machinery/door/airlock/external/merc{ dir = 1 @@ -982,24 +1171,27 @@ /obj/structure/grille/over/large, /turf/simulated/floor/tiled/full, /area/construction/hallway) -"wH" = ( -/obj/effect/landmark{ - name = "carpspawn" - }, -/turf/simulated/floor/airless, -/area/template_noop) "wL" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, /turf/simulated/floor/wood/bamboo, /area/construction/storage) +"wN" = ( +/obj/effect/floor_decal/industrial/arrow/yellow{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "wY" = ( /obj/structure/railing/mapped{ dir = 4 }, /turf/simulated/floor/tiled, /area/construction/solars) +"xf" = ( +/turf/simulated/floor/tiled/cargo/brass/full, +/area/construction/solars) "xj" = ( /obj/structure/cable{ d1 = 1; @@ -1044,6 +1236,10 @@ /obj/machinery/atmospherics/portables_connector, /turf/simulated/floor, /area/construction/qmaint) +"xA" = ( +/obj/effect/floor_decal/industrial/outline_door/red, +/turf/simulated/floor/tiled, +/area/construction/solars) "xH" = ( /obj/machinery/light/small{ dir = 1 @@ -1051,6 +1247,15 @@ /obj/machinery/firealarm/north, /turf/simulated/floor, /area/construction/supplyshuttle) +"xJ" = ( +/obj/structure/lattice/catwalk/indoor/grate/light, +/turf/simulated/floor/plating, +/area/construction/solars) +"xM" = ( +/turf/simulated/floor/tiled/bitile{ + dir = 4 + }, +/area/construction/solars) "yd" = ( /turf/simulated/floor/tiled/dark, /area/construction/solarscontrol) @@ -1145,6 +1350,23 @@ }, /turf/simulated/floor/tiled, /area/construction/solars) +"Al" = ( +/turf/simulated/floor/tiled/steel, +/area/construction/solars) +"Ay" = ( +/turf/simulated/floor/tiled/slate/full, +/area/construction/solars) +"AA" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/construction/hallway) "AC" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -1220,6 +1442,15 @@ }, /turf/simulated/floor/tiled, /area/construction/hallway) +"BC" = ( +/turf/simulated/floor/wood/yew, +/area/construction/solars) +"BE" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "BI" = ( /obj/item/modular_computer/console/preset/security/hos{ dir = 1 @@ -1346,6 +1577,15 @@ "DN" = ( /turf/simulated/floor/reinforced, /area/construction/solars) +"DS" = ( +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "DT" = ( /obj/machinery/atm{ dir = 1; @@ -1367,6 +1607,16 @@ }, /turf/template_noop, /area/template_noop) +"EG" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "EL" = ( /obj/structure/cable{ d1 = 1; @@ -1383,6 +1633,11 @@ }, /turf/simulated/floor/carpet/aquablue, /area/construction/solars) +"Fc" = ( +/turf/simulated/floor/tiled/bitile{ + dir = 2 + }, +/area/construction/solars) "Fu" = ( /obj/structure/table/steel, /obj/machinery/light{ @@ -1392,6 +1647,9 @@ }, /turf/simulated/floor/tiled, /area/construction/hallway) +"FK" = ( +/turf/simulated/floor/tiled/slate, +/area/construction/solars) "FV" = ( /obj/structure/cable{ d1 = 4; @@ -1403,10 +1661,23 @@ }, /turf/simulated/floor/wood/mahogany, /area/construction/solars) +"Gn" = ( +/turf/simulated/floor/wood, +/area/construction/solars) "Gt" = ( /obj/structure/platform_stairs, /turf/simulated/floor/wood/birch, /area/construction/storage) +"GK" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch_door/red, +/turf/simulated/floor/tiled, +/area/construction/solars) +"GM" = ( +/turf/simulated/floor/wood/ebony, +/area/construction/solars) "GO" = ( /obj/structure/railing/mapped, /obj/structure/railing/mapped{ @@ -1468,6 +1739,9 @@ }, /turf/simulated/floor/tiled, /area/construction/solars) +"Is" = ( +/turf/simulated/floor/tiled/cargo/full, +/area/construction/solars) "Iw" = ( /obj/machinery/light{ dir = 1 @@ -1490,6 +1764,11 @@ }, /turf/simulated/floor/tiled, /area/construction/hallway) +"IH" = ( +/turf/simulated/floor/tiled/bitile{ + dir = 8 + }, +/area/construction/solars) "IJ" = ( /obj/structure/window/shuttle/scc_space_ship/cardinal, /obj/structure/grille/over/large, @@ -1512,6 +1791,12 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/construction/hallway) +"Jn" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "Jx" = ( /obj/machinery/firealarm{ dir = 1; @@ -1529,6 +1814,9 @@ /obj/machinery/ringer_button, /turf/simulated/floor/tiled, /area/construction/solars) +"JM" = ( +/turf/simulated/floor/wood/walnut, +/area/construction/solars) "Kb" = ( /obj/machinery/light, /turf/simulated/floor/tiled, @@ -1556,6 +1844,12 @@ }, /turf/simulated/floor/carpet/aquablue, /area/construction/storage) +"KC" = ( +/obj/effect/floor_decal/industrial/arrow/yellow{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "KL" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -1605,6 +1899,19 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/full, /area/construction/solarscontrol) +"Lm" = ( +/turf/simulated/floor/tiled/freezer, +/area/construction/solars) +"Lp" = ( +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "Lu" = ( /obj/structure/railing/mapped, /turf/simulated/floor/tiled, @@ -1623,6 +1930,20 @@ }, /turf/simulated/floor/wood/birch, /area/construction/solars) +"Ma" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance_hatch, +/turf/simulated/floor/tiled, +/area/construction/solars) +"Mh" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "Mj" = ( /obj/structure/cable{ d1 = 4; @@ -1637,6 +1958,29 @@ }, /turf/simulated/floor, /area/antag/mercenary) +"Mz" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/arrow/yellow{ + pixel_x = -6; + pixel_y = 6; + dir = 4 + }, +/obj/effect/floor_decal/industrial/arrow/yellow{ + pixel_x = 6; + pixel_y = 6; + dir = 1 + }, +/obj/effect/floor_decal/industrial/arrow/yellow{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/effect/floor_decal/industrial/arrow/yellow{ + pixel_x = 6; + pixel_y = -6; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "MD" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1655,6 +1999,18 @@ }, /turf/simulated/floor/tiled/dark, /area/construction/qmaint) +"MO" = ( +/obj/effect/floor_decal/industrial/outline_corner/yellow{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline_corner/yellow{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline_corner/yellow{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "MP" = ( /obj/structure/railing/mapped{ dir = 8 @@ -1680,10 +2036,16 @@ "Na" = ( /turf/simulated/floor/tiled, /area/construction/solars) +"Ni" = ( +/turf/simulated/floor/tiled/dark/full, +/area/construction/solars) "Nk" = ( /obj/machinery/requests_console, /turf/simulated/floor/tiled, /area/construction/solars) +"Nv" = ( +/turf/simulated/floor/tiled/cargo/brass, +/area/construction/solars) "Nw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -1711,6 +2073,9 @@ /obj/structure/window_frame/shuttle/blue, /turf/simulated/floor, /area/antag/mercenary) +"NP" = ( +/turf/simulated/floor/tiled/light/full, +/area/construction/solars) "NW" = ( /obj/structure/cable{ d1 = 1; @@ -1722,6 +2087,12 @@ "Od" = ( /turf/simulated/wall/wood, /area/construction/solars) +"OS" = ( +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "Pg" = ( /obj/machinery/ringer{ dir = 4 @@ -1744,12 +2115,19 @@ }, /turf/simulated/floor/wood/birch, /area/construction/solars) +"Pk" = ( +/turf/simulated/floor/tiled/techmaint, +/area/construction/solars) "Pu" = ( /obj/effect/landmark{ name = "carpspawn" }, /turf/template_noop, /area/template_noop) +"Pv" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/construction/solars) "Pz" = ( /turf/simulated/wall/r_wall, /area/construction/hallway) @@ -1940,12 +2318,35 @@ }, /turf/simulated/floor/tiled, /area/construction/hallway) +"Sg" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) +"Sy" = ( +/turf/simulated/floor/tiled/techfloor, +/area/construction/solars) +"Sz" = ( +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "SB" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/tiled, /area/construction/hallway) +"SD" = ( +/obj/effect/floor_decal/industrial/outline_straight/yellow, +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "SN" = ( /obj/machinery/door/airlock/external/merc{ dir = 1 @@ -1967,12 +2368,30 @@ }, /turf/simulated/floor, /area/construction/qmaint) +"Tg" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "Th" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, /turf/simulated/floor/wood/bamboo, /area/construction/storage) +"To" = ( +/obj/effect/floor_decal/industrial/hatch_tiny/yellow{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "Ts" = ( /obj/machinery/firealarm/north, /turf/simulated/floor/tiled, @@ -1984,6 +2403,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor, /area/construction/qmaint) +"Tz" = ( +/turf/simulated/floor/tiled/yellow, +/area/construction/solars) "TM" = ( /obj/machinery/newscaster{ dir = 4 @@ -2061,6 +2483,15 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor, /area/antag/mercenary) +"Vw" = ( +/obj/effect/floor_decal/industrial/outline_straight/yellow{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch_small/yellow{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "VE" = ( /obj/machinery/power/apc/north, /turf/simulated/floor/tiled/dark, @@ -2079,6 +2510,12 @@ /obj/structure/table/wood, /turf/simulated/floor/carpet/aquablue, /area/construction/storage) +"Wm" = ( +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "Wo" = ( /obj/machinery/light{ brightness_range = 16; @@ -2120,10 +2557,18 @@ /obj/machinery/power/breakerbox, /turf/simulated/floor, /area/construction/supplyshuttle) -"XA" = ( -/obj/structure/lattice, -/turf/simulated/floor/airless, -/area/template_noop) +"Xk" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) +"Xs" = ( +/turf/simulated/floor/tiled/white, +/area/construction/solars) +"XV" = ( +/turf/simulated/floor/tiled/red, +/area/construction/solars) "Yi" = ( /obj/machinery/atmospherics/binary/pump/on, /obj/machinery/light/small{ @@ -2131,6 +2576,16 @@ }, /turf/simulated/floor, /area/construction/hallway) +"Yq" = ( +/obj/structure/lattice/catwalk/indoor/grate/slate, +/turf/simulated/floor/plating, +/area/construction/solars) +"Yr" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/construction/solars) "YH" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood/bamboo, @@ -5261,7 +5716,7 @@ Bc Bc Pz Dg -iO +AA Pz Bc Bc @@ -13484,13 +13939,13 @@ pM pM pM pM -XA -XA -XA -XA -XA -XA -XA +pT +pT +pT +pT +pT +pT +pT pM pM pM @@ -14513,7 +14968,7 @@ nA nA nA Bc -wH +cb Bc Bc Bc @@ -35793,20 +36248,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv pz Uv Uv @@ -36050,20 +36505,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +DN +DN +DN +DN +DN +DN +DN +DN +DN +DN +DN +Uv pz Uv Na @@ -36307,20 +36762,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +Pv +rj +iF +DN +eN +eN +eN +DN +DN +To +fM +Uv pz Uv Na @@ -36564,20 +37019,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +Yq +FK +Ay +DN +sn +sn +sn +DN +DN +DS +SD +Uv pz Uv MP @@ -36821,20 +37276,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +xJ +rK +NP +DN +Sy +Pk +uE +DN +DN +Vw +bF +Uv pz Uv Na @@ -37078,20 +37533,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +iG +Na +pE +DN +DN +DN +DN +DN +DN +qP +OS +Uv pz Uv Na @@ -37335,20 +37790,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +Pv +ii +Ni +DN +pL +pL +pL +pL +DN +hF +if +Uv pz Uv Na @@ -37592,20 +38047,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +DN +XV +Tz +DN +DN +DN +DN +DN +DN +Mz +Na +Uv pz Uv wY @@ -37849,20 +38304,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +DN +Xs +Lm +DN +IH +IH +vG +Fc +DN +To +To +Uv pz Uv Na @@ -38106,20 +38561,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +DN +qv +ut +DN +xM +xM +vG +Fc +DN +tA +ke +Uv pz Uv Lu @@ -38363,20 +38818,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +DN +Al +qB +DN +DN +DN +DN +DN +DN +Wm +tz +Uv pz Uv Lu @@ -38620,20 +39075,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +DN +oy +Is +DN +Gn +sb +um +GM +DN +MO +lm +Uv pz Uv Lu @@ -38877,20 +39332,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +DN +Nv +xf +DN +sS +JM +BC +Gn +DN +wN +KC +Uv pz Uv Na @@ -39134,20 +39589,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +DN +DN +DN +DN +DN +DN +DN +DN +DN +DN +DN +DN +Uv pz Uv Uv @@ -39391,20 +39846,20 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz -pz +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv +Uv pz pz pz @@ -39655,13 +40110,13 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz +Uv +ar +Uv +oG +Na +Na +Uv pz pz pz @@ -39912,13 +40367,13 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz +Uv +xA +Ma +Yr +Na +Na +Uv pz pz pz @@ -40169,13 +40624,13 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz +Uv +ar +Uv +qP +Jn +Sz +Uv pz pz pz @@ -40426,13 +40881,13 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz +Uv +ar +Uv +Uv +EG +Uv +Uv pz pz pz @@ -40683,13 +41138,13 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz +Uv +rO +Sg +uu +Mh +BE +Uv pz pz pz @@ -40940,13 +41395,13 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz +Uv +cB +Sg +uT +sQ +Na +Uv pz pz pz @@ -41197,13 +41652,13 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz +Uv +Xk +Uv +Uv +GK +Uv +Uv pz pz pz @@ -41454,13 +41909,13 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz +Uv +Xk +Uv +hG +dF +BE +Uv pz pz pz @@ -41711,13 +42166,13 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz +Uv +Lp +Sg +Tg +Na +Na +Uv pz pz pz @@ -41968,13 +42423,13 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz +Uv +Xk +Uv +qD +Na +Na +Uv pz pz pz @@ -42225,13 +42680,13 @@ pz pz pz pz -pz -pz -pz -pz -pz -pz -pz +Uv +Uv +Uv +Uv +Uv +Uv +Uv pz pz pz