diff --git a/code/game/machinery/doors/airlock_angled_tgmc.dm b/code/game/machinery/doors/airlock_angled_tgmc.dm index c810e3d687..4ff1b8aba3 100644 --- a/code/game/machinery/doors/airlock_angled_tgmc.dm +++ b/code/game/machinery/doors/airlock_angled_tgmc.dm @@ -1,77 +1,60 @@ /obj/machinery/door/airlock/angled_tgmc dir = 2 anim_length_before_finalize = 3 + icon = 'icons/obj/doors/angled/tgmc/generic.dmi' /obj/machinery/door/airlock/angled_tgmc/cell - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/celldoor.dmi' /obj/machinery/door/airlock/angled_tgmc/command - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/comdoor.dmi' /obj/machinery/door/airlock/angled_tgmc/dropship1_pilot - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/dropship1_pilot.dmi' /obj/machinery/door/airlock/angled_tgmc/dropship2_pilot - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/dropship2_pilot.dmi' /obj/machinery/door/airlock/angled_tgmc/engineering - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/engidoor.dmi' + glass = TRUE + opacity = FALSE /obj/machinery/door/airlock/angled_tgmc/maintenance - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/maintdoor.dmi' /obj/machinery/door/airlock/angled_tgmc/medical - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/medidoor.dmi' /obj/machinery/door/airlock/angled_tgmc/medical_glass - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/medidoor_glass.dmi' glass = TRUE opacity = FALSE /obj/machinery/door/airlock/angled_tgmc/personal - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/personaldoor.dmi' /obj/machinery/door/airlock/angled_tgmc/pod - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/pod_doors.dmi' /obj/machinery/door/airlock/angled_tgmc/prep - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/prepdoor.dmi' glass = TRUE opacity = FALSE /obj/machinery/door/airlock/angled_tgmc/prep/prep_alpha - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/prepdoor_alpha.dmi' /obj/machinery/door/airlock/angled_tgmc/prep/prep_bravo - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/prepdoor_bravo.dmi' /obj/machinery/door/airlock/angled_tgmc/prep/prep_charlie - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/prepdoor_charlie.dmi' /obj/machinery/door/airlock/angled_tgmc/prep/prep_delta - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/prepdoor_delta.dmi' /obj/machinery/door/airlock/angled_tgmc/security - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/secdoor.dmi' /obj/machinery/door/airlock/angled_tgmc/security_glass - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/secdoor_glass.dmi' glass = TRUE opacity = FALSE /obj/machinery/door/airlock/angled_tgmc/secure - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/securedoor.dmi' // firedoor /* /obj/machinery/door/airlock/angled_tgmc/ - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/purinadoor.dmi' */ // blastdoor /* /obj/machinery/door/airlock/angled_tgmc/ - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/blastdoors_shutters.dmi' */ /obj/machinery/door/airlock/angled_tgmc/wide @@ -107,28 +90,52 @@ bound_height = world.icon_size /obj/machinery/door/airlock/angled_tgmc/wide/command - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/2x1comdoor.dmi' /obj/machinery/door/airlock/angled_tgmc/wide/generic - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/2x1generic.dmi' +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel + icon = 'icons/obj/doors/angled/tgmc/2x1generic_steel.dmi' /obj/machinery/door/airlock/angled_tgmc/wide/medical - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/2x1medidoor.dmi' /obj/machinery/door/airlock/angled_tgmc/wide/security - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/2x1secdoor.dmi' /obj/machinery/door/airlock/angled_tgmc/wide/dropship1 width = 3 anim_length_before_finalize = 5 - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/dropship1_cargo.dmi' glass = FALSE opacity = TRUE /obj/machinery/door/airlock/angled_tgmc/wide/dropship2 width = 3 anim_length_before_finalize = 5 - icon_state = "door_closed" icon = 'icons/obj/doors/angled/tgmc/dropship2_cargo.dmi' glass = FALSE - opacity = TRUE \ No newline at end of file + opacity = TRUE + +/obj/machinery/door/blast/angled + icon = 'icons/obj/doors/angled/tgmc/blastdoors_shutters.dmi' + icon_state_open = "pdoor0" + icon_state_opening = "pdoorc0" + icon_state_closed = "pdoor1" + icon_state_closing = "pdoorc1" + icon_state = "pdoor1" + maxhealth = 600 + +/obj/machinery/door/blast/angled/open + icon_state = "pdoor0" + density = FALSE + opacity = 0 + +/obj/machinery/door/blast/angled_shutter + icon = 'icons/obj/doors/angled/tgmc/blastdoors_shutters.dmi' + icon_state_open = "shutter0" + icon_state_opening = "shutterc0" + icon_state_closed = "shutter1" + icon_state_closing = "shutterc1" + icon_state = "shutter1" + maxhealth = 600 + +/obj/machinery/door/blast/angled_shutter/open + icon_state = "shutter0" + density = FALSE + opacity = 0 diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index c3df6f1608..6a3f2cea1b 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -276,7 +276,7 @@ /obj/structure/low_wall/bay icon = 'icons/obj/wall_frame_bay.dmi' grille_type = /obj/structure/grille/bay - blend_objects = list(/obj/machinery/door, /turf/simulated/wall/bay) + blend_objects = list(/obj/machinery/door, /turf/simulated/wall/bay, /turf/simulated/wall/tgmc) /obj/structure/low_wall/bay/reinforced default_material = MAT_PLASTEEL @@ -295,7 +295,7 @@ /obj/structure/low_wall/eris icon = 'icons/obj/wall_frame_eris.dmi' grille_type = null - blend_objects = list(/obj/machinery/door, /turf/simulated/wall/eris) + blend_objects = list(/obj/machinery/door, /turf/simulated/wall/eris, /turf/simulated/wall/tgmc) /obj/structure/low_wall/eris/reinforced default_material = MAT_PLASTEEL diff --git a/code/game/turfs/flooring/flooring_decals_vr.dm b/code/game/turfs/flooring/flooring_decals_vr.dm index 8040b4139a..ada7aba806 100644 --- a/code/game/turfs/flooring/flooring_decals_vr.dm +++ b/code/game/turfs/flooring/flooring_decals_vr.dm @@ -135,4 +135,92 @@ icon_state = "itgdauntless" /obj/effect/floor_decal/emblem/aronai - icon_state = "aronai" \ No newline at end of file + icon_state = "aronai" + +/obj/effect/floor_decal/emblem/nt1 + icon_state = "nt1" +/obj/effect/floor_decal/emblem/nt2 + icon_state = "nt2" +/obj/effect/floor_decal/emblem/nt3 + icon_state = "nt3" + +/obj/effect/floor_decal/milspec/stripe + icon_state = "ms_plating_striped" +/obj/effect/floor_decal/milspec/hatchmarks + icon_state = "ms_test_floor4" +/obj/effect/floor_decal/milspec/box + icon_state = "ms_test_floor5" +/obj/effect/floor_decal/milspec/cargo + icon_state = "ms_cargo" +/obj/effect/floor_decal/milspec/cargo_arrow + icon_state = "ms_cargo_arrow" +/obj/effect/floor_decal/milspec/monotile + icon_state = "ms_mono" + +/obj/effect/floor_decal/milspec/color/blue + icon_state = "ms_bluefull" +/obj/effect/floor_decal/milspec/color/blue/corner + icon_state = "ms_bluecorner" +/obj/effect/floor_decal/milspec/color/blue/half + icon_state = "ms_blue" +/obj/effect/floor_decal/milspec/color/red + icon_state = "ms_redfull" +/obj/effect/floor_decal/milspec/color/red/corner + icon_state = "ms_redcorner" +/obj/effect/floor_decal/milspec/color/red/half + icon_state = "ms_red" +/obj/effect/floor_decal/milspec/color/purple + icon_state = "ms_purplefull" +/obj/effect/floor_decal/milspec/color/purple/corner + icon_state = "ms_purplecorner" +/obj/effect/floor_decal/milspec/color/purple/half + icon_state = "ms_purple" +/obj/effect/floor_decal/milspec/color/emerald + icon_state = "ms_emeraldfull" +/obj/effect/floor_decal/milspec/color/emerald/corner + icon_state = "ms_emeraldcorner" +/obj/effect/floor_decal/milspec/color/emerald/half + icon_state = "ms_emerald" +/obj/effect/floor_decal/milspec/color/orange + icon_state = "ms_orangefull" +/obj/effect/floor_decal/milspec/color/orange/corner + icon_state = "ms_orangecorner" +/obj/effect/floor_decal/milspec/color/orange/half + icon_state = "ms_orange" +/obj/effect/floor_decal/milspec/color/green + icon_state = "ms_greenfull" +/obj/effect/floor_decal/milspec/color/green/corner + icon_state = "ms_greencorner" +/obj/effect/floor_decal/milspec/color/green/half + icon_state = "ms_green" +/obj/effect/floor_decal/milspec/color/black + icon_state = "ms_blackfull" +/obj/effect/floor_decal/milspec/color/black/corner + icon_state = "ms_blackcorner" +/obj/effect/floor_decal/milspec/color/black/half + icon_state = "ms_black" +/obj/effect/floor_decal/milspec/color/silver + icon_state = "ms_silverfull" +/obj/effect/floor_decal/milspec/color/silver/corner + icon_state = "ms_silvercorner" +/obj/effect/floor_decal/milspec/color/silver/half + icon_state = "ms_silver" +/obj/effect/floor_decal/milspec/color/white + icon_state = "ms_whitefull" +/obj/effect/floor_decal/milspec/color/white/corner + icon_state = "ms_whitecorner" +/obj/effect/floor_decal/milspec/color/white/half + icon_state = "ms_white" + +/obj/effect/floor_decal/milspec_sterile/purple + icon_state = "mss_purple" +/obj/effect/floor_decal/milspec_sterile/purple/corner + icon_state = "mss_purple_corner" +/obj/effect/floor_decal/milspec_sterile/purple/half + icon_state = "mss_purple_side" +/obj/effect/floor_decal/milspec_sterile/green + icon_state = "mss_green" +/obj/effect/floor_decal/milspec_sterile/green/corner + icon_state = "mss_green_corner" +/obj/effect/floor_decal/milspec_sterile/green/half + icon_state = "mss_green_side" diff --git a/code/game/turfs/flooring/flooring_vr.dm b/code/game/turfs/flooring/flooring_vr.dm index 5ba1dfffb5..4f3a801064 100644 --- a/code/game/turfs/flooring/flooring_vr.dm +++ b/code/game/turfs/flooring/flooring_vr.dm @@ -60,3 +60,58 @@ name = "dark pattern" icon = 'icons/turf/flooring/circuit_vr.dmi' icon_base = "rcircuitanim_broken" + +/decl/flooring/tiling/milspec + name = "milspec floor" + desc = "Scuffed from the passage of countless ground pounders." + icon = 'icons/turf/flooring/tiles_vr.dmi' + icon_base = "milspec" + has_damage_range = 2 + damage_temperature = T0C+1400 + flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK | TURF_CAN_BURN + build_type = /obj/item/stack/tile/floor/milspec + plating_type = /decl/flooring/eris_plating/under + can_paint = 1 + can_engrave = TRUE + footstep_sounds = list("human" = list( + 'sound/effects/footstep/floor1.ogg', + 'sound/effects/footstep/floor2.ogg', + 'sound/effects/footstep/floor3.ogg', + 'sound/effects/footstep/floor4.ogg', + 'sound/effects/footstep/floor5.ogg')) + +/turf/simulated/floor/tiled/milspec + name = "milspec floor" + desc = "Scuffed from the passage of countless ground pounders." + icon = 'icons/turf/flooring/tiles_vr.dmi' + icon_state = "milspec" + initial_flooring = /decl/flooring/tiling/milspec + +/obj/item/stack/tile/floor/milspec + name = "milspec floor tile" + +/decl/flooring/tiling/milspec/sterile + name = "sterile milspec floor" + icon_base = "dark_sterile" + build_type = /obj/item/stack/tile/floor/milspec/sterile + +/turf/simulated/floor/tiled/milspec/sterile + name = "sterile milspec floor" + icon_state = "dark_sterile" + initial_flooring = /decl/flooring/tiling/milspec/sterile + +/obj/item/stack/tile/floor/milspec/sterile + name = "sterile milspec floor tile" + +/decl/flooring/tiling/milspec/raised + name = "raised milspec floor" + icon_base = "milspec_tcomms" + build_type = /obj/item/stack/tile/floor/milspec/raised + +/turf/simulated/floor/tiled/milspec/raised + name = "raised milspec floor" + icon_state = "milspec_tcomms" + initial_flooring = /decl/flooring/tiling/milspec/raised + +/obj/item/stack/tile/floor/milspec/raised + name = "raised milspec floor tile" \ No newline at end of file diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index b4ee72a333..f428e043c9 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -385,6 +385,7 @@ /turf/simulated/wall/eris/can_join_with_low_wall(var/obj/structure/low_wall/WF) return istype(WF, /obj/structure/low_wall/eris) + /turf/simulated/wall/eris/special_wall_connections(list/dirs, list/inrange) ..() for(var/direction in cardinal) @@ -458,3 +459,281 @@ icon_state = "rgeneric" /turf/simulated/wall/bay/r_wall/Initialize(mapload) . = ..(mapload, "plasteel","plasteel") + +/turf/simulated/wall/tgmc + icon = 'icons/turf/wall_masks_tgmc.dmi' + wall_masks = 'icons/turf/wall_masks_tgmc.dmi' // not really a MASK per-se, I guess + icon_state = "metal0" + + var/list/blend_objects = list(/obj/machinery/door) + var/list/noblend_objects = list(/obj/machinery/door/window, /obj/machinery/door/firedoor) + + var/wall_base_state = "metal" + var/wall_blend_category = "metal" + var/force_icon + var/list/blend_log = list() + var/strict_blending = FALSE + var/diagonal_blending = FALSE + +// *INHALE +/turf/simulated/wall/tgmc/update_icon() + if(!damage_overlays[1]) //list hasn't been populated + generate_overlays() + + cut_overlays() + + if(force_icon) + icon_state = "[wall_base_state][force_icon]" + else + icon_state = "[wall_base_state][wall_connections]" + + if(damage != 0) + var/integrity = material.integrity + if(reinf_material) + integrity += reinf_material.integrity + + var/overlay = round(damage / integrity * damage_overlays.len) + 1 + if(overlay > damage_overlays.len) + overlay = damage_overlays.len + + add_overlay(damage_overlays[overlay]) + +/turf/simulated/wall/tgmc/update_connections(propagate) + if(!material) + return + var/dirs = 0 + var/list_to_use = diagonal_blending ? alldirs : cardinal + main_direction_loop: + for(var/direction in list_to_use) + var/turf/simulated/wall/tgmc/W = get_step(src, direction) + if(strict_blending) + if(istype(W, src)) + dirs |= direction + continue main_direction_loop + + var/decided_to_blend = FALSE + for(var/obj/O in W) + for(var/b_type in blend_objects) + if(istype(O, b_type)) + decided_to_blend = TRUE + for(var/obj/structure/S in W) + if(istype(S, src)) + decided_to_blend = FALSE + for(var/nb_type in noblend_objects) + if(istype(O, nb_type)) + decided_to_blend = FALSE + + if(decided_to_blend) + blend_log += "Blending with [O] at [direction] because special said to" + dirs |= direction + continue main_direction_loop + + for(var/obj/structure/low_wall/WF in W) + if(can_join_with_low_wall(WF)) + dirs |= direction + blend_log += "Blending with [WF] at [get_dir(src, WF)] because can join with that low wall" + continue main_direction_loop + + // Needs to be our type of wall to blend from this point + if(!istype(W)) + continue + if(propagate) + W.update_connections() + W.update_icon() + if(W.wall_blend_category == wall_blend_category) + dirs |= direction + blend_log += "Blending with [W] at [get_dir(src, W)] because blend category is the same" + + wall_connections = dirs + +/turf/simulated/wall/tgmc/can_join_with_low_wall(var/obj/structure/low_wall/WF) + return istype(WF, /obj/structure/low_wall) + +/turf/simulated/wall/tgmc/rwall + icon_state = "rwall0" + wall_base_state = "rwall" + wall_blend_category = "rwall" +/turf/simulated/wall/tgmc/rwall/Initialize(mapload) + . = ..(mapload, MAT_PLASTEEL,MAT_PLASTEEL) + +/turf/simulated/wall/tgmc/gray + icon_state = "gray0" + wall_base_state = "gray" + wall_blend_category = "gray" +/turf/simulated/wall/tgmc/gwall/Initialize(mapload) + . = ..(mapload, MAT_PLASTEEL,MAT_PLASTEEL) + +/turf/simulated/wall/tgmc/darkwall + icon_state = "darkwall0" + wall_base_state = "darkwall" + wall_blend_category = "darkwall" +/turf/simulated/wall/tgmc/darkwall/Initialize(mapload) + . = ..(mapload, MAT_PLASTEEL,MAT_PLASTEEL) +/turf/simulated/wall/tgmc/darkwall/deco0 + icon_state = "darkwall_deco0" + force_icon = "_deco0" +/turf/simulated/wall/tgmc/darkwall/deco1 + icon_state = "darkwall_deco1" + force_icon = "_deco1" +/turf/simulated/wall/tgmc/darkwall/deco2 + icon_state = "darkwall_deco2" + force_icon = "_deco2" +/turf/simulated/wall/tgmc/darkwall/deco3 + icon_state = "darkwall_deco3" + force_icon = "_deco3" + +/turf/simulated/wall/tgmc/whitewall + icon_state = "white0" + wall_base_state = "white" + wall_blend_category = "white" +/turf/simulated/wall/tgmc/whitewall/Initialize(mapload) + . = ..(mapload, MAT_STEEL,MAT_PLASTIC) + +/turf/simulated/wall/tgmc/durawall + icon_state = "darkband0" + wall_base_state = "darkband" + wall_blend_category = "darkband" +/turf/simulated/wall/tgmc/durawall/Initialize(mapload) + . = ..(mapload, MAT_DURASTEEL,MAT_DURASTEEL) +/turf/simulated/wall/tgmc/durawall/deco0 + icon_state = "darkband_deco0" + force_icon = "_deco0" +/turf/simulated/wall/tgmc/durawall/deco1 + icon_state = "darkband_deco1" + force_icon = "_deco1" +/turf/simulated/wall/tgmc/durawall/deco2 + icon_state = "darkband_deco2" + force_icon = "_deco2" +/turf/simulated/wall/tgmc/durawall/deco3 + icon_state = "darkband_deco3" + force_icon = "_deco3" + +/turf/simulated/wall/tgmc/sanitary + icon_state = "whiteband0" + wall_base_state = "whiteband" + wall_blend_category = "whiteband" +/turf/simulated/wall/tgmc/sanitary/Initialize(mapload) + . = ..(mapload, MAT_PLASTEEL,MAT_PLASTEEL) + +/turf/simulated/wall/tgmc/chigusa + icon_state = "chigusa0" + wall_base_state = "chigusa" + wall_blend_category = "chigusa" +/turf/simulated/wall/tgmc/chigusa/Initialize(mapload) + . = ..(mapload, MAT_CHITIN,MAT_CHITIN) +/turf/simulated/wall/tgmc/chigusa/deco0 + icon_state = "chigusa_deco0" + force_icon = "_deco0" +/turf/simulated/wall/tgmc/chigusa/deco1 + icon_state = "chigusa_deco1" + force_icon = "_deco1" +/turf/simulated/wall/tgmc/chigusa/deco2 + icon_state = "chigusa_deco2" + force_icon = "_deco2" + +/turf/simulated/wall/tgmc/redstripe + icon_state = "redstripe0" + wall_base_state = "redstripe" + wall_blend_category = "redstripe" +/turf/simulated/wall/tgmc/redstripe/Initialize(mapload) + . = ..(mapload, MAT_PLASTEELHULL,MAT_PLASTEELHULL) + +/turf/simulated/wall/tgmc/redstripe_r + icon_state = "redstriper0" + wall_base_state = "redstriper" + wall_blend_category = "redstriper" +/turf/simulated/wall/tgmc/redstripe_r/Initialize(mapload) + . = ..(mapload, MAT_DURASTEELHULL,MAT_DURASTEELHULL) + +/turf/simulated/wall/tgmc/plain_redstripe + icon_state = "predstripe0" + wall_base_state = "predstripe" + wall_blend_category = "predstripe" +/turf/simulated/wall/tgmc/plain_redstripe/Initialize(mapload) + . = ..(mapload, MAT_PLASTEEL,MAT_PLASTEEL) + +/turf/simulated/wall/tgmc/plain_redstripe_r + icon_state = "predstriper0" + wall_base_state = "predstriper" + wall_blend_category = "predstriper" +/turf/simulated/wall/tgmc/plain_redstripe_r/Initialize(mapload) + . = ..(mapload, MAT_DURASTEEL,MAT_DURASTEEL) + +#define WINDOW_GLASS 0x1 +#define WINDOW_RGLASS 0x2 +/turf/simulated/wall/tgmc/window + icon = 'icons/turf/wall_masks_tgmc_win.dmi' + wall_masks = 'icons/turf/wall_masks_tgmc_win.dmi' // not really a MASK per-se, I guess + icon_state = "metal_window0" + wall_base_state = "metal_window" + wall_blend_category = "metal" + + opacity = 0 + var/window_types = WINDOW_GLASS + strict_blending = TRUE + diagonal_blending = TRUE + +/turf/simulated/wall/tgmc/window/rwall + icon_state = "rwall_window0" + wall_base_state = "rwall_window" + wall_blend_category = "rwall" + window_types = WINDOW_RGLASS + +/turf/simulated/wall/tgmc/window/rwall + icon_state = "rwall_rwindow0" + wall_base_state = "rwall_rwindow" + wall_blend_category = "rwall" + window_types = WINDOW_RGLASS + +/turf/simulated/wall/tgmc/window/gray + icon_state = "gray_window0" + wall_base_state = "gray_window" + wall_blend_category = "gray" + window_types = WINDOW_GLASS|WINDOW_RGLASS + +/turf/simulated/wall/tgmc/window/gray/reinf + icon_state = "gray_rwindow0" + wall_base_state = "gray_rwindow" + +/turf/simulated/wall/tgmc/window/white + icon_state = "white_window0" + wall_base_state = "white_window" + wall_blend_category = "white" + window_types = WINDOW_GLASS|WINDOW_RGLASS + diagonal_blending = FALSE + +/turf/simulated/wall/tgmc/window/white/reinf + icon_state = "white_rwindow0" + wall_base_state = "white_rwindow" + +/turf/simulated/wall/tgmc/window/chigusa + icon_state = "chigusa_rwindow0" + wall_base_state = "chigusa_rwindow" + wall_blend_category = "chigusa" + window_types = WINDOW_RGLASS + diagonal_blending = FALSE + +/turf/simulated/wall/tgmc/window/redstripe_r + icon_state = "predstriper_window0" + wall_base_state = "predstriper_window" + wall_blend_category = "predstriper" + window_types = WINDOW_GLASS|WINDOW_RGLASS + +/turf/simulated/wall/tgmc/window/redstripe_r/reinf + icon_state = "predstriper_rwindow0" + wall_base_state = "predstriper_rwindow" + wall_blend_category = "predstriper" + +/turf/simulated/wall/tgmc/window/darkwall + icon_state = "darkwall_window0" + wall_base_state = "darkwall_window" + wall_blend_category = "darkwall" + window_types = WINDOW_GLASS|WINDOW_RGLASS + diagonal_blending = FALSE + +/turf/simulated/wall/tgmc/window/darkwall/reinf + icon_state = "darkwall_rwindow0" + wall_base_state = "darkwall_rwindow" + +#undef WINDOW_GLASS +#undef WINDOW_RGLASS \ No newline at end of file diff --git a/icons/obj/doors/angled/tgmc/2x1generic_steel.dmi b/icons/obj/doors/angled/tgmc/2x1generic_steel.dmi new file mode 100644 index 0000000000..cd2828bc62 Binary files /dev/null and b/icons/obj/doors/angled/tgmc/2x1generic_steel.dmi differ diff --git a/icons/obj/doors/angled/tgmc/blastdoors_shutters.dmi b/icons/obj/doors/angled/tgmc/blastdoors_shutters.dmi index 75dcf76ea5..b4264932b0 100644 Binary files a/icons/obj/doors/angled/tgmc/blastdoors_shutters.dmi and b/icons/obj/doors/angled/tgmc/blastdoors_shutters.dmi differ diff --git a/icons/obj/doors/angled/tgmc/generic.dmi b/icons/obj/doors/angled/tgmc/generic.dmi new file mode 100644 index 0000000000..f6d5165d42 Binary files /dev/null and b/icons/obj/doors/angled/tgmc/generic.dmi differ diff --git a/icons/turf/flooring/decals_vr.dmi b/icons/turf/flooring/decals_vr.dmi index 383eb972da..29a4bb508f 100644 Binary files a/icons/turf/flooring/decals_vr.dmi and b/icons/turf/flooring/decals_vr.dmi differ diff --git a/icons/turf/flooring/tiles_vr.dmi b/icons/turf/flooring/tiles_vr.dmi index 2b87ddaab0..77c699d107 100644 Binary files a/icons/turf/flooring/tiles_vr.dmi and b/icons/turf/flooring/tiles_vr.dmi differ diff --git a/icons/turf/wall_masks_tgmc.dmi b/icons/turf/wall_masks_tgmc.dmi new file mode 100644 index 0000000000..e3ee846935 Binary files /dev/null and b/icons/turf/wall_masks_tgmc.dmi differ diff --git a/icons/turf/wall_masks_tgmc_win.dmi b/icons/turf/wall_masks_tgmc_win.dmi new file mode 100644 index 0000000000..db76737fa6 Binary files /dev/null and b/icons/turf/wall_masks_tgmc_win.dmi differ diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm index fa319b600b..e919f1b4b9 100644 --- a/maps/offmap_vr/om_ships/aro3.dmm +++ b/maps/offmap_vr/om_ships/aro3.dmm @@ -6,7 +6,7 @@ /obj/machinery/mecha_part_fabricator{ req_access = list() }, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "af" = ( /obj/structure/cable/cyan{ @@ -24,10 +24,17 @@ /obj/structure/cable/cyan{ icon_state = "2-8" }, +<<<<<<< HEAD /obj/structure/cable/cyan{ icon_state = "2-4" }, /turf/simulated/floor/tiled/eris/dark/danger, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/simulated/floor/tiled/eris/dark/danger, +======= +/obj/effect/floor_decal/milspec/color/green/half, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/eva_hall) "ak" = ( /obj/structure/toilet{ @@ -36,25 +43,34 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_port_wc) "am" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark/danger, <<<<<<< HEAD /area/space) ||||||| parent of 7857275f5a... Merge pull request #11213 from VOREStation/Arokha/aro3 /area/aro3/flight_deck) ======= +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/simulated/floor/tiled/eris/dark/danger, +======= +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/flight_deck) "ap" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/suite_port) >>>>>>> 7857275f5a... Merge pull request #11213 from VOREStation/Arokha/aro3 "aq" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/power) "at" = ( /obj/structure/cable/cyan{ @@ -63,10 +79,17 @@ /turf/simulated/wall/rpshull, /area/space) "au" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark, -/area/aro3/surfluid) +/obj/machinery/button/remote/blast_door{ + id = "aroshipshutter_portair"; + name = "exterior shutters"; + pixel_x = -1; + pixel_y = 23 + }, +/obj/effect/floor_decal/milspec/color/white/half{ + dir = 5 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) "av" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -74,7 +97,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "ax" = ( /obj/machinery/atmospherics/portables_connector{ @@ -88,34 +114,49 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "aB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) +"aC" = ( +/turf/simulated/wall/tgmc/durawall/deco1, +/area/aro3/power) "aG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "aH" = ( /obj/machinery/autolathe, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "aJ" = ( /obj/effect/floor_decal/steeldecal/steel_decals10, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) +"aK" = ( +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) "aL" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 5 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "aO" = ( /obj/structure/cable/cyan{ @@ -129,7 +170,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "aS" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -138,14 +179,23 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "aU" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/suite_starboard) +"aV" = ( +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 10 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) "aY" = ( /obj/structure/railing/grey{ dir = 4 @@ -171,7 +221,10 @@ name = "trash bin"; pixel_y = 3 }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 6 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "bg" = ( /obj/machinery/atmospherics/portables_connector{ @@ -182,19 +235,27 @@ /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "bk" = ( -/obj/machinery/door/airlock/angled_bay/standard{ +/obj/machinery/door/airlock/angled_tgmc/cell{ dir = 4; id_tag = "aro3_private1"; +<<<<<<< HEAD name = "private quarters 1"; stripe_color = "#00AA00 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc + name = "private quarters 1"; + stripe_color = "#00AA00" +======= + name = "private quarters 1" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/dark/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/suite_port) "bn" = ( /obj/structure/cable/cyan{ icon_state = "1-8" }, -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/cockpit) "bs" = ( /obj/machinery/power/rtg/abductor/hybrid/built, @@ -207,9 +268,18 @@ /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/shuttle/aroboat3) "bv" = ( +<<<<<<< HEAD /obj/machinery/door/airlock/angled_bay/standard{ name = "bunkroom 3"; stripe_color = "#00AA00 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/standard{ + name = "bunkroom 3"; + stripe_color = "#00AA00" +======= +/obj/machinery/door/airlock/angled_tgmc/cell{ + name = "bunkroom 3" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/bunkrooms) @@ -222,6 +292,18 @@ }, /turf/simulated/floor/reinforced/airless, /area/space) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"bF" = ( +/obj/machinery/light/floortube, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/aro3/repair_bay) +======= +"bF" = ( +/obj/machinery/light/floortube, +/turf/simulated/floor/tiled/milspec, +/area/aro3/repair_bay) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "bH" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -237,6 +319,18 @@ >>>>>>> b4b6da0fc1... Merge pull request #11222 from VOREStation/Arokha/angled_wall_stuff /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) +"bL" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) "bN" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -246,12 +340,16 @@ dir = 9; icon_state = "intact-scrubbers" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "bP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "bR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -260,13 +358,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark/techfloor_grid, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +======= +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/hallway_starboard) "bT" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_starboard_wc) "bU" = ( /obj/machinery/power/pointdefense{ @@ -275,7 +388,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/space) "bX" = ( /obj/structure/cable/cyan{ @@ -284,7 +397,10 @@ /obj/structure/cable/cyan{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "ca" = ( /obj/structure/cable/cyan{ @@ -299,14 +415,33 @@ /area/aro3/park) "cc" = ( /obj/structure/closet/walllocker/emerglocker/north, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "ce" = ( /obj/machinery/shower{ pixel_y = 16 }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/wc_port) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"ch" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/eris/steel/panels, +/area/aro3/hallway_starboard) +======= +"ch" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "ci" = ( /obj/effect/floor_decal/industrial/warning/dust, /obj/structure/cable/cyan{ @@ -342,7 +477,7 @@ "cn" = ( /obj/structure/table/steel, /obj/item/weapon/storage/box/metalfoam, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "cr" = ( /obj/structure/cable/cyan{ @@ -352,11 +487,38 @@ /area/space) "ct" = ( /obj/machinery/vending/foodasian, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) +"cx" = ( +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/atmos) "cB" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/eva_hall) +"cD" = ( +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/obj/machinery/firealarm/angled/hidden{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/item/weapon/storage/box/metalfoam, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 9 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/cockpit) +"cE" = ( +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) "cH" = ( /turf/simulated/floor/water/indoors/surfluid, /area/aro3/surfluid) @@ -365,7 +527,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "cJ" = ( /obj/structure/cable/cyan{ @@ -374,7 +539,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "cK" = ( /obj/structure/cable/cyan, @@ -387,7 +552,10 @@ /obj/machinery/power/apc/angled/hidden{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "cL" = ( /obj/structure/table/marble, @@ -405,14 +573,17 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/black/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "db" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/hatchmarks, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "df" = ( /obj/machinery/light{ @@ -421,7 +592,10 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "di" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -451,7 +625,8 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/kitchen) "do" = ( /obj/machinery/power/pointdefense{ @@ -473,19 +648,43 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "dt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/angled_tgmc/pod{ + name = "power room" + }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/power) +"du" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) +"dx" = ( +/obj/machinery/recharge_station, +/obj/effect/floor_decal/milspec/color/emerald, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "dB" = ( -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/medical) "dE" = ( /obj/structure/table/glass, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "dF" = ( /obj/structure/table/woodentable, @@ -501,11 +700,11 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_port_wc) "dH" = ( /obj/machinery/light/small, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/wc_starboard) "dJ" = ( /obj/structure/closet/crate, @@ -522,7 +721,7 @@ /obj/machinery/mecha_part_fabricator/pros{ req_access = list() }, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "dO" = ( /obj/structure/table/steel, @@ -530,22 +729,36 @@ dir = 9; icon_state = "intact-scrubbers" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "dP" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/door/airlock/angled_bay/standard{ +/obj/machinery/door/airlock/angled_tgmc{ dir = 4; - name = "storage room"; - stripe_color = "#9e6243" + name = "storage room" }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/bar) +"dQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/function) "dU" = ( /obj/machinery/vending/blood, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "eb" = ( /obj/structure/cable/cyan{ @@ -560,7 +773,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/white/golden, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "ec" = ( /obj/machinery/appliance/cooker/grill, @@ -577,7 +793,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "ei" = ( <<<<<<< HEAD @@ -603,12 +819,20 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/door/airlock/angled_bay/standard{ +/obj/machinery/door/airlock/angled_tgmc/cell{ id_tag = "aro3_private1"; +<<<<<<< HEAD name = "private quarters 1"; stripe_color = "#00AA00 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc + name = "private quarters 1"; + stripe_color = "#00AA00" +======= + name = "private quarters 1" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/dark/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/suite_port) >>>>>>> b4b6da0fc1... Merge pull request #11222 from VOREStation/Arokha/angled_wall_stuff "el" = ( @@ -642,6 +866,7 @@ /obj/structure/hull_corner, /turf/space, /area/space) +<<<<<<< HEAD "er" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -652,6 +877,21 @@ }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +======= +"ev" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "eA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -661,7 +901,10 @@ /obj/machinery/firealarm/angled/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "eI" = ( /obj/structure/bed/chair/bay/comfy/blue{ @@ -678,7 +921,7 @@ dir = 1; pixel_y = -24 }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_starboard_wc) "eL" = ( /obj/structure/table/steel, @@ -686,7 +929,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "eN" = ( /turf/simulated/wall/rpshull, @@ -701,11 +944,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "eZ" = ( /obj/structure/table/steel, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "fb" = ( /obj/structure/cable/cyan{ @@ -719,12 +962,12 @@ "fc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "ff" = ( -/obj/effect/low_wall_spawner/eris/reinforced/rglass, -/turf/simulated/floor/plating/eris/under, -/area/aro3/repair_bay) +/turf/simulated/wall/tgmc/durawall/deco3, +/area/aro3/park) "fo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -732,10 +975,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "fr" = ( -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "fx" = ( /obj/structure/cable/cyan{ @@ -753,7 +1002,7 @@ /turf/simulated/floor/tiled/eris/steel/bar_light, /area/aro3/bar) "fB" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/atmos) "fC" = ( /obj/machinery/light{ @@ -765,7 +1014,7 @@ /obj/structure/cable/cyan{ icon_state = "1-4" }, -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/cockpit) "fL" = ( /turf/simulated/wall/rpshull, @@ -774,7 +1023,8 @@ /obj/machinery/vending/dinnerware{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) <<<<<<< HEAD ||||||| parent of b4b6da0fc1... Merge pull request #11222 from VOREStation/Arokha/angled_wall_stuff @@ -797,29 +1047,53 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/angled_bay/standard{ +/obj/machinery/door/airlock/angled_tgmc/cell{ id_tag = "aro3_private2"; +<<<<<<< HEAD name = "private quarters 2"; stripe_color = "#00AA00 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc + name = "private quarters 2"; + stripe_color = "#00AA00" +======= + name = "private quarters 2" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/dark/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/suite_starboard) >>>>>>> b4b6da0fc1... Merge pull request #11222 from VOREStation/Arokha/angled_wall_stuff "fZ" = ( /obj/machinery/button/remote/blast_door{ - dir = 4; - id = "aroshipshutter_portair"; + id = "aroshipshutter_stbdair"; name = "exterior shutters"; - pixel_x = -28 + pixel_x = -1; + pixel_y = 23 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/white/half{ + dir = 9 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "gb" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"gc" = ( +/obj/machinery/light/floortube{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark, +/area/aro3/surfluid) +======= +"gc" = ( +/turf/simulated/wall/tgmc/durawall/deco1, +/area/aro3/surfluid) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "gd" = ( /turf/simulated/floor/wood, /area/aro3/suite_port) @@ -834,14 +1108,21 @@ /obj/machinery/power/apc/angled/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/wc_port) "gk" = ( /obj/machinery/vending/medical{ dir = 4 }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) +"gl" = ( +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +/area/aro3/repair_bay) "go" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5; @@ -854,7 +1135,8 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "gq" = ( /turf/simulated/floor/tiled/techmaint, @@ -863,13 +1145,39 @@ /obj/effect/overmap/visitable/ship/aro3, /turf/space, /area/space) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"gu" = ( +/obj/structure/dancepole{ + pixel_y = 16 + }, +/turf/simulated/floor/tiled/eris/steel/bar_light, +/area/aro3/bar) +======= +"gu" = ( +/obj/structure/dancepole{ + pixel_y = 16 + }, +/turf/simulated/floor/tiled/eris/steel/bar_light, +/area/aro3/bar) +"gv" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/function) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "gw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "gA" = ( -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "gC" = ( /obj/machinery/light_switch{ @@ -879,7 +1187,7 @@ /obj/structure/cable/cyan{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/wc_port) "gE" = ( /obj/structure/cable/cyan{ @@ -898,6 +1206,12 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) +"gH" = ( +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) "gK" = ( /obj/machinery/light{ dir = 8; @@ -905,7 +1219,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "gP" = ( /obj/structure/cable/cyan{ @@ -914,20 +1231,27 @@ /obj/machinery/power/apc/angled/hidden{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "gQ" = ( /obj/structure/cable/cyan, /obj/machinery/power/apc/angled/hidden{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/color/black/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "gR" = ( /obj/machinery/computer/ship/engines{ req_one_access = list(777) }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "gU" = ( /obj/structure/cable/cyan{ @@ -939,13 +1263,19 @@ /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "gV" = ( /obj/structure/cable/cyan{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "gW" = ( /obj/structure/cable/cyan{ @@ -954,10 +1284,12 @@ /obj/machinery/alarm/angled/hidden{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "gZ" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/mecha/combat/fighter/pinnace/loaded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -965,13 +1297,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/hatchmarks, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "hb" = ( /obj/structure/table/rack/shelf/steel, /obj/item/weapon/storage/box/lights/mixed, /obj/item/weapon/reagent_containers/spray/sterilizine, -/turf/simulated/floor/tiled/eris/dark/techfloor, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "hh" = ( /obj/machinery/light{ @@ -989,14 +1323,15 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "hj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "hk" = ( +<<<<<<< HEAD /obj/structure/dancepole{ pixel_y = 16 }, @@ -1005,6 +1340,16 @@ "hl" = ( /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/repair_bay) +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/space/internal_edge/topright, +/area/aro3/function) +"hl" = ( +/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/area/aro3/repair_bay) +======= +/turf/space/internal_edge/topright, +/area/aro3/function) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "hn" = ( /obj/structure/closet/crate{ name = "qpad parts" @@ -1028,12 +1373,15 @@ /obj/machinery/power/apc/angled/hidden{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_starboard_wc) "hw" = ( /obj/structure/table/glass, /obj/item/device/sleevemate, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "hx" = ( /obj/structure/bed/chair/office/dark{ @@ -1059,7 +1407,7 @@ /obj/structure/cable/cyan{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_port_wc) "hA" = ( /turf/simulated/floor/tiled/eris/steel/bar_light, @@ -1068,12 +1416,20 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/door/airlock/angled_bay/standard{ +/obj/machinery/door/airlock/angled_tgmc/personal{ dir = 4; +<<<<<<< HEAD name = "public restroom"; stripe_color = "#00AA00 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc + name = "public restroom"; + stripe_color = "#00AA00" +======= + name = "public restroom" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/dark/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/wc_starboard) "hD" = ( /turf/simulated/floor/reinforced/airless, @@ -1088,24 +1444,28 @@ /turf/simulated/wall/rpshull, /area/space) "hM" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/suite_starboard) "hN" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "hS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "hU" = ( -/obj/machinery/door/airlock/angled_bay/standard/glass{ +/obj/machinery/door/airlock/angled_tgmc{ name = "spare supplies" }, -/turf/simulated/floor/tiled/eris/dark/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "hX" = ( /turf/simulated/floor/carpet/purcarpet, @@ -1114,19 +1474,25 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/door/airlock/angled_bay/double/glass{ - name = "bar"; - stripe_color = "#00AA00" +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + dir = 4; + name = "bar" }, -/turf/simulated/floor/tiled/eris/steel/panels, +/turf/simulated/floor/tiled/milspec, /area/aro3/bar) "ig" = ( /turf/simulated/floor/wood, /area/aro3/suite_starboard) +"ih" = ( +/obj/effect/floor_decal/milspec/color/orange/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/power) "ij" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "is" = ( /obj/structure/cable/cyan{ @@ -1138,20 +1504,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/door/airlock/angled_bay/double/glass{ - dir = 8; - name = "medical"; - stripe_color = "#6084e0" - }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/machinery/door/airlock/angled_tgmc/wide/medical, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/medical) "iw" = ( -/obj/structure/closet/walllocker/emerglocker/north, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 1 + }, +/obj/machinery/vending/tool, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "iy" = ( -/obj/effect/low_wall_spawner/eris/reinforced/rglass, -/turf/simulated/floor/plating/eris/under, +/obj/structure/grille, +/obj/structure/window/plastitanium/full, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "iB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1160,7 +1527,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/color/black/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "iC" = ( /obj/structure/cable/cyan{ @@ -1169,7 +1539,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "iD" = ( /obj/machinery/bodyscanner{ @@ -1178,24 +1548,24 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "iF" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/door/airlock/angled_bay/standard{ +/obj/machinery/door/airlock/angled_tgmc{ dir = 4; - name = "storage room"; - stripe_color = "#9e6243" + name = "storage room" }, -/turf/simulated/floor/tiled/eris/dark/panels, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "iJ" = ( /obj/structure/bed/chair/sofa/black{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "iL" = ( /obj/structure/cable/cyan{ @@ -1207,7 +1577,10 @@ /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) "iN" = ( -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 9 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "iP" = ( /obj/structure/table/steel, @@ -1215,14 +1588,19 @@ /turf/simulated/floor/carpet/blucarpet, /area/aro3/bunkrooms) "iQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/cyan{ - icon_state = "4-8" + icon_state = "2-4" }, /obj/structure/cable/cyan{ - icon_state = "1-8" + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/dark, -/area/aro3/power) +/obj/effect/floor_decal/milspec/color/orange/half, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) "iR" = ( /obj/structure/closet/walllocker/emerglocker/north, /turf/simulated/floor/carpet/purcarpet, @@ -1241,11 +1619,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/angled_bay/double/glass{ - name = "atmos room"; - stripe_color = "#32d3bb" +/obj/machinery/door/airlock/angled_tgmc/pod{ + name = "atmos room" }, -/turf/simulated/floor/tiled/eris/steel/panels, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "iZ" = ( /obj/machinery/power/terminal{ @@ -1266,7 +1643,8 @@ /obj/machinery/power/apc/angled/hidden{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "je" = ( /obj/structure/marker_beacon{ @@ -1279,19 +1657,28 @@ }, /turf/simulated/floor/reinforced/airless, /area/space) -"jg" = ( -/turf/simulated/floor/tiled/eris/steel/panels, -/area/aro3/function) "jh" = ( /obj/structure/bed/chair/sofa/black/corner{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) +"jj" = ( +/obj/structure/marker_beacon{ + mapped_in_color = "Burgundy"; + name = "red beacon"; + perma = 1 + }, +/turf/simulated/floor/plating/eris/under/airless, +/area/space) "jn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "jr" = ( /obj/structure/cable/cyan{ @@ -1310,19 +1697,28 @@ /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) "jy" = ( -/obj/machinery/door/airlock/angled_bay/standard{ +/obj/machinery/door/airlock/angled_tgmc/cell{ dir = 4; id_tag = "aro3_private2"; +<<<<<<< HEAD name = "private quarters 2"; stripe_color = "#00AA00 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc + name = "private quarters 2"; + stripe_color = "#00AA00" +======= + name = "private quarters 2" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/dark/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/suite_starboard) "jz" = ( /obj/machinery/computer/ship/sensors{ req_one_access = list(777) }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "jC" = ( /obj/structure/hull_corner/long_vert{ @@ -1331,6 +1727,7 @@ /turf/simulated/floor/reinforced/airless, /area/space) <<<<<<< HEAD +<<<<<<< HEAD "jM" = ( /obj/structure/railing/grey{ dir = 4 @@ -1342,6 +1739,18 @@ /area/aro3/function) ||||||| parent of 7857275f5a... Merge pull request #11213 from VOREStation/Arokha/aro3 ======= +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +======= +"jF" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "jM" = ( /turf/space/internal_edge/right, /area/aro3/park) @@ -1352,13 +1761,23 @@ }, /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) +"jQ" = ( +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 10 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/power) "jS" = ( /obj/machinery/vending/foodveggie, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "jU" = ( /obj/machinery/alarm/angled/hidden, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 5 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "jV" = ( /obj/structure/cable/cyan{ @@ -1366,7 +1785,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "jX" = ( /obj/structure/closet/crate/freezer/nanotrasen, @@ -1386,11 +1805,13 @@ dir = 4 }, /obj/structure/table/fancyblack, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "kc" = ( /obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/white/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "kd" = ( /obj/machinery/light/small{ @@ -1402,14 +1823,18 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "kh" = ( -/obj/machinery/vending/engivend{ +/obj/machinery/computer/ship/engines{ dir = 8; - req_access = list() + req_one_access = list(777) }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/color/blue, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "ki" = ( /turf/simulated/floor/water/indoors/surfluid, @@ -1424,7 +1849,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "kk" = ( /obj/structure/cable/cyan{ @@ -1438,9 +1866,13 @@ /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "kl" = ( -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 5 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "km" = ( +<<<<<<< HEAD /obj/machinery/door/airlock/angled_bay/standard{ name = "toilet"; stripe_color = "#00AA00 @@ -27534,8 +27966,17 @@ Ua "km" = ( /obj/machinery/door/airlock{ name = "Toilet" +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/standard{ + name = "toilet"; + stripe_color = "#00AA00" +======= +/obj/machinery/door/airlock/angled_tgmc/personal{ + name = "toilet" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/suite_starboard_wc) "kp" = ( /obj/structure/cable/cyan{ @@ -27544,10 +27985,13 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/color/black/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "kq" = ( -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "kr" = ( /obj/structure/cable/cyan{ @@ -27570,20 +28014,45 @@ Ua }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/orange/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "kC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark/gray_perforated, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/firealarm/angled/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark/gray_perforated, +======= +/obj/machinery/firealarm/angled/hidden{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/atmos) +"kE" = ( +/obj/effect/floor_decal/milspec/color/white/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) "kH" = ( /obj/machinery/computer/operating{ dir = 1 }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "kI" = ( /obj/structure/table/steel, @@ -27591,19 +28060,34 @@ Ua pixel_x = 1; pixel_y = 6 }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "kM" = ( +<<<<<<< HEAD /obj/machinery/power/apc/alarms_hidden{ req_access = list() }, /obj/structure/cable/cyan{ icon_state = "0-4" }, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +======= +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark/violetcorener, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/power/apc/angled/hidden, +/turf/simulated/floor/tiled/eris/dark/violetcorener, +======= +/obj/effect/floor_decal/milspec/color/blue/half, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/cockpit) "kP" = ( /obj/structure/cable/cyan{ @@ -27612,15 +28096,17 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "kW" = ( -/obj/machinery/computer/ship/sensors{ - dir = 8; - req_one_access = list(777) +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 4 }, -/turf/simulated/floor/tiled/eris/dark, -/area/aro3/power) +/obj/machinery/light/floortube{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/surfluid) "lb" = ( /obj/structure/marker_beacon{ mapped_in_color = "Burgundy"; @@ -27639,7 +28125,17 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/steel/panels, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/double/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/steel/panels, +======= +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/hallway_port) "lf" = ( /obj/structure/cable/cyan{ @@ -27647,6 +28143,25 @@ Ua }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) +"lh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) +"lm" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/milspec/color/silver/half, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) "ln" = ( /obj/machinery/power/pointdefense{ id_tag = "aro3_pd" @@ -27654,7 +28169,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "0-9" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/space) "lo" = ( /obj/item/weapon/bedsheet, @@ -27668,16 +28183,23 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "lr" = ( /obj/machinery/shower{ pixel_y = 16 }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/wc_starboard) "lu" = ( +<<<<<<< HEAD /turf/simulated/wall/rpshull, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/simulated/wall/eris/r_wall, +======= +/turf/simulated/wall/tgmc/durawall, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/park) "lv" = ( /obj/structure/table/woodentable, @@ -27693,8 +28215,14 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass/hidden, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +/area/aro3/repair_bay) +"lx" = ( +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "ly" = ( /turf/simulated/wall/rpshull, @@ -27706,6 +28234,7 @@ Ua /turf/simulated/floor/wood, /area/aro3/suite_starboard) "lC" = ( +<<<<<<< HEAD /obj/structure/railing/grey{ dir = 4 }, @@ -27714,6 +28243,24 @@ Ua }, /turf/simulated/floor/water/indoors/surfluid, /area/aro3/workshop) +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/firealarm/angled/hidden, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/aro3/hallway_port) +======= +/obj/machinery/firealarm/angled/hidden, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) +"lD" = ( +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 6 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/atmos) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "lI" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -27721,10 +28268,29 @@ Ua /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) +"lM" = ( +/obj/effect/floor_decal/milspec/color/white/half, +/obj/effect/floor_decal/milspec/color/white/corner{ + dir = 1 + }, +/obj/effect/floor_decal/milspec/stripe{ + dir = 6 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) "lO" = ( +<<<<<<< HEAD /turf/simulated/wall/rpshull, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/simulated/wall/eris/r_wall, +======= +/turf/simulated/wall/tgmc/durawall, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/medical) "lP" = ( /obj/structure/cable/cyan{ @@ -27742,11 +28308,37 @@ Ua }, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/shuttle/aroboat3) +"lZ" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) +"ma" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "md" = ( /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "mg" = ( /obj/machinery/door/airlock/multi_tile/glass{ @@ -27756,7 +28348,22 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/steel/panels, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/double/glass{ + dir = 8; + name = "workshop"; + stripe_color = "#AA00AA" + }, +/turf/simulated/floor/tiled/eris/steel/panels, +======= +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + name = "workshop" + }, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/workshop) "mo" = ( /obj/machinery/atmospherics/portables_connector{ @@ -27779,13 +28386,13 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "mE" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "mF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -27797,7 +28404,10 @@ Ua /obj/structure/closet/autolok_wall{ pixel_y = 32 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "mG" = ( /obj/machinery/vending/boozeomat{ @@ -27810,8 +28420,17 @@ Ua dir = 4; req_access = list() }, +<<<<<<< HEAD /obj/structure/cable/cyan, /turf/simulated/floor/tiled/eris/white/golden, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/simulated/floor/tiled/eris/white/golden, +======= +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/sterile, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/medical) "mL" = ( /obj/machinery/power/shield_generator/upgraded{ @@ -27820,7 +28439,7 @@ Ua target_radius = 60 }, /obj/structure/cable/cyan, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec/raised, /area/aro3/surfluid) "mO" = ( /obj/structure/railing/grey{ @@ -27850,6 +28469,19 @@ Ua /obj/structure/flora/tree/jungle_small, /turf/simulated/floor/outdoors/grass/heavy, /area/aro3/park) +"nb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/silver/corner, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "nd" = ( /obj/machinery/power/apc/alarms_hidden{ dir = 4; @@ -27860,7 +28492,22 @@ Ua }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark/techfloor_grid, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +======= +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/hallway_port) "ne" = ( /obj/structure/cable/cyan{ @@ -27869,32 +28516,40 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/corner, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "nh" = ( /obj/structure/cable/cyan{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) -"nm" = ( -/turf/simulated/floor/tiled/eris/dark/gray_platform, -/area/aro3/workshop) "nn" = ( /obj/machinery/light{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "nq" = ( /obj/structure/bed/chair/sofa/corp/right{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "ns" = ( +<<<<<<< HEAD /turf/simulated/wall/rpshull, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/simulated/wall/eris/r_wall, +======= +/turf/simulated/wall/tgmc/durawall, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/function) "ny" = ( /obj/structure/cable/cyan{ @@ -27908,7 +28563,13 @@ Ua }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "nz" = ( /obj/machinery/computer/ship/navigation/telescreen{ @@ -27923,8 +28584,25 @@ Ua /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"nH" = ( +/obj/machinery/alarm/angled/hidden{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/aro3/eva_hall) +======= +"nH" = ( +/obj/machinery/alarm/angled/hidden{ + dir = 1 + }, +/obj/effect/floor_decal/milspec/color/white/half, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "nI" = ( /obj/structure/cable/cyan{ icon_state = "1-8" @@ -27959,7 +28637,8 @@ Ua /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "nX" = ( /obj/structure/cable/cyan{ @@ -27967,6 +28646,19 @@ Ua }, /turf/simulated/floor/tiled/techmaint, /area/aro3/bar) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"oc" = ( +/obj/machinery/light/floortube, +/turf/simulated/floor/tiled/eris/dark, +/area/aro3/function) +======= +"oc" = ( +/obj/machinery/light/floortube, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +/area/aro3/function) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "od" = ( /obj/machinery/power/apc/alarms_hidden{ req_access = list() @@ -27974,6 +28666,14 @@ Ua /obj/structure/cable/cyan, /turf/simulated/floor/wood, /area/aro3/suite_starboard) +"oe" = ( +/obj/structure/sign/warning/vacuum{ + pixel_x = 16; + pixel_y = -30 + }, +/obj/effect/floor_decal/milspec/color/red/half, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) "oh" = ( /obj/structure/cable/cyan{ icon_state = "2-8" @@ -27986,14 +28686,9 @@ Ua /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) -"or" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/steel/panels, -/area/aro3/hallway_starboard) "ow" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -28001,7 +28696,10 @@ Ua /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "ox" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -28012,7 +28710,10 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "oz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -28021,7 +28722,10 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "oF" = ( /obj/structure/cable/cyan{ @@ -28030,12 +28734,16 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "oK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "oL" = ( /obj/structure/cable/cyan{ @@ -28045,6 +28753,7 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/eris/steel/bar_flat, /area/aro3/bar) +<<<<<<< HEAD "oN" = ( /obj/machinery/door/blast/regular{ dir = 2; @@ -28052,12 +28761,24 @@ Ua }, /turf/simulated/floor/reinforced/airless, /area/aro3/eva_hall) +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"oN" = ( +/obj/machinery/door/blast/multi_tile/two_tile_ver{ + id = "aroshipshutter_portair" + }, +/turf/simulated/floor/reinforced/airless, +/area/aro3/eva_hall) +======= +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "oP" = ( /obj/machinery/light{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "oT" = ( /obj/structure/table/rack/shelf/steel, @@ -28075,7 +28796,7 @@ Ua }, /obj/item/clothing/shoes/black/cuffs, /obj/item/clothing/gloves/fingerless, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "oW" = ( /obj/structure/lattice, @@ -28084,12 +28805,26 @@ Ua }, /turf/space, /area/space) +"oY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/function) "pc" = ( /obj/structure/hull_corner/long_vert{ dir = 6 }, /turf/space, /area/space) +"pg" = ( +/obj/effect/floor_decal/milspec/color/red/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) "pj" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -28106,11 +28841,46 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-4" }, +/obj/effect/floor_decal/milspec/monotile, /obj/effect/floor_decal/emblem/aronai{ dir = 10 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"pm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/aro3/hallway_port) +======= +"pm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "pn" = ( /obj/structure/toilet{ pixel_y = 12 @@ -28118,7 +28888,7 @@ Ua /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_starboard_wc) "pq" = ( /obj/structure/marker_beacon{ @@ -28135,7 +28905,8 @@ Ua /obj/structure/bed/chair/wood{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "ps" = ( /obj/structure/cable/cyan{ @@ -28152,18 +28923,20 @@ Ua "px" = ( /obj/structure/table/steel, /obj/item/weapon/storage/toolbox/mechanical, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "pH" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet, /obj/structure/curtain/open/privacy, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/corner, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "pP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "pS" = ( /turf/simulated/wall/rpshull, @@ -28173,7 +28946,8 @@ Ua /area/aro3/bar) "pV" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "qd" = ( /obj/structure/hull_corner/long_vert{ @@ -28188,7 +28962,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "0-4" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/space) "qh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -28203,29 +28977,65 @@ Ua /obj/structure/cable/cyan{ icon_state = "0-8" }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark/techfloor_grid, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +======= +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/hallway_bunkrooms) "qk" = ( /obj/structure/table/steel, /obj/item/weapon/storage/toolbox/electrical, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "qm" = ( /obj/structure/fans/hardlight, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/eva_hall) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"qu" = ( +/obj/machinery/door/airlock/angled_bay/standard{ + name = "bunkroom 2"; + stripe_color = "#00AA00" + }, +/turf/simulated/floor/tiled/eris/dark/panels, +/area/aro3/bunkrooms) +======= +"qu" = ( +/obj/machinery/door/airlock/angled_tgmc/cell{ + name = "bunkroom 2" + }, +/turf/simulated/floor/tiled/eris/dark/panels, +/area/aro3/bunkrooms) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "qC" = ( /turf/space/internal_edge/bottomleft, /area/aro3/bar) "qH" = ( /obj/machinery/vending/loadout/clothing, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "qI" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "qJ" = ( /obj/structure/railing/grey{ @@ -28246,7 +29056,8 @@ Ua /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "qW" = ( /obj/structure/railing/grey{ @@ -28261,7 +29072,7 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "qZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -28270,7 +29081,8 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "ra" = ( /obj/structure/cable/cyan{ @@ -28293,13 +29105,20 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, +<<<<<<< HEAD /turf/simulated/wall/rpshull, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/simulated/wall/eris/r_wall, +======= +/turf/simulated/wall/tgmc/durawall, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/suite_starboard_wc) "re" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "ri" = ( /obj/structure/closet/crate/large, @@ -28323,7 +29142,10 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "rp" = ( /obj/structure/sink{ @@ -28337,25 +29159,35 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_starboard_wc) "rr" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) +"rw" = ( +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 1 + }, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = 23 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/power) "rx" = ( /obj/machinery/light, /obj/structure/bed/chair/sofa/corp/left{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "rA" = ( /obj/structure/table/steel, /obj/item/weapon/storage/belt/utility, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "rF" = ( /obj/structure/cable/cyan{ @@ -28370,7 +29202,10 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "rL" = ( /obj/structure/cable/cyan{ @@ -28382,8 +29217,21 @@ Ua /obj/structure/bed/chair/wood{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) +"rO" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/milspec/color/black/half{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "rP" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -28393,7 +29241,8 @@ Ua "rU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/orange/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "rY" = ( /obj/machinery/door/airlock/multi_tile/glass{ @@ -28402,6 +29251,17 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/double/glass{ + dir = 8 + }, +======= +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + name = "public hall" + }, +/obj/effect/floor_decal/milspec/monotile, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/function) "se" = ( @@ -28410,7 +29270,10 @@ Ua /area/aro3/kitchen) "sf" = ( /obj/structure/closet/walllocker_double/medical/west, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "sk" = ( /obj/machinery/door/airlock{ @@ -28419,10 +29282,21 @@ Ua /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/bunkrooms) "so" = ( +<<<<<<< HEAD /obj/machinery/door/airlock/maintenance/common{ name = "Medical Storage" +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/standard{ + dir = 4; + name = "storage room"; + stripe_color = "#9e6243" +======= +/obj/machinery/door/airlock/angled_tgmc{ + dir = 4; + name = "storage room" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/dark/panels, +/turf/simulated/floor/tiled/milspec, /area/aro3/medical) "sq" = ( /obj/machinery/light{ @@ -28456,11 +29330,31 @@ Ua /obj/structure/toilet{ dir = 4 }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/wc_port) "sw" = ( -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/kitchen) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"sx" = ( +/obj/machinery/firealarm/angled/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/aro3/flight_deck) +======= +"sx" = ( +/obj/machinery/firealarm/angled/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "sD" = ( /obj/machinery/light{ dir = 4 @@ -28468,7 +29362,10 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "sG" = ( /obj/structure/closet/crate/freezer/rations, @@ -28478,7 +29375,7 @@ Ua /obj/structure/bed/chair/office/dark{ dir = 1 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "sK" = ( /obj/structure/cable/cyan{ @@ -28490,12 +29387,37 @@ Ua /obj/structure/railing/grey, /turf/simulated/floor/water/indoors/surfluid, /area/aro3/hallway_bunkrooms) +"sM" = ( +/obj/structure/sign/warning/vacuum{ + pixel_y = 30 + }, +/obj/effect/floor_decal/milspec/color/white/half{ + dir = 1 + }, +/obj/effect/floor_decal/milspec/stripe{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) "sO" = ( /obj/structure/table/steel_reinforced, /obj/machinery/chemical_dispenser/bar_soft/full{ dir = 8 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/firealarm/angled/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark, +======= +/obj/machinery/firealarm/angled/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/function) "sT" = ( /obj/machinery/door/airlock{ @@ -28504,7 +29426,21 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark/panels, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/standard{ + name = "restroom"; + stripe_color = "#00AA00" + }, +/turf/simulated/floor/tiled/eris/dark/panels, +======= +/obj/machinery/door/airlock/angled_tgmc/personal{ + name = "restroom" + }, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/suite_port) "sV" = ( /obj/structure/cable/cyan{ @@ -28520,8 +29456,14 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) +"td" = ( +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/sterile, +/area/aro3/medical) "te" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -28529,25 +29471,42 @@ Ua /turf/simulated/floor/reinforced/airless, /area/space) "th" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = 23 +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/machinery/vending/engivend{ + req_access = list() + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "ti" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +<<<<<<< HEAD /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled/eris/steel/panels, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/double/glass, +/turf/simulated/floor/tiled/eris/steel/panels, +======= +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/hallway_starboard) "tk" = ( /obj/structure/cable/cyan{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 6 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "tl" = ( -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "tp" = ( /obj/structure/marker_beacon{ @@ -28561,15 +29520,19 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/eris/white/golden, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 5 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "tx" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/effect/floor_decal/milspec/monotile, /obj/effect/floor_decal/emblem/aronai{ dir = 5 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "tz" = ( /turf/simulated/shuttle/wall/voidcraft/blue{ @@ -28578,54 +29541,123 @@ Ua }, /area/shuttle/aroboat3) "tB" = ( +<<<<<<< HEAD /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 +======= +/obj/machinery/alarm/angled/hidden{ + pixel_x = -4; + pixel_y = 20 +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/alarm/angled/hidden, +/turf/simulated/floor/tiled/eris/dark, +======= +/obj/structure/closet/crate/bin{ + anchored = 1; + density = 0; + name = "trash bin"; + pixel_y = 3 + }, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 5 + }, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/surfluid) "tD" = ( /obj/machinery/washing_machine, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_port_wc) "tH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/park) +"tK" = ( +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/power) "tL" = ( /obj/structure/table/glass, /obj/item/weapon/paper{ info = "I guess you can use this body while I'm in another one, but I'll charge you for anything you blow up or steal! -Aro" }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) +"tV" = ( +/obj/effect/floor_decal/milspec/color/white/half, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) "tX" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, +<<<<<<< HEAD /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled/eris/steel/panels, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/double/glass, +/turf/simulated/floor/tiled/eris/steel/panels, +======= +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/hallway_port) "tY" = ( +<<<<<<< HEAD /obj/machinery/door/airlock{ +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/standard{ + dir = 4; +======= +/obj/machinery/door/airlock/angled_tgmc{ + dir = 4; +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc id_tag = "aro3_private2_bed"; +<<<<<<< HEAD name = "Private Room 1" +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc + name = "bedroom"; + stripe_color = "#00AA00" +======= + name = "bedroom" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/dark/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/suite_starboard) "tZ" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "ue" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 23 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "ug" = ( /obj/structure/table/steel, @@ -28633,24 +29665,32 @@ Ua /turf/simulated/floor/carpet/oracarpet, /area/aro3/bunkrooms) "uE" = ( -/turf/simulated/floor/tiled/eris/white/golden, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 9 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "uG" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/color/blue/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "uI" = ( /obj/machinery/atmospherics/portables_connector/aux{ dir = 1 }, /obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "uJ" = ( /obj/structure/table/fancyblack, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "uK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -28662,7 +29702,13 @@ Ua /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 23 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "uL" = ( /obj/machinery/light{ @@ -28676,36 +29722,61 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) +"uW" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "uX" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/raised, /area/aro3/hallway_starboard) "uY" = ( /obj/structure/toilet{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/wc_starboard) "vb" = ( /obj/machinery/telecomms/allinone, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec/raised, /area/aro3/surfluid) +"vf" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/silver/corner, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "vh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "vo" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_port_wc) "vp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -28714,7 +29785,10 @@ Ua /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "vu" = ( /obj/machinery/light/small{ @@ -28726,22 +29800,44 @@ Ua /turf/simulated/floor/tiled/techmaint, /area/aro3/bar) "vx" = ( +<<<<<<< HEAD /obj/machinery/door/airlock/multi_tile/glass{ name = "Kitchen/Tech Room" +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/double/glass{ + name = "ship systems" +======= +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + dir = 4; + name = "ship systems"; + req_one_access = list(777) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "vD" = ( /obj/structure/table/rack/shelf/steel, /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay, /obj/item/mecha_parts/mecha_equipment/cloak, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) +"vF" = ( +/obj/machinery/recharge_station, +/obj/effect/floor_decal/milspec/color/emerald, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) "vH" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, +<<<<<<< HEAD /turf/simulated/wall/rpshull, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/simulated/wall/eris/r_wall, +======= +/turf/simulated/wall/tgmc/durawall, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/bar) "vJ" = ( /obj/machinery/light, @@ -28769,28 +29865,47 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "vN" = ( /obj/structure/table/marble, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"vP" = ( +/obj/machinery/gear_dispenser/suit_fancy/aether, +/turf/simulated/floor/tiled/eris/steel/panels, +/area/aro3/eva_hall) +======= +"vP" = ( +/obj/machinery/gear_dispenser/suit_fancy/aether, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "vQ" = ( /obj/structure/table/steel, /obj/item/device/flashlight/lamp, /turf/simulated/floor/carpet/purcarpet, /area/aro3/bunkrooms) +"vT" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec/raised, +/area/aro3/power) "vV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "vX" = ( -/obj/machinery/computer/ship/engines{ - dir = 8; - req_one_access = list(777) - }, -/turf/simulated/floor/tiled/eris/dark, -/area/aro3/power) +/turf/simulated/wall/tgmc/durawall/deco2, +/area/aro3/workshop) "vZ" = ( /obj/machinery/power/apc/alarms_hidden{ req_access = list() @@ -28800,6 +29915,16 @@ Ua }, /turf/simulated/floor/outdoors/grass/heavy, /area/aro3/park) +"wb" = ( +/obj/effect/floor_decal/milspec/color/white/half, +/obj/effect/floor_decal/milspec/color/white/corner{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/stripe{ + dir = 10 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) "wc" = ( /obj/structure/lattice, /obj/structure/hull_corner, @@ -28818,7 +29943,10 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/eris/white/golden, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 10 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "wi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -28827,8 +29955,17 @@ Ua /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) +"wl" = ( +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/milspec_sterile/green/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/sterile, +/area/aro3/medical) "wm" = ( /obj/machinery/light_switch{ dir = 4; @@ -28839,7 +29976,10 @@ Ua }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 9 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "wq" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ @@ -28847,7 +29987,10 @@ Ua id_tag = "aroship3_boatbay"; pixel_y = 28 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "ws" = ( /obj/machinery/light_switch{ @@ -28857,7 +30000,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/wc_starboard) "wu" = ( /obj/structure/cable/cyan{ @@ -28872,7 +30015,10 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "wx" = ( /obj/machinery/power/terminal{ @@ -28893,7 +30039,10 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "wF" = ( /obj/machinery/power/quantumpad{ @@ -28902,7 +30051,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "0-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor, +/turf/simulated/floor/tiled/milspec/raised, /area/aro3/hallway_starboard) "wH" = ( /obj/structure/lattice, @@ -28917,9 +30066,6 @@ Ua }, /turf/simulated/wall/rpshull, /area/space) -"wO" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/aro3/power) "wP" = ( /obj/structure/hull_corner{ dir = 8 @@ -28936,7 +30082,8 @@ Ua /obj/machinery/door/firedoor/glass/hidden{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "wT" = ( /obj/structure/cable/cyan{ @@ -28944,6 +30091,15 @@ Ua }, /turf/simulated/wall/rpshull, /area/space) +"wV" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/power) "wW" = ( /obj/machinery/power/smes/buildable/hybrid{ input_attempt = 1; @@ -28975,15 +30131,13 @@ Ua /obj/machinery/light{ dir = 8 }, -/obj/machinery/light_switch{ - pixel_y = 24 - }, -/obj/structure/table/glass, -/obj/item/weapon/storage/box/metalfoam, /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "xh" = ( /obj/item/modular_computer/console/preset/civilian, @@ -28996,7 +30150,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "xm" = ( /obj/machinery/power/pointdefense{ @@ -29017,7 +30171,17 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/steel/panels, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/double/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/steel/panels, +======= +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/hallway_starboard) "xp" = ( /obj/structure/table/darkglass, @@ -29044,13 +30208,17 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "xB" = ( /obj/structure/sign/vacuum{ pixel_x = -32 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/stripe, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "xE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -29059,14 +30227,14 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "xF" = ( /obj/structure/table/steel, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "xG" = ( /obj/structure/cable/cyan{ @@ -29076,13 +30244,16 @@ Ua /area/aro3/flight_deck) "xI" = ( /obj/structure/flora/pottedplant/unusual, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "xN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "xO" = ( /obj/structure/marker_beacon{ @@ -29107,6 +30278,21 @@ Ua }, /turf/space, /area/space) +"xT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/black/half{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "xW" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 8 @@ -29116,7 +30302,8 @@ Ua /area/aro3/atmos) "yc" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/emerald, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "ye" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -29125,10 +30312,10 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "yk" = ( -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec/raised, /area/aro3/surfluid) "ym" = ( /obj/machinery/alarm/alarms_hidden{ @@ -29140,11 +30327,23 @@ Ua /obj/structure/lattice, /turf/space, /area/space) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"yo" = ( +/obj/machinery/alarm/angled/hidden, +/turf/simulated/floor/tiled/eris/dark/gray_platform, +/area/aro3/workshop) +======= +"yo" = ( +/obj/machinery/alarm/angled/hidden, +/turf/simulated/floor/tiled/milspec, +/area/aro3/workshop) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "yu" = ( /obj/machinery/mech_recharger{ icon = 'icons/turf/shuttle_alien_blue.dmi' }, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "yx" = ( /obj/effect/shuttle_landmark{ @@ -29165,11 +30364,11 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "yz" = ( /obj/machinery/light/small, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/wc_port) "yD" = ( /obj/machinery/appliance/cooker/oven, @@ -29179,18 +30378,33 @@ Ua /obj/machinery/light{ dir = 4 }, -/obj/structure/table/glass, /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "yG" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) +"yH" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/silver/corner, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) "yI" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -29202,11 +30416,14 @@ Ua dir = 4; pixel_x = -25 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/color/black/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "yN" = ( /obj/machinery/washing_machine, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_starboard_wc) "yP" = ( /obj/structure/cable/cyan{ @@ -29224,17 +30441,20 @@ Ua /obj/structure/cable/cyan{ icon_state = "0-8" }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/white, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/white, +======= +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/sterile, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/suite_port_wc) -"yR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/eris/dark, -/area/aro3/surfluid) "yS" = ( /obj/structure/bed/chair/bay/comfy/yellow{ dir = 1 @@ -29243,7 +30463,10 @@ Ua pixel_x = 32; pixel_y = 32 }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "yU" = ( /obj/machinery/light_switch{ @@ -29252,6 +30475,7 @@ Ua /obj/structure/table/marble, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) +<<<<<<< HEAD "yV" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Power Management" @@ -29261,6 +30485,19 @@ Ua }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/power) +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"yV" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/angled_bay/double/glass{ + name = "engine room"; + stripe_color = "#e6ef40" + }, +/turf/simulated/floor/tiled/eris/steel/panels, +/area/aro3/power) +======= +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "yW" = ( /obj/machinery/light{ dir = 8 @@ -29271,7 +30508,7 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "zi" = ( /obj/machinery/power/apc/alarms_hidden{ @@ -29308,17 +30545,40 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/steel/panels, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/double/glass{ + name = "public hall" + }, +/turf/simulated/floor/tiled/eris/steel/panels, +======= +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + dir = 4; + name = "public hall" + }, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/eva_hall) "zo" = ( +<<<<<<< HEAD /turf/simulated/wall/rpshull, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/simulated/wall/eris/r_wall, +======= +/turf/simulated/wall/tgmc/durawall, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/bunkrooms) "zq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "zr" = ( /obj/structure/cable/cyan{ @@ -29326,25 +30586,26 @@ Ua }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "zt" = ( /obj/structure/cable/cyan{ icon_state = "2-4" }, -/obj/machinery/light/floortube{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec/raised, /area/aro3/surfluid) "zu" = ( -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "zx" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "zy" = ( /obj/structure/railing/grey{ @@ -29368,7 +30629,7 @@ Ua /area/space) "zE" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "zG" = ( /obj/machinery/power/apc/alarms_hidden{ @@ -29380,7 +30641,22 @@ Ua }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark/techfloor_grid, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/power/apc/angled/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +======= +/obj/machinery/power/apc/angled/hidden{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/hallway_starboard) "zI" = ( /obj/structure/closet/crate/bin{ @@ -29389,20 +30665,30 @@ Ua name = "trash bin"; pixel_y = 3 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "zJ" = ( /obj/machinery/light_switch{ dir = 4; pixel_x = -25 }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "zL" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, +<<<<<<< HEAD /turf/simulated/wall/rpshull, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/simulated/wall/eris/r_wall, +======= +/turf/simulated/wall/tgmc/durawall, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/atmos) "zM" = ( /obj/structure/cable/cyan{ @@ -29420,7 +30706,7 @@ Ua /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "zV" = ( /obj/structure/cable/cyan{ @@ -29432,7 +30718,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "zW" = ( /obj/structure/table/darkglass, @@ -29450,8 +30736,19 @@ Ua /area/aro3/bar) "Aa" = ( /obj/structure/fans/hardlight, +<<<<<<< HEAD /obj/machinery/door/airlock/multi_tile/glass{ dir = 2 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/double/glass{ + dir = 8; + door_color = "#AA0000"; + name = "port airlock"; + stripe_color = "#FFFFFF" +======= +/obj/machinery/door/airlock/angled_tgmc/wide/security{ + name = "port airlock" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/eva_hall) @@ -29471,7 +30768,20 @@ Ua pixel_x = 24; pixel_y = -8 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/alarm/angled/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark, +======= +/obj/machinery/alarm/angled/hidden{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/function) "Ad" = ( /obj/structure/cable/cyan{ @@ -29483,7 +30793,10 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Ae" = ( /obj/structure/cable/cyan{ @@ -29523,19 +30836,44 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/steel/panels, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/double/glass{ + dir = 8; + name = "kitchen" + }, +/turf/simulated/floor/tiled/eris/steel/panels, +======= +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + name = "kitchen" + }, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/kitchen) "Am" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/emerald, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) +"Ap" = ( +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "Aq" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "At" = ( -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/orange/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "Au" = ( /obj/effect/floor_decal/emblem/aronai{ @@ -29567,7 +30905,7 @@ Ua /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "AQ" = ( /obj/machinery/appliance/mixer/cereal, @@ -29575,25 +30913,34 @@ Ua /area/aro3/kitchen) "AX" = ( /obj/machinery/door/window/westright, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_starboard_wc) "AY" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /obj/structure/flora/pottedplant/smalltree, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/machinery/alarm/angled/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 10 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) +"Bc" = ( +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 6 + }, +/turf/simulated/floor/tiled/milspec/sterile, +/area/aro3/medical) "Be" = ( -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "Bi" = ( -/obj/machinery/computer/ship/helm{ - dir = 8; - req_one_access = list(777) - }, -/turf/simulated/floor/tiled/eris/dark, -/area/aro3/power) +/turf/simulated/wall/tgmc/durawall/deco0, +/area/aro3/repair_bay) "Bn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -29604,11 +30951,20 @@ Ua /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 23 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Bp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "Br" = ( /obj/structure/cable/cyan{ @@ -29616,7 +30972,10 @@ Ua d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Bw" = ( /obj/structure/fans/hardlight, @@ -29641,6 +31000,33 @@ Ua /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/techmaint, /area/aro3/hallway_bunkrooms) +"BJ" = ( +/obj/effect/floor_decal/milspec/stripe, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) +"BN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) +"BO" = ( +/obj/effect/floor_decal/milspec/color/red/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) +"BQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "BX" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -29650,30 +31036,72 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Ca" = ( /obj/structure/bed/chair/bay/comfy/blue{ dir = 1 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/dark/violetcorener, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/firealarm/angled/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark/violetcorener, +======= +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/cockpit) +"Cf" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "Cg" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, +<<<<<<< HEAD /turf/simulated/wall/rpshull, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/turf/simulated/wall/eris/r_wall, +======= +/turf/simulated/wall/tgmc/durawall, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/suite_port_wc) "Ci" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/hatchmarks, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) +"Co" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "Cq" = ( /obj/machinery/alarm/angled/hidden, /turf/simulated/floor/plating/eris/under, @@ -29688,7 +31116,8 @@ Ua /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/shuttle/aroboat3) "Cv" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Cw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29699,23 +31128,21 @@ Ua /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "Cy" = ( -/obj/structure/cable/cyan{ - icon_state = "2-8" - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "Cz" = ( /obj/structure/flora/pottedplant/sticky, /obj/machinery/alarm/angled/hidden{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "CA" = ( /obj/structure/bed/chair/wood{ @@ -29724,7 +31151,8 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "CH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -29733,7 +31161,8 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "CK" = ( /obj/structure/lattice, @@ -29763,19 +31192,19 @@ Ua /area/aro3/function) "CR" = ( /obj/machinery/door/window/eastleft, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_port_wc) "CW" = ( /obj/structure/table/steel, /obj/structure/cable/cyan, /obj/machinery/power/apc/angled/hidden, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "CY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Df" = ( /obj/structure/table/rack/shelf/steel, @@ -29790,6 +31219,9 @@ Ua }, /turf/simulated/floor/reinforced/airless, /area/space) +"Dk" = ( +/turf/simulated/floor/tiled/milspec/raised, +/area/aro3/power) "Dn" = ( /turf/space/internal_edge/left, /area/aro3/function) @@ -29799,7 +31231,7 @@ Ua dir = 1; pixel_y = -24 }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_port_wc) "Dx" = ( /obj/machinery/body_scanconsole{ @@ -29808,11 +31240,12 @@ Ua /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Dy" = ( /obj/machinery/vending/coffee, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "DA" = ( /obj/structure/cable/cyan{ @@ -29842,34 +31275,34 @@ Ua "DL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "DM" = ( /obj/machinery/gear_dispenser/suit_fancy/commonwealth, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "DP" = ( /obj/machinery/firealarm/angled/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "DQ" = ( /obj/structure/bed/chair/sofa/corp/left{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) -"DW" = ( -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark, -/area/aro3/workshop) "DY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/bar) "Eh" = ( /obj/structure/cable/cyan{ @@ -29878,7 +31311,10 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Ej" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -29887,7 +31323,10 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "En" = ( /obj/structure/cable/cyan{ @@ -29896,23 +31335,32 @@ Ua /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Eo" = ( -/obj/structure/closet/walllocker/emerglocker/north, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "Er" = ( /obj/structure/table/steel, /obj/item/weapon/storage/box/metalfoam, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "Es" = ( /obj/structure/sign/vacuum{ pixel_x = 32 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/stripe, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "Et" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -29921,7 +31369,10 @@ Ua /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Eu" = ( /obj/structure/bed/chair/office/dark{ @@ -29943,7 +31394,10 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "Ey" = ( /obj/structure/cable/cyan{ @@ -29951,11 +31405,18 @@ Ua }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/milspec/monotile, /obj/effect/floor_decal/emblem/aronai{ dir = 6 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) +"EA" = ( +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/atmos) "EC" = ( /turf/space/internal_edge/top, /area/aro3/function) @@ -29964,12 +31425,29 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) +"EE" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "EF" = ( /obj/machinery/holoplant, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) +"EH" = ( +/obj/effect/floor_decal/milspec/color/red/half, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) "EI" = ( /obj/structure/lattice, /obj/structure/hull_corner/long_vert{ @@ -29979,20 +31457,33 @@ Ua /area/space) "EK" = ( /obj/machinery/transhuman/resleever, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "EM" = ( +<<<<<<< HEAD /obj/machinery/door/airlock/angled_bay/standard{ name = "toilet"; stripe_color = "#00AA00 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/standard{ + name = "toilet"; + stripe_color = "#00AA00" +======= +/obj/machinery/door/airlock/angled_tgmc/personal{ + name = "toilet" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/dark/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/suite_port_wc) "ER" = ( /obj/machinery/mech_recharger{ icon = 'icons/turf/shuttle_alien_blue.dmi' }, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "EU" = ( /turf/space/internal_edge/right, @@ -30014,7 +31505,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "Fc" = ( /obj/structure/window/plastitanium/full, @@ -30027,7 +31518,8 @@ Ua "Ff" = ( /obj/structure/table/glass, /obj/item/device/defib_kit/loaded, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/corner, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Fj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -30052,7 +31544,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Fr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30061,17 +31553,28 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Fu" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, +<<<<<<< HEAD /obj/machinery/door/airlock/angled_bay/standard{ name = "restroom"; stripe_color = "#00AA00 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/standard{ + name = "restroom"; + stripe_color = "#00AA00" +======= +/obj/machinery/door/airlock/angled_tgmc/personal{ + name = "restroom" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/dark/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/suite_starboard) "Fv" = ( /obj/structure/closet/walllocker/emerglocker/north, @@ -30081,15 +31584,17 @@ Ua /obj/structure/bed/chair/bar_stool, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/aro3/bar) -"Fy" = ( -/obj/effect/low_wall_spawner/eris/reinforced/rglass, -/turf/simulated/floor/plating/eris/under, -/area/aro3/kitchen) +"FB" = ( +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/surfluid) "FE" = ( /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "FF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -30098,7 +31603,10 @@ Ua /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "FH" = ( /obj/structure/table/glass, @@ -30107,18 +31615,24 @@ Ua /obj/machinery/firealarm/angled/hidden{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "FP" = ( /obj/structure/table/steel, /obj/item/clothing/glasses/welding, /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "FZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Gg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30127,7 +31641,8 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Gj" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ @@ -30147,7 +31662,7 @@ Ua /obj/machinery/shower{ dir = 8 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_starboard_wc) "Gs" = ( /obj/machinery/power/rtg/kugelblitz{ @@ -30170,8 +31685,20 @@ Ua dir = 1; pixel_y = -24 }, +<<<<<<< HEAD /obj/item/device/uav/loaded, /turf/simulated/floor/tiled/eris/dark/gray_perforated, +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/item/device/uav/loaded{ + nickname = "FoxBot Beta" + }, +/turf/simulated/floor/tiled/eris/dark/gray_perforated, +======= +/obj/item/device/uav/loaded{ + nickname = "FoxBot Beta" + }, +/turf/simulated/floor/tiled/milspec, +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc /area/aro3/repair_bay) "Gy" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -30187,20 +31714,21 @@ Ua /obj/structure/cable/cyan{ icon_state = "0-5" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/space) "GC" = ( -/obj/machinery/vending/engineering{ +/obj/effect/floor_decal/milspec/color/blue, +/obj/machinery/computer/ship/helm{ dir = 8; - req_access = list() + req_one_access = list(777) }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "GE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "GG" = ( /obj/structure/table/rack/shelf/steel, @@ -30209,7 +31737,7 @@ Ua /area/aro3/medical) "GI" = ( /obj/machinery/ntnet_relay, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec/raised, /area/aro3/surfluid) "GV" = ( /obj/structure/closet/crate/medical, @@ -30219,11 +31747,13 @@ Ua /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) "Hc" = ( -/obj/machinery/gear_dispenser/suit/autolok, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 9 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "Hd" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/hallway_starboard) "Hh" = ( /turf/simulated/floor/plating/eris/under, @@ -30235,7 +31765,8 @@ Ua /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/corner, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Hj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -30253,7 +31784,7 @@ Ua /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "Hq" = ( /obj/structure/cable/cyan{ @@ -30268,21 +31799,33 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) +"Hs" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) "Hv" = ( -/turf/simulated/floor/bluegrid, +/turf/simulated/floor/tiled/milspec/raised, /area/space) "Hw" = ( /obj/machinery/light/floortube{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "Hz" = ( -/obj/effect/low_wall_spawner/eris/reinforced/rglass, -/turf/simulated/floor/plating/eris/under, -/area/aro3/workshop) +/turf/simulated/wall/tgmc/durawall/deco0, +/area/aro3/suite_port) "HE" = ( /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/aroboat3) @@ -30296,26 +31839,27 @@ Ua /obj/structure/bed/chair/sofa/corp{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "HI" = ( /obj/machinery/atmospherics/portables_connector/aux, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "HJ" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/wc_port) "HL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/green/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "HO" = ( /obj/machinery/firealarm/angled/hidden{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "HS" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -30342,7 +31886,7 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "Io" = ( /obj/structure/cable/cyan{ @@ -30351,27 +31895,34 @@ Ua /obj/machinery/alarm/angled/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Iq" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/flight_deck) "Is" = ( -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "Iu" = ( /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_starboard_wc) "Iv" = ( /obj/machinery/recharge_station, /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) +"ID" = ( +/obj/effect/floor_decal/milspec/color/orange/half, +/turf/simulated/floor/tiled/milspec, +/area/aro3/power) "IF" = ( /turf/space/internal_edge/bottomright, /area/aro3/function) @@ -30387,23 +31938,35 @@ Ua dir = 8 }, /obj/machinery/light/floortube, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "IK" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec/raised, /area/aro3/surfluid) +"IQ" = ( +/obj/machinery/power/apc/angled/hidden{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "0-2" + }, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 5 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/cockpit) "IR" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/wc_starboard) "IS" = ( -/obj/effect/floor_decal/industrial/hatch, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/obj/effect/floor_decal/milspec/hatchmarks, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "IT" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/hallway_port) "IX" = ( /obj/structure/cable/cyan{ @@ -30418,34 +31981,40 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/function) "Jj" = ( -/obj/effect/low_wall_spawner/eris/reinforced/rglass, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/wall/tgmc/durawall/deco1, /area/aro3/flight_deck) "Jl" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /obj/structure/table/fancyblack, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "Jt" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "JF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) +"JJ" = ( +/obj/effect/floor_decal/milspec/color/orange/half, +/turf/simulated/floor/tiled/milspec, +/area/aro3/atmos) "JK" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = 23 +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/machinery/vending/engineering, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "JM" = ( /obj/machinery/media/jukebox, @@ -30455,12 +32024,20 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/door/airlock/angled_bay/standard{ +/obj/machinery/door/airlock/angled_tgmc/personal{ dir = 4; +<<<<<<< HEAD name = "public restroom"; stripe_color = "#00AA00 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc + name = "public restroom"; + stripe_color = "#00AA00" +======= + name = "public restroom" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/wc_port) "JZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -30472,8 +32049,14 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) +"Kf" = ( +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 10 + }, +/turf/simulated/floor/tiled/milspec/sterile, +/area/aro3/medical) "Kj" = ( /obj/machinery/light_switch{ dir = 1; @@ -30497,7 +32080,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/suite_port) "Kp" = ( /obj/structure/table/glass, @@ -30505,19 +32088,28 @@ Ua /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Kr" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/hallway_bunkrooms) +"Kt" = ( +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) "Kw" = ( /obj/machinery/pointdefense_control{ id_tag = "aro3_pd" }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec/raised, /area/aro3/surfluid) "Kz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30532,7 +32124,8 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "KB" = ( /turf/space/internal_edge/topleft, @@ -30558,7 +32151,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/cockpit) "KI" = ( /obj/machinery/power/pointdefense{ @@ -30571,13 +32164,15 @@ Ua /turf/simulated/floor/reinforced/airless, /area/space) "KK" = ( -/obj/machinery/door/airlock/angled_bay/double/glass{ +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + dir = 4; name = "repair bay" }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "KN" = ( -/turf/simulated/floor/tiled/eris/steel/panels, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "KP" = ( /obj/machinery/light/small{ @@ -30595,7 +32190,10 @@ Ua name = "trash bin"; pixel_y = 3 }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "KU" = ( /obj/structure/cable/cyan{ @@ -30604,7 +32202,10 @@ Ua /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "KX" = ( /obj/structure/bed/chair/office/dark{ @@ -30616,7 +32217,7 @@ Ua /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "Lb" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/bar) "Le" = ( /obj/machinery/light{ @@ -30625,7 +32226,10 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Lf" = ( /obj/effect/shuttle_landmark{ @@ -30643,7 +32247,7 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "Ll" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ @@ -30652,10 +32256,7 @@ Ua /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/aro3/atmos) -"Lm" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "Ln" = ( /obj/structure/table/rack/shelf/steel, @@ -30670,7 +32271,10 @@ Ua /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Lp" = ( /obj/machinery/shipsensors{ @@ -30685,19 +32289,25 @@ Ua /area/aro3/cockpit) "Lq" = ( /obj/machinery/optable, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Ls" = ( /obj/structure/bed/chair/sofa/corp/corner{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "Lt" = ( /obj/machinery/computer/ship/navigation{ req_one_access = list(777) }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue, +/turf/simulated/floor/tiled/milspec, +/area/aro3/cockpit) +"LB" = ( +/turf/simulated/wall/tgmc/durawall/deco1, /area/aro3/cockpit) "LD" = ( /obj/structure/cable/cyan{ @@ -30706,7 +32316,8 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/stripe, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "LE" = ( /obj/machinery/light{ @@ -30718,7 +32329,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "LI" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -30730,7 +32341,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "LR" = ( /obj/machinery/power/pointdefense{ @@ -30745,7 +32356,10 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "LT" = ( /obj/machinery/portable_atmospherics/canister/air, @@ -30765,7 +32379,10 @@ Ua /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 23 }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Md" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30777,13 +32394,16 @@ Ua /obj/structure/closet/autolok_wall{ pixel_y = 32 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Mg" = ( /obj/structure/cable/cyan{ icon_state = "1-4" }, -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/atmos) "Mh" = ( /obj/structure/lattice, @@ -30799,7 +32419,10 @@ Ua /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Mk" = ( /obj/machinery/atmospherics/pipe/manifold/visible/blue, @@ -30818,25 +32441,36 @@ Ua /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Mr" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Mt" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) +"Mz" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/milspec/color/orange/half, +/obj/effect/floor_decal/milspec/color/orange/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/power) "MA" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "MC" = ( /turf/space/internal_edge/topright, @@ -30845,16 +32479,39 @@ Ua /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/techmaint, /area/aro3/bar) +"MG" = ( +/obj/structure/marker_beacon{ + mapped_in_color = "Olive"; + name = "green beacon"; + perma = 1 + }, +/turf/simulated/floor/plating/eris/under/airless, +/area/space) +"MI" = ( +/obj/effect/floor_decal/milspec/stripe{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) +"MJ" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/function) "MK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/steel/panels, +/turf/simulated/floor/tiled/milspec, /area/aro3/bar) "MN" = ( /obj/machinery/optable{ name = "Robotics Operating Table" }, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "MO" = ( /obj/machinery/firealarm/angled/hidden{ @@ -30869,7 +32526,10 @@ Ua /obj/machinery/alarm/angled/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/eris/white/golden, +/obj/effect/floor_decal/milspec_sterile/green/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "MS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30878,7 +32538,8 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "MW" = ( /obj/structure/cable/cyan{ @@ -30890,10 +32551,11 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/floor_decal/milspec/monotile, /obj/effect/floor_decal/emblem/aronai{ dir = 9 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "MY" = ( /obj/structure/cable/cyan{ @@ -30910,24 +32572,29 @@ Ua /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Nd" = ( /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/eris/white/golden, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Nj" = ( -/obj/machinery/door/airlock/angled_bay/standard{ +/obj/machinery/door/airlock/angled_tgmc{ dir = 4; - name = "storage room"; - stripe_color = "#9e6243" + name = "storage room" }, -/turf/simulated/floor/tiled/eris/dark/panels, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "Nm" = ( -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_starboard_wc) "Np" = ( /turf/simulated/floor/carpet/blucarpet, @@ -30937,35 +32604,40 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Ns" = ( -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "Nu" = ( /turf/simulated/wall/rpshull, /area/aro3/eva_hall) "NA" = ( -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/kitchen) "NC" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/repair_bay) "NF" = ( /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "NG" = ( -/obj/machinery/vending/tool{ - dir = 8 +/obj/machinery/computer/ship/sensors{ + dir = 8; + req_one_access = list(777) }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/color/blue, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "NI" = ( /obj/structure/cable/cyan{ icon_state = "1-8" }, -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/power) "NJ" = ( /obj/machinery/light{ @@ -30973,7 +32645,10 @@ Ua }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "NL" = ( /turf/simulated/floor/tiled/techmaint, @@ -30983,13 +32658,16 @@ Ua /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "NQ" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "NR" = ( /obj/structure/cable/cyan{ @@ -30998,14 +32676,15 @@ Ua /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "NU" = ( /obj/structure/table/steel, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "NV" = ( /obj/structure/table/glass, @@ -31014,7 +32693,8 @@ Ua dir = 1 }, /obj/machinery/light, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Ob" = ( /obj/structure/cable/cyan{ @@ -31042,7 +32722,13 @@ Ua /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Oq" = ( /obj/structure/cable/cyan{ @@ -31056,12 +32742,19 @@ Ua /obj/machinery/computer/transhuman/resleeving{ req_access = list() }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Os" = ( -/obj/structure/cable/cyan, -/obj/machinery/power/apc/angled/hidden, -/turf/simulated/floor/tiled/eris/dark, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 10 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "Ou" = ( /obj/machinery/light_switch{ @@ -31070,10 +32763,16 @@ Ua }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 5 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "Ov" = ( -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "Ox" = ( /obj/structure/cable/cyan{ @@ -31085,7 +32784,10 @@ Ua /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Oy" = ( /obj/structure/window/basic{ @@ -31094,17 +32796,18 @@ Ua /obj/machinery/shower{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_port_wc) "Oz" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "OF" = ( -/obj/machinery/door/blast/multi_tile/two_tile_ver{ - id = "aroshipshutter_stbdair" +/obj/machinery/door/blast/angled{ + dir = 4; + id = "aroshipshutter_portair" }, /turf/simulated/floor/reinforced/airless, /area/aro3/eva_hall) @@ -31117,8 +32820,11 @@ Ua "ON" = ( /obj/structure/table/steel, /obj/item/weapon/storage/toolbox/electrical, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) +"OP" = ( +/turf/simulated/wall/tgmc/durawall/deco2, +/area/aro3/surfluid) "OR" = ( /obj/machinery/button/remote/airlock{ dir = 1; @@ -31148,22 +32854,29 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "OW" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/door/airlock/angled_bay/double/glass{ - name = "ship systems" +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + dir = 4; + name = "ship systems"; + req_one_access = list(777) }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "Pb" = ( /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "Pe" = ( /obj/structure/table/bench/steel, @@ -31176,8 +32889,11 @@ Ua /area/aro3/park) "Pi" = ( /obj/machinery/alarm/angled/hidden, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) +"Pt" = ( +/turf/simulated/wall/tgmc/durawall/deco0, +/area/aro3/power) "Pu" = ( /obj/structure/bed/double/padded, /obj/item/weapon/bedsheet/bluedouble, @@ -31188,7 +32904,7 @@ Ua dir = 1 }, /obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "Px" = ( /obj/machinery/light{ @@ -31200,24 +32916,24 @@ Ua /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "PB" = ( /obj/structure/closet/crate/freezer/centauri, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) -"PC" = ( -/obj/machinery/door/firedoor/glass/hidden{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/aro3/repair_bay) "PG" = ( /obj/structure/table/glass, /obj/item/roller/adv{ pixel_y = 8 }, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "PI" = ( /obj/structure/table/glass, @@ -31226,25 +32942,26 @@ Ua }, /obj/machinery/recharger, /obj/random/medical, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "PJ" = ( /obj/structure/bed/chair/sofa/corp{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "PL" = ( /obj/structure/reagent_dispensers/foam, /obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "PN" = ( /obj/structure/table/steel, /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 23 }, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "PO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -31253,36 +32970,43 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "PP" = ( /obj/machinery/computer/ship/helm{ req_one_access = list(777) }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "PV" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /obj/machinery/firealarm/angled/hidden, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/white/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "Qb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "Qe" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/hatchmarks, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "Qt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "Qv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -31291,11 +33015,23 @@ Ua /turf/simulated/floor/tiled/eris/steel/bar_flat, /area/aro3/bar) "Qw" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/hatchmarks, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) +"Qz" = ( +/obj/effect/floor_decal/milspec/color/white/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) +"QA" = ( +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 10 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "QB" = ( /obj/structure/fans/hardlight, @@ -31315,14 +33051,15 @@ Ua "QD" = ( /obj/structure/fans/hardlight, /obj/machinery/door/firedoor/glass/hidden, -/obj/machinery/door/airlock/angled_bay/double/glass{ - name = "hangar"; - stripe_color = "#AA0000" +/obj/machinery/door/airlock/angled_tgmc/wide/security{ + dir = 4; + name = "hangar" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "QE" = ( -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/suite_port_wc) "QG" = ( /obj/structure/closet/crate/bin{ @@ -31331,15 +33068,32 @@ Ua name = "trash bin"; pixel_y = 3 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) +"QN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_port) "QO" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/door/airlock/angled_bay/double/glass{ +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + dir = 4; name = "park" }, +/obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/park) "QS" = ( @@ -31349,7 +33103,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "QT" = ( /obj/structure/closet/crate/bin{ @@ -31358,12 +33112,22 @@ Ua name = "trash bin"; pixel_y = 3 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "QV" = ( /obj/structure/closet/cabinet, /turf/simulated/floor/wood, /area/aro3/suite_port) +"QW" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/hallway_starboard) "QZ" = ( /obj/structure/bed/chair/wood{ dir = 4 @@ -31371,7 +33135,8 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "Rj" = ( /obj/machinery/light{ @@ -31383,25 +33148,37 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Rk" = ( /obj/machinery/vending/loadout, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "Rm" = ( -/obj/machinery/door/airlock/angled_bay/standard{ +/obj/machinery/door/airlock/angled_tgmc{ dir = 4; id_tag = "aro3_private1_bed"; +<<<<<<< HEAD name = "bedroom"; stripe_color = "#00AA00 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc + name = "bedroom"; + stripe_color = "#00AA00" +======= + name = "bedroom" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, +/obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_port) "Rp" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "Rt" = ( /obj/structure/cable/cyan{ @@ -31413,24 +33190,23 @@ Ua /obj/structure/table/rack/shelf/steel, /obj/item/mecha_parts/mecha_equipment/omni_shield, /obj/item/mecha_parts/mecha_equipment/repair_droid, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "Rw" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "Ry" = ( /obj/structure/closet/crate/freezer/rations, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) "Rz" = ( -/obj/effect/low_wall_spawner/eris/reinforced/rglass, -/turf/simulated/floor/plating/eris/under, -/area/aro3/surfluid) +/turf/simulated/wall/tgmc/durawall/deco0, +/area/aro3/suite_starboard) "RJ" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/surfluid) "RK" = ( /obj/structure/cable/cyan{ @@ -31463,7 +33239,10 @@ Ua "Sc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "Sj" = ( /obj/structure/cable/cyan{ @@ -31472,7 +33251,10 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Sm" = ( /obj/structure/cable/cyan{ @@ -31492,15 +33274,6 @@ Ua /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) -"SD" = ( -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "aroshipshutter_stbdair"; - name = "exterior shutters"; - pixel_x = 28 - }, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/aro3/eva_hall) "SE" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -31508,8 +33281,18 @@ Ua /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) +"SF" = ( +/obj/machinery/door/blast/angled{ + dir = 4; + id = "aroshipshutter_stbdair" + }, +/turf/simulated/floor/reinforced/airless, +/area/aro3/eva_hall) "SK" = ( /obj/structure/cable/cyan, /obj/structure/closet/crate, @@ -31526,7 +33309,7 @@ Ua /obj/item/weapon/inducer/hybrid, /obj/item/device/perfect_tele/alien/bluefo, /obj/item/device/mapping_unit, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "Ta" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -31557,7 +33340,7 @@ Ua /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/shuttle/aroboat3) "Tc" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/workshop) "Tg" = ( /obj/machinery/alarm/angled/hidden{ @@ -31567,14 +33350,16 @@ Ua outdoors = 0 }, /area/aro3/park) +"Tj" = ( +/turf/simulated/floor/tiled/milspec/sterile, +/area/aro3/medical) "To" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/door/airlock/angled_bay/double/glass{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Tr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -31583,13 +33368,14 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "Tv" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/white/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "Tw" = ( /obj/structure/closet/secure_closet/freezer/meat, @@ -31612,7 +33398,8 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "TD" = ( /obj/structure/cable/cyan{ @@ -31624,13 +33411,13 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "TF" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/power) "TK" = ( /obj/structure/cable/cyan{ @@ -31642,7 +33429,7 @@ Ua "TM" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "TN" = ( /obj/machinery/vending/food/arojoan{ @@ -31651,10 +33438,12 @@ Ua /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) "TO" = ( -/obj/machinery/door/airlock/angled_bay/double/glass{ +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + dir = 4; name = "kitchen" }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "TQ" = ( /obj/machinery/portable_atmospherics/canister/empty, @@ -31682,7 +33471,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/medical) "Ua" = ( /turf/space, @@ -31691,27 +33480,29 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/door/airlock/angled_bay/double/glass{ - name = "bridge"; - req_one_access = list(777); - stripe_color = "#0000AA" +/obj/machinery/door/airlock/angled_tgmc/wide/command{ + dir = 4; + req_one_access = list(777) }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "Uj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/angled_bay/double/glass{ - name = "bunkrooms"; - stripe_color = "#00AA00" +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + dir = 4; + name = "bunkrooms" }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "Ul" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "Uq" = ( /turf/simulated/floor/tiled/techmaint, @@ -31723,11 +33514,13 @@ Ua /obj/structure/bed/chair/sofa/corp/right{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "Ut" = ( /obj/machinery/vending/cola/soft, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "Uu" = ( /turf/space/internal_edge/topleft, @@ -31736,21 +33529,35 @@ Ua /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/door/airlock/angled_bay/double/glass{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Uy" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/suite_port_wc) "Uz" = ( -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "UE" = ( /obj/machinery/computer/shuttle_control/explore/aroboat3, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/shuttle/aroboat3) +"UI" = ( +/obj/structure/sign/warning/vacuum{ + pixel_y = 30 + }, +/obj/effect/floor_decal/milspec/color/white/half{ + dir = 1 + }, +/obj/effect/floor_decal/milspec/stripe{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) +"UM" = ( +/turf/simulated/wall/tgmc/durawall/deco1, +/area/aro3/atmos) "UN" = ( /turf/simulated/floor/reinforced/airless, /area/aro3/eva_hall) @@ -31759,7 +33566,8 @@ Ua /obj/structure/cable/cyan{ icon_state = "0-4" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/white/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "UR" = ( /obj/structure/cable/cyan{ @@ -31768,7 +33576,10 @@ Ua /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "US" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -31782,7 +33593,7 @@ Ua /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "Ve" = ( /obj/structure/cable/cyan{ @@ -31800,23 +33611,38 @@ Ua "Vl" = ( /obj/structure/table/glass, /obj/item/weapon/storage/firstaid/adv, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Vp" = ( /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 8; pixel_x = -25; - req_access = list() + req_access = list(777) }, /obj/structure/cable/cyan, /obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/cargo_arrow{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/engines) "Vv" = ( +<<<<<<< HEAD /obj/machinery/door/airlock/angled_bay/standard{ name = "bunkroom 1"; stripe_color = "#00AA00 +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +/obj/machinery/door/airlock/angled_bay/standard{ + name = "bunkroom 1"; + stripe_color = "#00AA00" +======= +/obj/machinery/door/airlock/angled_tgmc/cell{ + name = "bunkroom 1" +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc }, /turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/bunkrooms) @@ -31827,15 +33653,12 @@ Ua /turf/simulated/floor/water/indoors/surfluid, /area/aro3/surfluid) "VD" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/suite_starboard_wc) "VO" = ( /obj/structure/fans/hardlight, -/obj/machinery/door/airlock/angled_bay/double/glass{ - dir = 8; - door_color = "#AA0000"; - name = "starboard airlock"; - stripe_color = "#FFFFFF" +/obj/machinery/door/airlock/angled_tgmc/wide/security{ + name = "starboard airlock" }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/eva_hall) @@ -31843,7 +33666,10 @@ Ua /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/color/white/half{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "VS" = ( /obj/structure/cable/cyan{ @@ -31855,7 +33681,10 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/function) "VX" = ( /obj/structure/cable/cyan{ @@ -31864,12 +33693,15 @@ Ua /turf/simulated/floor/wood, /area/aro3/suite_port) "VZ" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/kitchen) "Wc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Wg" = ( /obj/structure/table/steel, @@ -31880,7 +33712,8 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/green/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/bar) "Wl" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ @@ -31890,18 +33723,17 @@ Ua /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "Wy" = ( -/obj/effect/low_wall_spawner/eris/reinforced/rglass, -/turf/simulated/floor/plating/eris/under, -/area/aro3/medical) +/turf/simulated/wall/tgmc/durawall/deco1, +/area/aro3/suite_port) "Wz" = ( /obj/structure/table/steel, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "WA" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/workshop) "WB" = ( /obj/item/modular_computer/console/preset/civilian, @@ -31924,36 +33756,52 @@ Ua "WJ" = ( /turf/space/internal_edge/bottom, /area/aro3/bar) -"WL" = ( -/obj/structure/cable/cyan{ - icon_state = "2-4" +"WK" = ( +/obj/effect/floor_decal/milspec/color/white/corner{ + dir = 1 }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/eva_hall) +"WL" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark, +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 8 + }, +/obj/machinery/light/floortube{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "WN" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/hallway_bunkrooms) "WP" = ( -/obj/structure/closet/walllocker/emerglocker/north, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/power/apc/angled/hidden{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/structure/cable/cyan{ + icon_state = "0-2" + }, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 9 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "WR" = ( /obj/machinery/appliance/cooker/fryer, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) "WU" = ( -/obj/effect/low_wall_spawner/eris/reinforced/rglass, -/turf/simulated/floor/plating/eris/under, -/area/aro3/bar) +/turf/simulated/wall/tgmc/durawall/deco1, +/area/aro3/suite_starboard) "WV" = ( /obj/structure/table/steel, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "WY" = ( /obj/structure/table/steel, @@ -31963,12 +33811,15 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "Xb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "Xi" = ( /obj/structure/table/glass, @@ -31976,7 +33827,7 @@ Ua dir = 8 }, /obj/item/device/healthanalyzer/phasic, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Xj" = ( /turf/simulated/floor/water/deep/indoors, @@ -31985,7 +33836,8 @@ Ua /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Xo" = ( /obj/machinery/ion_engine{ @@ -32004,7 +33856,8 @@ Ua d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/stripe, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Xt" = ( /obj/structure/railing/grey{ @@ -32025,7 +33878,10 @@ Ua /turf/space, /area/space) "XF" = ( -/turf/simulated/floor/tiled/eris/dark/danger, +/obj/effect/floor_decal/milspec/stripe{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "XJ" = ( /obj/structure/cable/cyan{ @@ -32037,12 +33893,22 @@ Ua /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "XQ" = ( /obj/structure/medical_stand/anesthetic, -/turf/simulated/floor/tiled/eris/white/cargo, +/obj/effect/floor_decal/milspec_sterile/green/half, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) +"XT" = ( +/obj/effect/floor_decal/milspec/color/orange/half{ + dir = 1 + }, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = 23 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/atmos) "XV" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -32065,38 +33931,52 @@ Ua /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Yf" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Yh" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/door/airlock/angled_bay/standard/glass{ - name = "qpad room"; - stripe_color = "#AA00AA" +/obj/machinery/door/airlock/angled_tgmc/engineering{ + name = "quantum pad" }, -/turf/simulated/floor/tiled/eris/dark/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Yj" = ( /obj/machinery/recharge_station, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Ym" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/workshop) "Yp" = ( /obj/structure/closet/walllocker/emerglocker/north, /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) +"Yq" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/milspec/color/red/half, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) "Yt" = ( /obj/structure/closet/crate/bin{ anchored = 1; @@ -32104,7 +33984,7 @@ Ua name = "trash bin"; pixel_y = 3 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "Yu" = ( /obj/machinery/button/remote/airlock{ @@ -32135,9 +34015,14 @@ Ua /turf/simulated/floor/wood, /area/aro3/suite_port) "YB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/milspec/color/blue/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "YF" = ( /obj/structure/table/darkglass, @@ -32152,37 +34037,45 @@ Ua /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "YJ" = ( -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/blue/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "YN" = ( /obj/structure/table/steel, /obj/item/device/flashlight/lamp, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) -"YO" = ( -/turf/simulated/floor/tiled/eris/steel/panels, -/area/aro3/atmos) "YQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "YR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "YT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/effect/floor_decal/milspec/monotile, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "YY" = ( /turf/simulated/floor/tiled/eris/steel/bar_flat, @@ -32195,9 +34088,8 @@ Ua /area/space) "Za" = ( /obj/machinery/atmospherics/portables_connector/aux, -/obj/effect/floor_decal/industrial/outline/blue, /obj/mecha/combat/fighter/pinnace/loaded, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "Ze" = ( /obj/structure/cable/cyan{ @@ -32209,7 +34101,10 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "Zg" = ( /obj/structure/cable/cyan{ @@ -32218,19 +34113,20 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Zm" = ( -/turf/simulated/wall/eris/r_wall, +/turf/simulated/wall/tgmc/durawall, /area/aro3/cockpit) "Zo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/alarm/angled/hidden{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, +/obj/effect/floor_decal/milspec/color/blue/half, +/turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) "Zt" = ( /obj/structure/cable/cyan{ @@ -32245,8 +34141,11 @@ Ua /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) +"Zv" = ( +/turf/simulated/wall/tgmc/durawall/deco0, +/area/aro3/atmos) "Zw" = ( /obj/structure/sink{ pixel_y = 24 @@ -32257,15 +34156,19 @@ Ua /obj/machinery/power/apc/angled/hidden{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white, +/turf/simulated/floor/tiled/milspec/sterile, /area/aro3/wc_starboard) +"Zx" = ( +/turf/simulated/floor/tiled/milspec, +/area/aro3/surfluid) "ZB" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/obj/effect/floor_decal/milspec/color/silver/corner, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "ZC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -32273,7 +34176,7 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "ZI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -32282,7 +34185,7 @@ Ua /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "ZK" = ( /obj/structure/closet/walllocker/emerglocker/north, @@ -32305,20 +34208,20 @@ Ua /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark, +/turf/simulated/floor/tiled/milspec, /area/aro3/power) "ZN" = ( /obj/machinery/light_switch{ dir = 1; pixel_y = -24 }, -/obj/structure/closet/crate/bin{ - anchored = 1; - density = 0; - name = "trash bin"; - pixel_y = 3 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/dark, +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 6 + }, +/turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "ZO" = ( /obj/item/weapon/bedsheet, @@ -32331,8 +34234,12 @@ Ua }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) +"ZT" = ( +/obj/effect/floor_decal/milspec/color/green/half, +/turf/simulated/floor/tiled/milspec, +/area/aro3/function) "ZU" = ( /obj/structure/table/rack/shelf/steel, /obj/fiftyspawner/phoron, @@ -32343,13 +34250,13 @@ Ua icon = 'icons/turf/shuttle_alien_blue.dmi' }, /obj/mecha/combat/fighter/gunpod/loaded, -/turf/simulated/floor/tiled/eris/dark/gray_platform, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "ZY" = ( /obj/structure/cable/cyan{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) (1,1,1) = {" @@ -40105,8 +42012,8 @@ ZO lO hw uE -uE -uE +Tj +Tj aJ Oz aJ @@ -40235,7 +42142,7 @@ Yu Pu Wg ap -pV +vF hN WN qH @@ -40247,19 +42154,19 @@ vQ lO Or sI -uE -uE +Tj +Tj AL aL Dx xj -uE +Kf kH aq -uL +vT rP Gs -uL +vT aq Fn yn @@ -40388,20 +42295,20 @@ iR ZO lO Lo -uE -uE -uE +Tj +Tj +Tj Mn aL iD xj -uE +Tj Lq -aq -TW +Pt +Dk iZ mW -TW +Dk aq Fn Fn @@ -40518,7 +42425,7 @@ lf lf MY bH -ap +Wy ye ZP fc @@ -40530,14 +42437,14 @@ zo zo lO EK -uE -uE -uE +Tj +Tj +Tj PI nB Xi aS -uE +Tj XQ aq Ew @@ -40654,7 +42561,7 @@ Uy Uy CR Oy -ap +Hz xh KX II @@ -40681,7 +42588,7 @@ XJ jV ED NV -aq +Pt TW wW RK @@ -40803,8 +42710,8 @@ pj af iS ap -Fr -qI +lh +Hs WN WN Ex @@ -40816,9 +42723,9 @@ lO Mb zd GE -uE +Bc Nd -uE +td eb mI tv @@ -40958,7 +42865,7 @@ lO pH Kp Na -pH +wl lO dB is @@ -40972,9 +42879,9 @@ gb gb gb gb -gb -gb -gb +wV +wV +Mz Vp aq Fn @@ -41062,10 +42969,10 @@ Ua Ua Ua pc -lb -Ua -Ua -wc +jj +hD +hD +hD Fn Fn Fn @@ -41088,7 +42995,7 @@ bk ap ap pm -qI +yH WN WN WN @@ -41098,11 +43005,11 @@ zo zo lO lO -Wy -Wy lO lO -iN +lO +lO +Kt vM lO lO @@ -41113,12 +43020,12 @@ Rw kh NG GC -vX -kW -Bi Uz -wO -aq +Uz +Uz +ih +jQ +aC Fn Xo Ua @@ -41204,10 +43111,10 @@ Ua pc Fn Fn -Fn -UN -oN -Fn +cB +OF +OF +cB Fn IT IT @@ -41226,7 +43133,7 @@ lI Yf Yf Yf -Eh +bL Yf Yf ro @@ -41244,14 +43151,14 @@ SE Yf Yb Yf -Yf +uW wu Yf Yf -Eh -yV -gb -iQ +aV +aq +rw +Rw WV xF ON @@ -41259,7 +43166,7 @@ WV WV ZM Uz -wO +ID aq Fn Xo @@ -41339,17 +43246,17 @@ Ua Ua Ua qg -lb +jj Fn Fn Fn Fn Fn Fn -Nu +cB Ma UN -Nu +cB Nu IT hb @@ -41380,7 +43287,7 @@ FZ FZ FZ FZ -FZ +du Hi vh FZ @@ -41390,7 +43297,7 @@ FZ fo FZ Et -ZP +iQ dt Ou ny @@ -41400,7 +43307,7 @@ nn Bp Bp Qb -wO +tK Am aq Fn @@ -41510,29 +43417,32 @@ ns VZ VZ VZ -qI -Fr +ev +QN +VZ +VZ VZ -Fy -Fy RJ RJ -Rz -Rz -Rz RJ RJ -iN +RJ +RJ +RJ +Kt Fr NC NC NC -ff -ff +NC +NC NC NC oz -qI +lm +Iq +Iq +Iq Iq Iq Iq @@ -41540,9 +43450,6 @@ Iq Iq Iq Iq -Jj -Jj -Jj Iq Iq Ur @@ -41631,9 +43538,9 @@ Xv Xv RR lu +UI XF -XF -fZ +lM cB Uu Dn @@ -41657,7 +43564,7 @@ Aj VZ WR yD -RJ +gc cH cH cH @@ -41677,14 +43584,14 @@ Ty To Iq Hc -Ov +QA HE HE HE HE HE tz -Ov +Hc md xB Bw @@ -41772,9 +43679,9 @@ Xj Xj Xj Xj -lu -XF -XF +ff +au +kE kc cB EC @@ -41799,7 +43706,7 @@ KC yW AD AD -RJ +OP qW qW cH @@ -41808,27 +43715,27 @@ qW RJ lC Fr -ff -hl -hl +Bi +Is +Is IS yu -hl +Is NC Rj -qI +lm Iq wq -Ov +EH Fc UE lY zi Cu HE +gH Ov -Ov -Ov +BJ Vg hD hD @@ -41887,7 +43794,7 @@ Ua Ua Ua qg -lb +jj Fn Fn Fn @@ -41904,7 +43811,7 @@ Fn ee Zm Zm -Zm +cD xg AY qJ @@ -41916,7 +43823,7 @@ el Tg lu DM -XF +Qz UP cB EC @@ -41950,27 +43857,27 @@ mL RJ Pz Fr -ff +NC mO -hl +Is Is ZY CW NC mF -qI +lm Iq aA -Ov +EH Fc bs XV Tb eI HE +gH Ov -Ov -Ov +BJ Vg hD hD @@ -42044,7 +43951,7 @@ CN CN CN Ae -Zm +LB gR Ca NQ @@ -42066,10 +43973,10 @@ Pb rN CA rN -zu +gA qX Fb -zu +gA EF kb uJ @@ -42090,7 +43997,7 @@ WL Os RJ RJ -iN +Kt Fr NC NC @@ -42100,19 +44007,19 @@ hi Hn NC oz -qI +lm Jj -Ov -Ov +gH +EH HE HE HE QB HE tz +gH Ov -Ov -Ov +BJ Vg hD hD @@ -42204,7 +44111,7 @@ oF aj kr zm -Jt +MJ Jt iC Jt @@ -42215,7 +44122,7 @@ gA gA Qt gA -gA +ZT TO NA AD @@ -42227,16 +44134,16 @@ AD AD YJ vx -uG +FB LN -IK +uG OW zx Fo -Fr +BN At KK -hl +lx Is nh cJ @@ -42244,17 +44151,17 @@ lw Ad LD QD -Ov -Ov -Ov -Ov -Ov +gH +BO +cE +cE +cE cV +cE +cE +pg Ov -Ov -Ov -Ov -Ov +oe Ur Di hD @@ -42346,7 +44253,7 @@ FF HL Fj pP -aB +oY aB wi aB @@ -42357,8 +44264,8 @@ hj hj mD gA -gA -jg +ZT +zu NA AD AD @@ -42369,8 +44276,8 @@ AD AD YJ Be -yR -au +FB +Zx YB oK Sc @@ -42382,7 +44289,7 @@ DL ij ij xE -PC +gl ow Xp wS @@ -42396,7 +44303,7 @@ yy MA MA MA -MA +Yq xG DA te @@ -42470,7 +44377,7 @@ CN CN CN at -Zm +LB jz yS NQ @@ -42485,17 +44392,17 @@ jr lu lu VQ -XF +tV cB cB Pb pr QZ pr -zu +gA qX Fb -zu +gA EF Jl uJ @@ -42512,11 +44419,11 @@ jX RJ RJ tB -yk +kW ZN RJ RJ -Mr +jF CH NC NC @@ -42538,7 +44445,7 @@ ZI Ov Ov Ov -Ov +BJ ke hD hD @@ -42597,7 +44504,7 @@ Ua Ua Ua bU -xO +MG Fn Fn Fn @@ -42614,7 +44521,7 @@ Fn ee Zm Zm -Zm +IQ yF bc qJ @@ -42626,7 +44533,7 @@ el vZ lu vP -XF +Qz nH cB EC @@ -42654,15 +44561,15 @@ DG RJ vb yk -gc +yk yk Kw RJ df CH -ff +NC zy -hl +Is Is Is Yt @@ -42680,7 +44587,7 @@ Ci Qe Ov Ov -Ov +BJ Vg hD hD @@ -42766,9 +44673,9 @@ Xj Xj Xj Xj -lu -XF -XF +ff +fZ +WK kc cB EC @@ -42777,8 +44684,8 @@ rN rN rN Ac -qX -Fb +dQ +gv sO nq PJ @@ -42793,18 +44700,18 @@ KC hh AD AD -RJ +OP VA VA cH VA VA -RJ -Mr +gc +jF CH -ff +NC Pi -hl +Is IS ZW HO @@ -42822,7 +44729,7 @@ Qw Qe Ov Ov -Ov +BJ Vg hD hD @@ -42909,9 +44816,9 @@ jM jM Vk lu -XF -XF -SD +sM +MI +wb cB hk EU @@ -42935,7 +44842,7 @@ Aj VZ ec AQ -RJ +gc cH cH cH @@ -42957,12 +44864,12 @@ Iq jU sx kg -Ov -Ov -Ov -Ov -Ov -Ov +aK +aK +aK +aK +aK +aK kg Es CM @@ -43062,7 +44969,7 @@ ns ns ns Bn -Mr +vf ns ns ns @@ -43072,25 +44979,25 @@ ns VZ VZ VZ -kl -CH +Ap +nb +VZ +VZ VZ -Fy -Fy RJ RJ -Rz -Rz -Rz RJ RJ -Mr +RJ +RJ +RJ +jF CH NC NC NC -ff -ff +NC +NC NC NC OV @@ -43102,9 +45009,9 @@ Iq Iq Iq Iq -Jj -Jj -Jj +Iq +Iq +Iq Iq Iq Ur @@ -43185,17 +45092,17 @@ Ua Ua Ua bU -xO +MG Fn Fn Fn Fn Fn Fn -Nu +cB Ma UN -Nu +cB Nu Hd wF @@ -43214,7 +45121,7 @@ YQ Wc YI Wc -Wc +BQ vp Wc Mi @@ -43226,7 +45133,7 @@ Wc Wc Wc Wc -aR +lZ vp cI Wc @@ -43235,7 +45142,7 @@ Wc av Wc Wc -vp +ma ku iY wm @@ -43246,7 +45153,7 @@ oP vV vV xN -Lm +EA yc fB Fn @@ -43334,10 +45241,10 @@ Ua Lp Fn Fn -Fn -UN -OF -Fn +cB +SF +SF +cB Fn Hd Hd @@ -43356,13 +45263,13 @@ KU Hr Hr Hr -Hr +QW Hr Hr Ze ne Hr -or +re sD Hr Hr @@ -43379,8 +45286,8 @@ ne Hr Hr tk -YO -Lm +fB +XT Ie eZ eL @@ -43389,7 +45296,7 @@ cn eZ NU Ns -Lm +JJ fB Fn Xo @@ -43476,10 +45383,10 @@ Ua Ua Ua YZ -xO -Ua -Ua -oW +MG +hD +hD +hD Fn Fn Fn @@ -43502,22 +45409,22 @@ jy hM hM Op -Mr +EE +Lb +Lb +Lb Lb Lb Lb -WU -WU -WU Lb Tc Tc -Hz -Hz Tc Tc -CH -Mr +Tc +Tc +xT +rO Tc Tc Tc @@ -43531,8 +45438,8 @@ Ns Ns Ns Ns -Lm -fB +JJ +UM Fn Xo Ua @@ -43667,13 +45574,13 @@ fB Eo Ll zT -Lm -Lm -Lm -Lm -Lm -Lm -Lm +Ns +Ns +Ns +cx +cx +cx +lD fB Fn yn @@ -43785,8 +45692,8 @@ Hq nL od hM -CH -Mr +Co +Cf Lb Lb nz @@ -43794,16 +45701,16 @@ Fx xp Fx al -Tc +vX Wz -nm +tl tl tl yK iB kp gQ -nm +tl TM fB Cq @@ -43920,7 +45827,7 @@ VD VD AX Gp -hM +Rz WB Eu US @@ -43938,16 +45845,16 @@ hT Lb Tc aa -nm +tl tl tl tl Tr -DW +Ym +tl tl -nm ER -fB +Zv wd xW Gy @@ -44068,7 +45975,7 @@ xP xP kk ZL -hM +WU PO aR DY @@ -44080,14 +45987,14 @@ YY WJ Tc yo -nm +tl tl kI FP WY Ym tl -nm +tl NF fB LT @@ -44222,16 +46129,16 @@ YY WJ Tc PN -nm +tl tl rA aH IJ Ym tl -nm +tl ER -fB +Zv Wl Mk Gj @@ -44353,7 +46260,7 @@ xw Fl YN hM -Yj +dx LS Lb mG @@ -44364,14 +46271,14 @@ YY WJ Tc MN -nm +tl tl px Er dO Ym tl -nm +tl TM fB gG @@ -44506,7 +46413,7 @@ YY WJ Tc dM -nm +tl tl tl tl diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index f66ea89482..c1e8fac4c3 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -32309,7 +32309,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "cWS" = ( -/obj/item/device/radio/beacon, +/obj/effect/floor_decal/emblem/nt2, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "cXW" = ( @@ -33840,6 +33840,10 @@ "igw" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) +"ikG" = ( +/obj/effect/floor_decal/emblem/nt3, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "ilZ" = ( /obj/structure/cable/green{ d1 = 2; @@ -33896,6 +33900,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, +/obj/item/device/radio/beacon, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "iue" = ( @@ -34116,6 +34121,10 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) +"jAo" = ( +/obj/effect/floor_decal/arrivals/right, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_one_hall) "jAq" = ( /obj/structure/table/standard, /obj/effect/floor_decal/borderfloor{ @@ -34548,6 +34557,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"kBW" = ( +/obj/effect/floor_decal/arrivals, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_one_hall) "kCz" = ( /obj/structure/railing{ dir = 4 @@ -36801,6 +36814,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) +"rjh" = ( +/obj/effect/floor_decal/emblem/nt1, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "rnt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -48579,6 +48596,222 @@ aad aad aad aad +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +aan +aaR +abL +abL +abL +ael +aan +atQ +awV +axQ +adZ +ayB +ayZ +aAc +aAi +asT +pVp +uVK +oKn +fFb +meS +meS +ara +aaU +aaU +qJl +aaU +aaU +bwr +bwr +cZL +haw +pKR +apF +aqP +apF +arL +arO +asi +asU +asU +ats +atS +auw +auR +avu +awc +awN +axt +aym +azf +ayG +byn +uUP +tVd +eow +kAG +rZZ +ghg +wxa +glc +glc +glc +hTz +rVb +kPT +bbn +aLi +aLQ +aMB +aNm +aNR +aOo +aOJ +aPc +aPJ +aQg +aQJ +aNm +aRO +aVv +aOJ +aNm +aTV +aUl +aUO +aVc +aVy +aVO +aWm +aWL +aVn +aXP +aXP +aYi +aYi +aKq +aYi +aYi +aZS +bao +baC +baQ +aYi +baU +aah +======= +aan +aaR +abL +abL +abL +ael +aan +atQ +awV +axQ +adZ +ayB +ayZ +aAc +aAi +asT +pVp +uVK +oKn +fFb +meS +meS +ara +aaU +aaU +qJl +aaU +aaU +bwr +bwr +cZL +haw +pKR +apF +aqP +apF +arL +arO +asi +asU +asU +ats +atS +auw +auR +avu +awc +awN +axt +aym +azf +rjh +byn +uUP +tVd +eow +kAG +rZZ +ghg +wxa +glc +glc +glc +hTz +rVb +kPT +bbn +aLi +aLQ +aMB +aNm +aNR +aOo +aOJ +aPc +aPJ +aQg +aQJ +aNm +aRO +aVv +aOJ +aNm +aTV +aUl +aUO +aVc +aVy +aVO +aWm +aWL +aVn +aXP +aXP +aYi +aYi +aKq +aYi +aYi +aZS +bao +baC +baQ +aYi +baU +aah +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc aad aad aad @@ -48987,6 +49220,230 @@ aad aad aad aad +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +aah +aah +aah +aan +acc +acI +adm +aan +aff +aff +awX +aff +aff +ayC +azE +axP +axP +bPH +ksA +nlO +gEn +kAn +miP +saF +cUB +aaU +aaU +aaU +aaU +aaU +aaU +aaU +xqZ +qPs +qhr +apF +aqP +arl +apF +apF +ash +ast +asU +att +atU +auy +auR +avw +awe +awO +axu +auR +azh +ayG +vDb +aBY +aCP +aDu +aDX +aEJ +aFx +sya +aGx +aHl +aDu +aDu +aDu +aDu +aCS +aLj +aLR +aMC +aNo +aNS +aOp +aOK +aPe +aPK +aQh +aQK +aRn +aPK +aSp +aSV +aTC +aSo +aUn +aUp +aVd +aVz +aUt +aWM +aWM +aWV +aVn +aHg +aYi +aYE +aIM +aZu +aYi +aZU +aVH +baE +baD +baT +baU +aad +aad +aad +======= +aah +aah +aah +aan +acc +acI +adm +aan +aff +aff +awX +aff +aff +ayC +azE +axP +axP +bPH +ksA +nlO +gEn +kAn +miP +saF +cUB +aaU +aaU +aaU +aaU +aaU +aaU +aaU +xqZ +qPs +qhr +apF +aqP +arl +apF +apF +ash +ast +asU +att +atU +auy +auR +avw +awe +awO +axu +auR +azh +ikG +vDb +aBY +aCP +aDu +aDX +aEJ +aFx +sya +aGx +aHl +aDu +aDu +aDu +aDu +aCS +aLj +aLR +aMC +aNo +aNS +aOp +aOK +aPe +aPK +aQh +aQK +aRn +aPK +aSp +aSV +aTC +aSo +aUn +aUp +aVd +aVz +aUt +aWM +aWM +aWV +aVn +aHg +aYi +aYE +aIM +aZu +aYi +aZU +aVH +baE +baD +baT +baU +aad +aad +aad +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc aad aad baV @@ -55431,6 +55888,7 @@ apF apF apF aah +<<<<<<< HEAD aah aah adK @@ -55454,6 +55912,43 @@ aEP aFX aFX aGB +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +ash +asy +asV +atw +atV +auz +auR +avz +awh +awQ +axx +auR +azk +ayG +tNJ +agM +aCS +======= +ash +asy +asV +atw +atV +auz +auR +avz +awh +awQ +axx +auR +azk +kBW +tNJ +agM +aCS +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc aCO aHJ aHJ @@ -55926,6 +56421,7 @@ aah aah aah aah +<<<<<<< HEAD baU atz atA @@ -56096,6 +56592,203 @@ aad aad aad aad +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +aeE +afm +afm +axb +afm +afm +aeE +aeE +azV +azV +azV +aAb +aAD +uVK +bbj +bbj +bbj +bbj +bbj +ahg +ahz +ajZ +alD +anL +fgm +ruj +lry +lry +lry +aql +arl +apF +aah +ash +ash +ash +ash +ash +ash +auR +auR +auR +auR +auR +ayn +azd +ayG +vDb +aAR +agM +aCO +aDZ +aEM +aFB +aFS +aEM +aHm +aDu +aIu +aJo +aDu +aKJ +aLj +aLV +aME +aNs +aNS +aOt +aOM +aPi +aPK +aQl +aQM +aRr +aPK +aSt +aSX +aTG +aSo +arm +bcT +aVf +aUs +aUu +iee +aVP +aWZ +bcj +bcF +gzO +bcM +aUm +aUm +aUm +aah +aah +aah +======= +aeE +afm +afm +axb +afm +afm +aeE +aeE +azV +azV +azV +aAb +aAD +uVK +bbj +bbj +bbj +bbj +bbj +ahg +ahz +ajZ +alD +anL +fgm +ruj +lry +lry +lry +aql +arl +apF +aah +ash +ash +ash +ash +ash +ash +auR +auR +auR +auR +auR +ayn +azd +jAo +vDb +aAR +agM +aCO +aDZ +aEM +aFB +aFS +aEM +aHm +aDu +aIu +aJo +aDu +aKJ +aLj +aLV +aME +aNs +aNS +aOt +aOM +aPi +aPK +aQl +aQM +aRr +aPK +aSt +aSX +aTG +aSo +arm +bcT +aVf +aUs +aUu +iee +aVP +aWZ +bcj +bcF +gzO +bcM +aUm +aUm +aUm +aah +aah +aah +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc aah aah naC diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 7cc82c0d98..927dce5900 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -33886,6 +33886,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/floor_decal/emblem/nt1, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "kPR" = ( @@ -33900,6 +33901,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/effect/floor_decal/emblem/nt2, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "kRb" = ( @@ -35006,6 +35008,16 @@ "tPB" = ( /turf/simulated/floor/grass, /area/chapel/main) +"tVj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/emblem/nt3, +/turf/simulated/floor/tiled/techfloor, +/area/ai_upload) "tWV" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -48898,7 +48910,7 @@ adt adt fBS hIk -kTB +tVj rii bDr qPo diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index dac3f63d43..5fa176f29e 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -157213,7 +157213,6 @@ aaa /turf/simulated/floor/wood, /area/crew_quarters/captain) "aYo" = ( -/obj/machinery/hologram/holopad, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -157230,6 +157229,7 @@ aaa d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/emblem/nt2, /turf/simulated/floor/tiled/dark, /area/bridge) "aYp" = ( @@ -157294,6 +157294,7 @@ aaa d2 = 2; icon_state = "1-2" }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, /area/bridge) "aYv" = ( @@ -167127,6 +167128,7 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +<<<<<<< HEAD "hqs" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -167134,6 +167136,13 @@ aaa /obj/machinery/camera/network/tether, /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +======= +"hpW" = ( +/obj/effect/floor_decal/emblem/nt1, +/turf/simulated/floor/tiled/dark, +/area/bridge) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "hth" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ @@ -170379,6 +170388,33 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"tJZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) +======= +"tJk" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/emblem/nt3, +/turf/simulated/floor/tiled/dark, +/area/bridge) +"tJZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "tLk" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -247815,7 +247851,7 @@ aYR aEa bad aYb -aYb +hpW aYt aYA aYH @@ -248099,7 +248135,7 @@ ayx asT ajH aYf -bae +tJk aYv aYB aYJ diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 62a7debfd9..c63bbbe366 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -713,6 +713,56 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cockpit) +<<<<<<< HEAD +||||||| parent of 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc +"abK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"abL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +======= +"abK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/shuttles, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"abL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/shuttles/right, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +>>>>>>> 3209d9c2a7... Merge pull request #11241 from VOREStation/Arokha/moretgmc "abM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -852,6 +902,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/arrow{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "acq" = ( @@ -10311,6 +10364,10 @@ d2 = 8; icon_state = "2-8" }, +/obj/effect/floor_decal/arrow{ + dir = 1; + pixel_y = 9 + }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "aAy" = ( @@ -19312,6 +19369,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 }, +/obj/effect/floor_decal/emblem/nt2, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "fmg" = ( @@ -19387,12 +19445,13 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "frS" = ( -/obj/machinery/atmospherics/binary/pump/fuel{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/obj/effect/floor_decal/emblem/nt3, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "fsA" = ( @@ -19416,10 +19475,10 @@ pixel_y = -27 }, /obj/effect/map_helper/airlock/sensor/int_sensor, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ +/obj/machinery/atmospherics/binary/pump/fuel{ dir = 8 }, /turf/simulated/floor/tiled/techmaint, @@ -20653,6 +20712,10 @@ }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) +"gLG" = ( +/obj/effect/floor_decal/emblem/nt1, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/excursion/general) "gLJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -48257,7 +48320,7 @@ egt eBg wZB eMS -fkL +gLG fMh gjZ gJW