diff --git a/cev_eris.dme b/cev_eris.dme index 1ead764f680..88d5519e481 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -770,6 +770,7 @@ #include "code\game\machinery\doors\brigdoors.dm" #include "code\game\machinery\doors\checkForMultipleDoors.dm" #include "code\game\machinery\doors\door.dm" +#include "code\game\machinery\doors\door_visual_object.dm" #include "code\game\machinery\doors\firedoor.dm" #include "code\game\machinery\doors\firedoor_assembly.dm" #include "code\game\machinery\doors\holy_door.dm" diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index b80f41ad5d6..6b89bc9f1e8 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -366,3 +366,5 @@ #define TTS_SEED_DEFAULT_FEMALE "Female_1" #define TTS_SEED_DEFAULT_MALE "Male_1" #define TTS_SEED_ANNOUNCER "Robot_2" + +#define DOOR_MISC_ICON 'icons/obj/doors/door_misc.dmi' diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 7ca1c8c5e3c..bb385fb8af0 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -69,6 +69,9 @@ GLOBAL_LIST_EMPTY(wedge_icon_cache) return get_material_by_name(mineral) return get_material_by_name(MATERIAL_STEEL) +/obj/machinery/door/airlock/get_overlay_icon() + return DOOR_MISC_ICON + /obj/machinery/door/airlock/command name = "Airlock" icon = 'icons/obj/doors/Doorcom.dmi' @@ -102,6 +105,9 @@ GLOBAL_LIST_EMPTY(wedge_icon_cache) opacity = 0 glass = 1 +/obj/machinery/door/airlock/external/get_overlay_icon() + return 'icons/obj/doors/Doorext_misc.dmi' + /obj/machinery/door/airlock/glass name = "Glass Airlock" icon = 'icons/obj/doors/Doorglass.dmi' @@ -112,6 +118,9 @@ GLOBAL_LIST_EMPTY(wedge_icon_cache) opacity = 0 glass = 1 +/obj/machinery/door/airlock/glass/get_overlay_icon() + return icon + /obj/machinery/door/airlock/centcom name = "Airlock" icon = 'icons/obj/doors/Doorele.dmi' @@ -126,6 +135,9 @@ GLOBAL_LIST_EMPTY(wedge_icon_cache) secured_wires = 1 assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity //Until somebody makes better sprites. +/obj/machinery/door/airlock/vault/get_overlay_icon() + return 'icons/obj/doors/vault_misc.dmi' + /obj/machinery/door/airlock/vault/bolted icon_state = "door_locked" locked = 1 @@ -136,6 +148,9 @@ GLOBAL_LIST_EMPTY(wedge_icon_cache) opacity = 1 assembly_type = /obj/structure/door_assembly/door_assembly_fre +/obj/machinery/door/airlock/freezer/get_overlay_icon() + return icon + /obj/machinery/door/airlock/hatch name = "Airtight Hatch" icon = 'icons/obj/doors/Doorhatchele.dmi' @@ -248,42 +263,45 @@ GLOBAL_LIST_EMPTY(wedge_icon_cache) /* NEW AIRLOCKS BLOCK */ -/obj/machinery/door/airlock/maintenance_cargo +/obj/machinery/door/airlock/maintenance/get_overlay_icon() + return 'icons/obj/doors/door_maint_misc.dmi' + +/obj/machinery/door/airlock/maintenance/cargo name = "Maintenance Hatch" icon = 'icons/obj/doors/Doormaint_cargo.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_maint_cargo -/obj/machinery/door/airlock/maintenance_command +/obj/machinery/door/airlock/maintenance/command name = "Maintenance Hatch" icon = 'icons/obj/doors/Doormaint_command.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_maint_command -/obj/machinery/door/airlock/maintenance_engineering +/obj/machinery/door/airlock/maintenance/engineering name = "Maintenance Hatch" icon = 'icons/obj/doors/Doormaint_engi.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_maint_engi -/obj/machinery/door/airlock/maintenance_medical +/obj/machinery/door/airlock/maintenance/medical name = "Maintenance Hatch" icon = 'icons/obj/doors/Doormaint_med.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_maint_med -/obj/machinery/door/airlock/maintenance_rnd +/obj/machinery/door/airlock/maintenance/rnd name = "Maintenance Hatch" icon = 'icons/obj/doors/Doormaint_rnd.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_maint_rnd -/obj/machinery/door/airlock/maintenance_security +/obj/machinery/door/airlock/maintenance/security name = "Maintenance Hatch" icon = 'icons/obj/doors/Doormaint_sec.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_maint_sec -/obj/machinery/door/airlock/maintenance_common +/obj/machinery/door/airlock/maintenance/common name = "Maintenance Hatch" icon = 'icons/obj/doors/Doormaint_common.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_maint_common -/obj/machinery/door/airlock/maintenance_interior +/obj/machinery/door/airlock/maintenance/interior name = "Maintenance Hatch" icon = 'icons/obj/doors/Doormaint_int.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_maint_int @@ -382,6 +400,9 @@ GLOBAL_LIST_EMPTY(wedge_icon_cache) secured_wires = 1 assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity +/obj/machinery/door/airlock/highsecurity/get_overlay_icon() + return 'icons/obj/doors/hightechsecurity_misc.dmi' + /* About the new airlock wires panel: *An airlock wire dialog can be accessed by the normal way or by using wirecutters or a multitool on the door while the wire-panel is open. @@ -653,29 +674,31 @@ There are 9 wires. cut_overlays() if(underlays.len) underlays.Cut() + if(door_flicker.overlays.len) + door_flicker.overlays.Cut() if(density) + icon_state = "door_closed" if(locked && lights && arePowerSystemsOn()) - icon_state = "door_locked" + overlays += image(get_overlay_icon(), "door_locked") set_light(1.5, 0.5, COLOR_RED_LIGHT) else - icon_state = "door_closed" + overlays += image(get_overlay_icon(), "door_closed") if(p_open || welded) - overlays = list() if(p_open) - overlays += image(icon, "panel_open") + door_flicker.overlays += image(get_overlay_icon(), "panel_open") if (!(stat & NOPOWER)) if(stat & BROKEN) - overlays += image(icon, "sparks_broken") + door_flicker.overlays += image(get_overlay_icon(), "sparks_broken") else if (health < maxHealth * 3/4) - overlays += image(icon, "sparks_damaged") + door_flicker.overlays += image(get_overlay_icon(), "sparks_damaged") if(welded) - overlays += image(icon, "welded") + overlays += image(get_overlay_icon(), "welded") else if (health < maxHealth * 3/4 && !(stat & NOPOWER)) - overlays += image(icon, "sparks_damaged") + door_flicker.overlays += image(get_overlay_icon(), "sparks_damaged") else icon_state = "door_open" if((stat & BROKEN) && !(stat & NOPOWER)) - overlays += image(icon, "sparks_open") + door_flicker.overlays += image(get_overlay_icon(), "sparks_open") if(wedged_item) generate_wedge_overlay() @@ -683,28 +706,35 @@ There are 9 wires. switch(animation) if("opening") if(overlays.len) - overlays.Cut() + cut_overlays() + if(underlays.len) + underlays.Cut() + if(door_flicker.overlays.len) + door_flicker.overlays.Cut() + + + flick("door_opening", src)//[stat ? "_stat":] if(p_open) - flick("o_door_opening", src) //can not use flick due to BYOND bug updating overlays right before flicking - update_icon() - else - flick("door_opening", src)//[stat ? "_stat":] - update_icon() + flick_door("o_door_opening", src) //can not use flick due to BYOND bug updating overlays right before flicking + update_icon() if("closing") if(overlays.len) - overlays.Cut() + cut_overlays() + if(underlays.len) + underlays.Cut() + if(door_flicker.overlays.len) + door_flicker.overlays.Cut() + + flick("door_closing", src) if(p_open) - flick("o_door_closing", src) - update_icon() - else - flick("door_closing", src) - update_icon() + flick_door("o_door_closing", src) + update_icon() if("spark") if(density) - flick("door_spark", src) + flick_door("door_spark", src) if("deny") if(density && src.arePowerSystemsOn()) - flick("door_deny", src) + flick_door("door_deny", src) playsound(src.loc, 'sound/machines/Custom_deny.ogg', 50, 1, -2) return diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 30ba2be7620..e2eaf029669 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -9,6 +9,9 @@ var/air_frequency = 1437 autoclose = 0 +/obj/machinery/door/airlock/alarmlock/get_overlay_icon() + return icon + /obj/machinery/door/airlock/alarmlock/New() ..() air_connection = new diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index 666bfc89395..69e97776aa2 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -48,6 +48,8 @@ var/obj/item/electronics/airlock/electronics // here for map compatibility var/_wifi_id + auto_change_door_direction = FALSE + can_be_connected_to_wall = FALSE /obj/machinery/door/blast/Initialize() . = ..() diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index b3cd1833cc3..e84020de4f2 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -45,14 +45,48 @@ // turf animation var/atom/movable/overlay/c_animation -/obj/machinery/door/New() - GLOB.all_doors += src - ..() + var/atom/movable/overlay/door/door_flicker + var/auto_change_door_direction = TRUE + var/can_be_connected_to_wall = TRUE /obj/machinery/door/Destroy() GLOB.all_doors -= src + QDEL_NULL(door_flicker) ..() + +/obj/machinery/door/proc/get_overlay_icon() + return icon + +/obj/machinery/door/proc/flick_door(icon_flick, target) + if(!icon_flick || !target) + return + door_flicker.flick_door(icon_flick) + +/obj/machinery/door/proc/on_door_direction_update_trigger(from_door = FALSE) + if(!auto_change_door_direction) + door_flicker.dir = dir + return + var/turf/simulated/wall/W1 = get_step(src, SOUTH) + var/turf/simulated/wall/W2 = get_step(src, NORTH) + var/south_detected = istype(W1) || locate(/obj/structure/low_wall) in W1 + var/north_detected = istype(W2) || locate(/obj/structure/low_wall) in W2 + if(!south_detected) + var/obj/machinery/door/D = locate() in W1 + south_detected = istype(D) + if(istype(D) && !from_door) + D.on_door_direction_update_trigger(TRUE) + if(!north_detected) + var/obj/machinery/door/D = locate() in W2 + north_detected = istype(D) + if(istype(D) && !from_door) + D.on_door_direction_update_trigger(TRUE) + if(south_detected && north_detected) + dir = WEST + else + dir = NORTH + door_flicker.dir = dir + /obj/machinery/door/can_prevent_fall(above) return above ? density : null @@ -67,7 +101,13 @@ attack_animation(user) /obj/machinery/door/New() + GLOB.all_doors += src + door_flicker = new(src) + door_flicker.master = src + door_flicker.icon = get_overlay_icon() + vis_contents |= door_flicker . = ..() + on_door_direction_update_trigger() if(density) layer = closed_layer explosion_resistance = initial(explosion_resistance) diff --git a/code/game/machinery/doors/door_visual_object.dm b/code/game/machinery/doors/door_visual_object.dm new file mode 100644 index 00000000000..458a6b10054 --- /dev/null +++ b/code/game/machinery/doors/door_visual_object.dm @@ -0,0 +1,12 @@ +// filler object for visual stuff +/atom/movable/overlay/door + name = "" + icon = DOOR_MISC_ICON + icon_state = "" + density = FALSE + anchored = TRUE + +/atom/movable/overlay/door/proc/flick_door(icon_flick) + if(!icon_flick) + return + flick(icon_flick, src) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 2e10cba8957..2feffbe453c 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -46,6 +46,8 @@ use_power = IDLE_POWER_USE idle_power_usage = 5 + can_be_connected_to_wall = FALSE + /obj/machinery/door/firedoor/New() ..() diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 0c62275bfa1..1d1a046a6e7 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -2,21 +2,37 @@ /obj/machinery/door/airlock/multi_tile width = 2 -/obj/machinery/door/airlock/multi_tile/New() - ..() - SetBounds() +/obj/machinery/door/airlock/multi_tile/get_overlay_icon() + return icon -/obj/machinery/door/airlock/multi_tile/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0, var/glide_size_override = 0) - . = ..() +/obj/machinery/door/airlock/multi_tile/on_door_direction_update_trigger(from_door = FALSE) + if(!auto_change_door_direction) + door_flicker.dir = dir + return + var/turf/simulated/wall/W1 = get_step(src, SOUTH) + var/turf/simulated/wall/W2 = get_step(src, NORTH) + var/south_detected = istype(W1) || locate(/obj/structure/low_wall) in W1 + var/north_detected = istype(W2) || locate(/obj/structure/low_wall) in W2 + if(!south_detected) + var/turf/simulated/wall/wall_check = get_step(W1, SOUTH) + south_detected = istype(wall_check) || locate(/obj/structure/low_wall) in wall_check + if(!north_detected) + var/turf/simulated/wall/wall_check = get_step(W2, NORTH) + north_detected = istype(wall_check) || locate(/obj/structure/low_wall) in wall_check + if(south_detected && north_detected) + dir = WEST + else + dir = NORTH SetBounds() + create_fillers() /obj/machinery/door/airlock/multi_tile/proc/SetBounds() if(dir in list(EAST, WEST)) - bound_width = width * world.icon_size - bound_height = world.icon_size - else bound_width = world.icon_size bound_height = width * world.icon_size + else + bound_width = width * world.icon_size + bound_height = world.icon_size /obj/machinery/door/airlock/multi_tile/glass name = "Glass Airlock" @@ -25,19 +41,34 @@ glass = TRUE assembly_type = /obj/structure/door_assembly/multi_tile +/obj/machinery/door/airlock/multi_tile/glass/get_overlay_icon() + return 'icons/obj/doors/door2x1_misc.dmi' + /obj/machinery/door/airlock/multi_tile/metal name = "Airlock" icon = 'icons/obj/doors/Door2x1metal.dmi' assembly_type = /obj/structure/door_assembly/multi_tile -/obj/machinery/door/airlock/multi_tile/New() - ..() - if(src.dir > 3) - f5 = new/obj/machinery/filler_object(src.loc) - f6 = new/obj/machinery/filler_object(get_step(src,EAST)) +/obj/machinery/door/airlock/multi_tile/proc/create_fillers() + if(f5) + QDEL_NULL(f5) + if(f6) + QDEL_NULL(f6) + var/turf/f5_turf = get_turf(src) + var/turf/f6_turf = get_turf(src) + + if(dir == WEST) + if(istype(get_step(src, NORTH), /turf/simulated/wall) || locate(/obj/structure/low_wall) in get_step(src, NORTH)) + f6_turf = get_step(src, SOUTH) + else + f6_turf = get_step(src, NORTH) else - f5 = new/obj/machinery/filler_object(src.loc) - f6 = new/obj/machinery/filler_object(get_step(src,NORTH)) + if(istype(get_step(src, EAST), /turf/simulated/wall) || locate(/obj/structure/low_wall) in get_step(src, EAST)) + f6_turf = get_step(src, WEST) + else + f6_turf = get_step(src, EAST) + f5 = new /obj/machinery/filler_object(f5_turf) + f6 = new /obj/machinery/filler_object(f6_turf) f5.density = FALSE f6.density = FALSE f5.set_opacity(opacity) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index d7539ab8846..d6c63181d0e 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -18,6 +18,8 @@ var/obj/item/electronics/airlock/electronics explosion_resistance = 5 air_properties_vary_with_direction = 1 + auto_change_door_direction = FALSE + can_be_connected_to_wall = FALSE /obj/machinery/door/window/New() ..() diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index d52702a276a..219c0798484 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -363,6 +363,14 @@ wall_dirs |= (d) connection_dirs |= d + // doors connection + for(var/obj/machinery/door/D in orange(src,1)) + if(!D.can_be_connected_to_wall) + continue + D.on_door_direction_update_trigger() + var/D_dir = get_dir(src,D) + connection_dirs |= D_dir + connections = dirs_to_corner_states(connection_dirs) wall_connections = dirs_to_corner_states(wall_dirs) diff --git a/code/game/turfs/simulated/wall_icon.dm b/code/game/turfs/simulated/wall_icon.dm index 93cee943bdf..6d7158838d7 100644 --- a/code/game/turfs/simulated/wall_icon.dm +++ b/code/game/turfs/simulated/wall_icon.dm @@ -133,6 +133,14 @@ T.update_connections() T.update_icon() + // doors connection + for(var/obj/machinery/door/D in orange(src,1)) + if(!D.can_be_connected_to_wall) + continue + D.on_door_direction_update_trigger() + var/D_dir = get_dir(src,D) + dirs |= D_dir + wall_connections = dirs_to_corner_states(dirs) /turf/simulated/wall/proc/can_join_with(var/turf/simulated/wall/W) diff --git a/icons/obj/doors/Door2x1_Maint.dmi b/icons/obj/doors/Door2x1_Maint.dmi index 8b60326932a..38a06f2522f 100644 Binary files a/icons/obj/doors/Door2x1_Maint.dmi and b/icons/obj/doors/Door2x1_Maint.dmi differ diff --git a/icons/obj/doors/Door2x1glass.dmi b/icons/obj/doors/Door2x1glass.dmi index 3542659eee5..399e3437d84 100644 Binary files a/icons/obj/doors/Door2x1glass.dmi and b/icons/obj/doors/Door2x1glass.dmi differ diff --git a/icons/obj/doors/Door2x1metal.dmi b/icons/obj/doors/Door2x1metal.dmi index 07fd6a27440..4ffc26c233b 100644 Binary files a/icons/obj/doors/Door2x1metal.dmi and b/icons/obj/doors/Door2x1metal.dmi differ diff --git a/icons/obj/doors/DoorHazard.dmi b/icons/obj/doors/DoorHazard.dmi index 35f4c474bf3..0ff53ca39b5 100644 Binary files a/icons/obj/doors/DoorHazard.dmi and b/icons/obj/doors/DoorHazard.dmi differ diff --git a/icons/obj/doors/Door_holy.dmi b/icons/obj/doors/Door_holy.dmi index 8a5fdfeb9ec..1ea8ecb739b 100644 Binary files a/icons/obj/doors/Door_holy.dmi and b/icons/obj/doors/Door_holy.dmi differ diff --git a/icons/obj/doors/Door_holy_preacher.dmi b/icons/obj/doors/Door_holy_preacher.dmi index b4d9b541c24..f26d95b9b2c 100644 Binary files a/icons/obj/doors/Door_holy_preacher.dmi and b/icons/obj/doors/Door_holy_preacher.dmi differ diff --git a/icons/obj/doors/Door_holy_public.dmi b/icons/obj/doors/Door_holy_public.dmi index 1d8648a2f7e..6e8ec3a8b62 100644 Binary files a/icons/obj/doors/Door_holy_public.dmi and b/icons/obj/doors/Door_holy_public.dmi differ diff --git a/icons/obj/doors/Dooratmo.dmi b/icons/obj/doors/Dooratmo.dmi index cc329863e30..07d61585edd 100644 Binary files a/icons/obj/doors/Dooratmo.dmi and b/icons/obj/doors/Dooratmo.dmi differ diff --git a/icons/obj/doors/Dooratmoglass.dmi b/icons/obj/doors/Dooratmoglass.dmi index f7f3908ffa8..bd3b0569035 100644 Binary files a/icons/obj/doors/Dooratmoglass.dmi and b/icons/obj/doors/Dooratmoglass.dmi differ diff --git a/icons/obj/doors/Doorcom.dmi b/icons/obj/doors/Doorcom.dmi index 21364429f43..14af8983ccb 100644 Binary files a/icons/obj/doors/Doorcom.dmi and b/icons/obj/doors/Doorcom.dmi differ diff --git a/icons/obj/doors/Doorcomglass.dmi b/icons/obj/doors/Doorcomglass.dmi index 991c75dafe8..ca29d5f0311 100644 Binary files a/icons/obj/doors/Doorcomglass.dmi and b/icons/obj/doors/Doorcomglass.dmi differ diff --git a/icons/obj/doors/Doordiamond.dmi b/icons/obj/doors/Doordiamond.dmi index 345d49fdb2e..7bee8310c22 100644 Binary files a/icons/obj/doors/Doordiamond.dmi and b/icons/obj/doors/Doordiamond.dmi differ diff --git a/icons/obj/doors/Dooreng.dmi b/icons/obj/doors/Dooreng.dmi index fa06f460a19..a5c5628eaff 100644 Binary files a/icons/obj/doors/Dooreng.dmi and b/icons/obj/doors/Dooreng.dmi differ diff --git a/icons/obj/doors/Doorengglass.dmi b/icons/obj/doors/Doorengglass.dmi index 57c8774b3ff..ff34c38df23 100644 Binary files a/icons/obj/doors/Doorengglass.dmi and b/icons/obj/doors/Doorengglass.dmi differ diff --git a/icons/obj/doors/Doorext.dmi b/icons/obj/doors/Doorext.dmi index 64c582a8d29..ea349d54d63 100644 Binary files a/icons/obj/doors/Doorext.dmi and b/icons/obj/doors/Doorext.dmi differ diff --git a/icons/obj/doors/Doorext_misc.dmi b/icons/obj/doors/Doorext_misc.dmi new file mode 100644 index 00000000000..53237420307 Binary files /dev/null and b/icons/obj/doors/Doorext_misc.dmi differ diff --git a/icons/obj/doors/Doorfreezer.dmi b/icons/obj/doors/Doorfreezer.dmi index c310f336a35..d0779d9e9a4 100644 Binary files a/icons/obj/doors/Doorfreezer.dmi and b/icons/obj/doors/Doorfreezer.dmi differ diff --git a/icons/obj/doors/Doorglass.dmi b/icons/obj/doors/Doorglass.dmi index 693daac6524..77ae63a831f 100644 Binary files a/icons/obj/doors/Doorglass.dmi and b/icons/obj/doors/Doorglass.dmi differ diff --git a/icons/obj/doors/Doorgold.dmi b/icons/obj/doors/Doorgold.dmi index 412839f69eb..42d1169860e 100644 Binary files a/icons/obj/doors/Doorgold.dmi and b/icons/obj/doors/Doorgold.dmi differ diff --git a/icons/obj/doors/Doormaint_cargo.dmi b/icons/obj/doors/Doormaint_cargo.dmi index 1228b54a467..8af8b9052a4 100644 Binary files a/icons/obj/doors/Doormaint_cargo.dmi and b/icons/obj/doors/Doormaint_cargo.dmi differ diff --git a/icons/obj/doors/Doormaint_command.dmi b/icons/obj/doors/Doormaint_command.dmi index d61e7f2aa83..68e6376be9d 100644 Binary files a/icons/obj/doors/Doormaint_command.dmi and b/icons/obj/doors/Doormaint_command.dmi differ diff --git a/icons/obj/doors/Doormaint_common.dmi b/icons/obj/doors/Doormaint_common.dmi index cd0073827b9..889605810e1 100644 Binary files a/icons/obj/doors/Doormaint_common.dmi and b/icons/obj/doors/Doormaint_common.dmi differ diff --git a/icons/obj/doors/Doormaint_engi.dmi b/icons/obj/doors/Doormaint_engi.dmi index 25bb5ba4ec3..5147f1711aa 100644 Binary files a/icons/obj/doors/Doormaint_engi.dmi and b/icons/obj/doors/Doormaint_engi.dmi differ diff --git a/icons/obj/doors/Doormaint_int.dmi b/icons/obj/doors/Doormaint_int.dmi index 50f8461a73a..fe81f9b0446 100644 Binary files a/icons/obj/doors/Doormaint_int.dmi and b/icons/obj/doors/Doormaint_int.dmi differ diff --git a/icons/obj/doors/Doormaint_med.dmi b/icons/obj/doors/Doormaint_med.dmi index 1e4fda55610..911a89c78d4 100644 Binary files a/icons/obj/doors/Doormaint_med.dmi and b/icons/obj/doors/Doormaint_med.dmi differ diff --git a/icons/obj/doors/Doormaint_rnd.dmi b/icons/obj/doors/Doormaint_rnd.dmi index c05eabe22b1..105b6574506 100644 Binary files a/icons/obj/doors/Doormaint_rnd.dmi and b/icons/obj/doors/Doormaint_rnd.dmi differ diff --git a/icons/obj/doors/Doormaint_sec.dmi b/icons/obj/doors/Doormaint_sec.dmi index e983c704644..09e08461784 100644 Binary files a/icons/obj/doors/Doormaint_sec.dmi and b/icons/obj/doors/Doormaint_sec.dmi differ diff --git a/icons/obj/doors/Doormining.dmi b/icons/obj/doors/Doormining.dmi index 2a723eb2bed..dda349035cf 100644 Binary files a/icons/obj/doors/Doormining.dmi and b/icons/obj/doors/Doormining.dmi differ diff --git a/icons/obj/doors/Doorminingglass.dmi b/icons/obj/doors/Doorminingglass.dmi index 0b160a8eb5b..f715bacf63e 100644 Binary files a/icons/obj/doors/Doorminingglass.dmi and b/icons/obj/doors/Doorminingglass.dmi differ diff --git a/icons/obj/doors/Doorsand.dmi b/icons/obj/doors/Doorsand.dmi index 2017afd76f8..71ab469936e 100644 Binary files a/icons/obj/doors/Doorsand.dmi and b/icons/obj/doors/Doorsand.dmi differ diff --git a/icons/obj/doors/Doorsec.dmi b/icons/obj/doors/Doorsec.dmi index 91695ad627c..e1bdb6803b8 100644 Binary files a/icons/obj/doors/Doorsec.dmi and b/icons/obj/doors/Doorsec.dmi differ diff --git a/icons/obj/doors/Doorsecglass.dmi b/icons/obj/doors/Doorsecglass.dmi index 08d84474371..958bce31dc7 100644 Binary files a/icons/obj/doors/Doorsecglass.dmi and b/icons/obj/doors/Doorsecglass.dmi differ diff --git a/icons/obj/doors/Doorsilver.dmi b/icons/obj/doors/Doorsilver.dmi index ed8446deb3d..f85d282760a 100644 Binary files a/icons/obj/doors/Doorsilver.dmi and b/icons/obj/doors/Doorsilver.dmi differ diff --git a/icons/obj/doors/Dooruranium.dmi b/icons/obj/doors/Dooruranium.dmi index 21f107f86a8..ec4706ba41f 100644 Binary files a/icons/obj/doors/Dooruranium.dmi and b/icons/obj/doors/Dooruranium.dmi differ diff --git a/icons/obj/doors/door2x1_misc.dmi b/icons/obj/doors/door2x1_misc.dmi new file mode 100644 index 00000000000..3823cb320ca Binary files /dev/null and b/icons/obj/doors/door2x1_misc.dmi differ diff --git a/icons/obj/doors/door_maint_misc.dmi b/icons/obj/doors/door_maint_misc.dmi new file mode 100644 index 00000000000..ec72fb529e0 Binary files /dev/null and b/icons/obj/doors/door_maint_misc.dmi differ diff --git a/icons/obj/doors/door_misc.dmi b/icons/obj/doors/door_misc.dmi new file mode 100644 index 00000000000..406851ca403 Binary files /dev/null and b/icons/obj/doors/door_misc.dmi differ diff --git a/icons/obj/doors/doorint.dmi b/icons/obj/doors/doorint.dmi index 89ef26f7e00..8e2251564fe 100644 Binary files a/icons/obj/doors/doorint.dmi and b/icons/obj/doors/doorint.dmi differ diff --git a/icons/obj/doors/doormed.dmi b/icons/obj/doors/doormed.dmi index c692311b485..6fbf37639a1 100644 Binary files a/icons/obj/doors/doormed.dmi and b/icons/obj/doors/doormed.dmi differ diff --git a/icons/obj/doors/doormedglass.dmi b/icons/obj/doors/doormedglass.dmi index 425b204b86b..08ede281bc9 100644 Binary files a/icons/obj/doors/doormedglass.dmi and b/icons/obj/doors/doormedglass.dmi differ diff --git a/icons/obj/doors/doorresearch.dmi b/icons/obj/doors/doorresearch.dmi index 396fed90de6..10dcc5109c2 100644 Binary files a/icons/obj/doors/doorresearch.dmi and b/icons/obj/doors/doorresearch.dmi differ diff --git a/icons/obj/doors/doorresearchglass.dmi b/icons/obj/doors/doorresearchglass.dmi index d90f2e2d53c..11b9c2423b0 100644 Binary files a/icons/obj/doors/doorresearchglass.dmi and b/icons/obj/doors/doorresearchglass.dmi differ diff --git a/icons/obj/doors/doorsci.dmi b/icons/obj/doors/doorsci.dmi index 3b8fc9daff1..0eac3f5e381 100644 Binary files a/icons/obj/doors/doorsci.dmi and b/icons/obj/doors/doorsci.dmi differ diff --git a/icons/obj/doors/doorsciglass.dmi b/icons/obj/doors/doorsciglass.dmi index c2451aaaf15..f8daa05fc48 100644 Binary files a/icons/obj/doors/doorsciglass.dmi and b/icons/obj/doors/doorsciglass.dmi differ diff --git a/icons/obj/doors/hightechsecurity.dmi b/icons/obj/doors/hightechsecurity.dmi index 4fb27f85064..2413a1a9460 100644 Binary files a/icons/obj/doors/hightechsecurity.dmi and b/icons/obj/doors/hightechsecurity.dmi differ diff --git a/icons/obj/doors/hightechsecurity_misc.dmi b/icons/obj/doors/hightechsecurity_misc.dmi new file mode 100644 index 00000000000..80535d0bb29 Binary files /dev/null and b/icons/obj/doors/hightechsecurity_misc.dmi differ diff --git a/icons/obj/doors/rapid_pdoor.dmi b/icons/obj/doors/rapid_pdoor.dmi index e83f54f896c..3f1276ad997 100644 Binary files a/icons/obj/doors/rapid_pdoor.dmi and b/icons/obj/doors/rapid_pdoor.dmi differ diff --git a/icons/obj/doors/vault.dmi b/icons/obj/doors/vault.dmi index 589383b1a8d..3dfcc913c24 100644 Binary files a/icons/obj/doors/vault.dmi and b/icons/obj/doors/vault.dmi differ diff --git a/icons/obj/doors/vault_misc.dmi b/icons/obj/doors/vault_misc.dmi new file mode 100644 index 00000000000..c4bada0f174 Binary files /dev/null and b/icons/obj/doors/vault_misc.dmi differ diff --git a/maps/CEVEris/_CEV_Eris.dmm b/maps/CEVEris/_CEV_Eris.dmm index 6c1436d5f71..3c38506ef63 100644 --- a/maps/CEVEris/_CEV_Eris.dmm +++ b/maps/CEVEris/_CEV_Eris.dmm @@ -585,7 +585,7 @@ /area/eris/security/prison) "abI" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_security{ +/obj/machinery/door/airlock/maintenance/security{ name = "Security Maintenance"; req_access = list(1) }, @@ -936,7 +936,7 @@ /area/eris/security/disposal) "acv" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_security{ +/obj/machinery/door/airlock/maintenance/security{ name = "Security and Bridge Disposal"; req_access = list(1) }, @@ -1687,7 +1687,7 @@ /area/eris/security/prison) "aeg" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Service Maintenance"; req_access = list(12) }, @@ -1938,7 +1938,7 @@ /area/eris/security/armory) "aeO" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_security{ +/obj/machinery/door/airlock/maintenance/security{ name = "Security Maintenance"; req_access = list(1) }, @@ -2790,7 +2790,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck5starboard) "agO" = ( -/obj/machinery/door/airlock/maintenance_security{ +/obj/machinery/door/airlock/maintenance/security{ name = "Security Maintenance"; req_access = list(1) }, @@ -4744,7 +4744,7 @@ "alk" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Service Maintenance"; req_access = list(12) }, @@ -4752,7 +4752,7 @@ /area/eris/crew_quarters/sleep) "all" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_rnd{ +/obj/machinery/door/airlock/maintenance/rnd{ name = "Robotics Maintenance"; req_access = list(29) }, @@ -5402,7 +5402,7 @@ /turf/simulated/floor/tiled/dark, /area/eris/rnd/podbay) "amO" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -5928,7 +5928,7 @@ /turf/simulated/floor/tiled/steel, /area/eris/hallway/side/eschangarb) "aob" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -6039,7 +6039,7 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck5port) "aop" = ( -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Reserve Storage"; req_access = list(12) }, @@ -6489,7 +6489,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck5port) "apD" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -6497,7 +6497,7 @@ /area/eris/maintenance/section2deck5port) "apE" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Central Maintenance" }, /obj/structure/cable/green{ @@ -6552,7 +6552,7 @@ "apK" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Service Maintenance"; req_access = list(12) }, @@ -6853,7 +6853,7 @@ /area/eris/crew_quarters/toilet/medbay) "aqp" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Central Maintenance" }, /obj/structure/cable/green{ @@ -8194,7 +8194,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck5port) "ath" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -8352,7 +8352,7 @@ /turf/simulated/floor/tiled/dark/techfloor, /area/eris/quartermaster/disposaldrop) "atz" = ( -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Reserve Storage"; req_access = list(12) }, @@ -8587,7 +8587,7 @@ /turf/simulated/floor/tiled/dark/cargo, /area/eris/hallway/side/section3starboard) "auo" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -8885,7 +8885,7 @@ /turf/simulated/floor/tiled/steel, /area/eris/hallway/side/eschangara) "ave" = ( -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Reserve Storage"; req_access = list(12) }, @@ -9003,7 +9003,7 @@ /turf/simulated/floor/tiled/dark/gray_perforated, /area/eris/quartermaster/disposaldrop) "avt" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -9573,7 +9573,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section3deck2starboard) "axf" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -11384,7 +11384,7 @@ /area/eris/crew_quarters/hydroponics) "aBH" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_cargo{ +/obj/machinery/door/airlock/maintenance/cargo{ name = "Cargo Maintenance"; req_access = list(50) }, @@ -12544,7 +12544,7 @@ /turf/simulated/floor/plating, /area/eris/maintenance/section4deck5starboard) "aEH" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -13662,7 +13662,7 @@ /turf/simulated/floor/tiled/steel, /area/eris/rnd/chargebay) "aHV" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -15559,7 +15559,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section3deck1central) "aNe" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -17610,7 +17610,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -18742,7 +18742,7 @@ /area/eris/security/warden) "aUt" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -18949,7 +18949,7 @@ /turf/simulated/wall, /area/eris/security/warden) "aUQ" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Central Maintenance" }, /turf/simulated/floor/tiled/techmaint_cargo, @@ -19069,7 +19069,7 @@ /turf/simulated/open, /area/eris/security/prison) "aVd" = ( -/obj/machinery/door/airlock/maintenance_common, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint_cargo, /area/eris/crew_quarters/sleep) "aVe" = ( @@ -20248,7 +20248,7 @@ /area/eris/medical/virology) "aXM" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Atmospherics Maintenance"; req_access = list(24) }, @@ -20293,7 +20293,7 @@ /area/eris/medical/virology) "aXR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Atmospherics Maintenance"; req_access = list(24) }, @@ -21653,7 +21653,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section1deck4central) "baB" = ( -/obj/machinery/door/airlock/maintenance_common, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint_cargo, /area/eris/maintenance/section1deck4central) "baC" = ( @@ -21824,7 +21824,7 @@ /turf/simulated/floor/plating, /area/eris/maintenance/substation/section1) "baY" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -22257,7 +22257,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section3deck4port) "bbM" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Central Maintenance" }, /turf/simulated/floor/tiled/techmaint_cargo, @@ -22320,7 +22320,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section1deck4central) "bbV" = ( -/obj/machinery/door/airlock/maintenance_common, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint_cargo, /area/eris/maintenance/section2deck4central) "bbW" = ( @@ -23367,7 +23367,7 @@ /turf/simulated/open, /area/eris/crew_quarters/sleep) "bdG" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -23660,7 +23660,7 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck4port) "bew" = ( -/obj/machinery/door/airlock/maintenance_common, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint_cargo, /area/eris/maintenance/section2deck4port) "bex" = ( @@ -23865,7 +23865,7 @@ /turf/simulated/floor/tiled/steel/gray_perforated, /area/eris/maintenance/section2deck4starboard) "beV" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -24399,7 +24399,7 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck4central) "bgp" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -24440,7 +24440,7 @@ /turf/simulated/floor/tiled/steel, /area/eris/crew_quarters/sleep/cryo) "bgt" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -27530,7 +27530,7 @@ /turf/simulated/floor/tiled/dark, /area/eris/hallway/side/morguehallway) "bno" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Central Maintenance" }, /obj/machinery/door/firedoor, @@ -28262,7 +28262,7 @@ /area/eris/crew_quarters/sleep) "boX" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_rnd{ +/obj/machinery/door/airlock/maintenance/rnd{ name = "Robotics Maintenance"; req_access = list(29) }, @@ -28954,7 +28954,7 @@ /turf/simulated/floor/plating, /area/eris/maintenance/section2deck4port) "bqK" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -29836,7 +29836,7 @@ /area/eris/crew_quarters/sleep/cryo) "bto" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_rnd{ +/obj/machinery/door/airlock/maintenance/rnd{ name = "Robotics Maintenance"; req_access = list(29) }, @@ -29863,7 +29863,7 @@ /area/eris/maintenance/sorter) "btq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_cargo{ +/obj/machinery/door/airlock/maintenance/cargo{ name = "Cargo Maintenance"; req_access = list(50) }, @@ -30220,7 +30220,7 @@ /turf/simulated/floor/tiled/steel/bluecorner, /area/eris/maintenance/section3deck1central) "bul" = ( -/obj/machinery/door/airlock/maintenance_command{ +/obj/machinery/door/airlock/maintenance/command{ name = "Bridge Maintenance"; req_access = list(19) }, @@ -30668,7 +30668,7 @@ /turf/simulated/floor/plating, /area/eris/rnd/lab) "bvv" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -31478,7 +31478,7 @@ /area/eris/crew_quarters/toilet/medbay) "bxh" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Morgue Maintenance"; req_access = list(6) }, @@ -31794,7 +31794,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/maintenance_cargo{ +/obj/machinery/door/airlock/maintenance/cargo{ name = "Cargo Maintenance"; req_access = list(50) }, @@ -32626,7 +32626,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Central Maintenance" }, /turf/simulated/floor/plating/under, @@ -34907,7 +34907,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section4deck4central) "bFy" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -35070,7 +35070,7 @@ /turf/simulated/floor/tiled/steel, /area/eris/rnd/anomalisolthree) "bFS" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -36052,7 +36052,7 @@ /area/eris/maintenance/section3deck1central) "bHU" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_cargo{ +/obj/machinery/door/airlock/maintenance/cargo{ name = "Cargo Maintenance"; req_access = list(50) }, @@ -36879,7 +36879,7 @@ /area/eris/maintenance/section4deck4central) "bJF" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -37306,7 +37306,7 @@ /area/eris/maintenance/section4deck4port) "bKy" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -38181,7 +38181,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section4deck4port) "bMx" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -38544,7 +38544,7 @@ /area/eris/maintenance/section1deck3central) "bNm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -38764,7 +38764,7 @@ /turf/simulated/floor/tiled/steel, /area/eris/engineering/propulsion/right) "bNF" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -40224,7 +40224,7 @@ /area/eris/engineering/drone_fabrication) "bRe" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Central Maintenance" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -40567,7 +40567,7 @@ /area/eris/engineering/drone_fabrication) "bSc" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -40615,7 +40615,7 @@ "bSi" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Central Maintenance" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -40634,7 +40634,7 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section1deck3central) "bSl" = ( -/obj/machinery/door/airlock/maintenance_command{ +/obj/machinery/door/airlock/maintenance/command{ name = "Bridge Maintenance"; req_access = list(19) }, @@ -40698,7 +40698,7 @@ "bSs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Central Maintenance" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -40812,7 +40812,7 @@ /turf/simulated/floor/tiled/steel/gray_platform, /area/eris/crew_quarters/clothingstorage) "bSO" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -41468,7 +41468,7 @@ name = "Medbay Total Lockdown"; opacity = 0 }, -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Operating Maintenance"; req_access = list(45) }, @@ -41568,7 +41568,7 @@ /turf/simulated/floor/tiled/steel/gray_perforated, /area/eris/security/main) "bUz" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -41761,7 +41761,7 @@ /area/eris/crew_quarters/janitor) "bVe" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_command{ +/obj/machinery/door/airlock/maintenance/command{ name = "Bridge Maintenance"; req_access = list(19) }, @@ -41808,7 +41808,7 @@ /turf/simulated/floor/tiled/dark/golden, /area/eris/neotheology/bioreactor) "bVl" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -41853,7 +41853,7 @@ /turf/simulated/floor/tiled/dark/golden, /area/eris/neotheology/bioreactor) "bVq" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -42381,7 +42381,7 @@ /area/eris/security/inspectors_office) "bWH" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_security{ +/obj/machinery/door/airlock/maintenance/security{ name = "Inspector Maintenance"; req_access = list(4) }, @@ -44176,7 +44176,7 @@ /area/eris/hallway/main/section2) "cbv" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_command{ +/obj/machinery/door/airlock/maintenance/command{ name = "First Officer Maintenance"; req_access = list(57) }, @@ -44407,7 +44407,7 @@ "cbV" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Central Maintenance" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -44807,7 +44807,7 @@ opacity = 0; dir = 4 }, -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Operating Maintenance"; req_access = list(45) }, @@ -44957,7 +44957,7 @@ /area/eris/command/mbo) "cdq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Central Maintenance" }, /turf/simulated/floor/tiled/techmaint_cargo, @@ -45178,7 +45178,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck3starboard) "cdV" = ( -/obj/machinery/door/airlock/maintenance_command{ +/obj/machinery/door/airlock/maintenance/command{ name = "Bridge Maintenance"; req_access = list(19) }, @@ -46319,7 +46319,7 @@ opacity = 0; dir = 4 }, -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Operating Maintenance"; req_access = list(45) }, @@ -48201,7 +48201,7 @@ /turf/simulated/floor/tiled/white/gray_platform, /area/eris/rnd/mixing) "ckU" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -49263,7 +49263,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -51015,7 +51015,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section3deck4starboard) "csb" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -51268,7 +51268,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section3deck4central) "csO" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -52006,7 +52006,7 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/oldtele) "cvf" = ( -/obj/machinery/door/airlock/maintenance_command{ +/obj/machinery/door/airlock/maintenance/command{ name = "Bridge Maintenance"; req_access = list(19) }, @@ -53054,7 +53054,7 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/engineering/post) "cxM" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -53744,7 +53744,7 @@ /area/eris/maintenance/section3deck4central) "czv" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -53799,7 +53799,7 @@ /turf/simulated/floor/tiled/steel/gray_platform, /area/eris/quartermaster/office) "czC" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -55935,7 +55935,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -57977,7 +57977,7 @@ /turf/simulated/floor/tiled/steel/bar_dance, /area/eris/crew_quarters/bar) "cJW" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -58122,7 +58122,7 @@ /turf/simulated/floor/tiled/white/brown_perforated, /area/eris/medical/virology) "cKr" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -60416,7 +60416,7 @@ /area/eris/command/exultant) "cQS" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -60475,7 +60475,7 @@ /area/eris/hallway/main/section4) "cQZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -62757,7 +62757,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section4deck3port) "cXd" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -62770,7 +62770,7 @@ /turf/simulated/floor/tiled/techmaint_cargo, /area/eris/maintenance/section4deck3port) "cXe" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -62833,7 +62833,7 @@ name = "Cargo Total Lockdown"; opacity = 0 }, -/obj/machinery/door/airlock/maintenance_cargo{ +/obj/machinery/door/airlock/maintenance/cargo{ name = "Cargo Maintenance"; req_access = list(50) }, @@ -63074,7 +63074,7 @@ /turf/space, /area/shuttle/mining/station) "cXO" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -63337,7 +63337,7 @@ /area/eris/hallway/main/section3) "cYm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_command{ +/obj/machinery/door/airlock/maintenance/command{ name = "Bridge Maintenance"; req_access = list(19) }, @@ -63478,7 +63478,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section4deck3port) "cYG" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -64904,7 +64904,7 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section3deck4port) "dcf" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -65320,7 +65320,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck2starboard) "dcU" = ( -/obj/machinery/door/airlock/maintenance_rnd{ +/obj/machinery/door/airlock/maintenance/rnd{ name = "Research Maintenance"; req_access = list(5) }, @@ -67283,7 +67283,7 @@ /turf/simulated/floor/carpet/blucarpet, /area/eris/command/fo/quarters) "dhh" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -67743,7 +67743,7 @@ "din" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance_command{ +/obj/machinery/door/airlock/maintenance/command{ name = "Bridge Maintenance"; req_access = list(19) }, @@ -68234,7 +68234,7 @@ /area/eris/hallway/side/section3starboard) "djt" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_rnd{ +/obj/machinery/door/airlock/maintenance/rnd{ name = "Toxins Maintenance"; req_access = list(7) }, @@ -68719,7 +68719,7 @@ /area/turret_protected/ai) "dkx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -70667,7 +70667,7 @@ /turf/simulated/floor/tiled/white/cargo, /area/eris/medical/medbay/iso) "doK" = ( -/obj/machinery/door/airlock/maintenance_command{ +/obj/machinery/door/airlock/maintenance/command{ name = "Bridge Maintenance"; req_access = list(19) }, @@ -71298,7 +71298,7 @@ /area/eris/maintenance/section3deck4central) "dqk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Chemistry Storage"; req_access = list(33) }, @@ -72045,7 +72045,7 @@ /turf/simulated/floor/tiled/white/brown_perforated, /area/eris/medical/reception) "dse" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -72413,7 +72413,7 @@ /turf/simulated/floor/tiled/white, /area/eris/medical/medbay/uppercor) "dtc" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -72807,7 +72807,7 @@ /turf/simulated/floor/tiled/steel/techfloor, /area/eris/engineering/propulsion/left) "dub" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -73443,7 +73443,7 @@ /area/eris/command/bridge) "dvz" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -73489,7 +73489,7 @@ /turf/simulated/floor/tiled/dark/gray_platform, /area/eris/command/bridge) "dvI" = ( -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Medbay Maintenance"; req_access = list(5) }, @@ -75101,7 +75101,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/eris/command/mbo) "dzE" = ( -/obj/machinery/door/airlock/maintenance_common, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint_cargo, /area/eris/maintenance/section2deck3port) "dzF" = ( @@ -75340,7 +75340,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -78031,7 +78031,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section4deck2port) "dGI" = ( -/obj/machinery/door/airlock/maintenance_command{ +/obj/machinery/door/airlock/maintenance/command{ name = "Bridge Maintenance"; req_access = list(19) }, @@ -78080,7 +78080,7 @@ /turf/simulated/floor/tiled/steel/panels, /area/eris/crew_quarters/pubeva) "dGQ" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -78546,7 +78546,7 @@ /area/eris/crew_quarters/library) "dHQ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -78560,7 +78560,7 @@ /area/eris/hallway/side/atmosphericshallway) "dHS" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -78680,7 +78680,7 @@ /area/eris/engineering/starboardhallway) "dIg" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -79032,7 +79032,7 @@ /area/eris/security/lobby) "dIR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -79345,7 +79345,7 @@ name = "Engineering Total Lockdown"; opacity = 0 }, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -79821,7 +79821,7 @@ /area/eris/engineering/engine_room) "dKI" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -80320,7 +80320,7 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck5port) "dMu" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -81227,7 +81227,7 @@ /turf/simulated/floor/plating, /area/eris/maintenance/section3deck3starboard) "dOY" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -81607,7 +81607,7 @@ /turf/simulated/floor/plating/under, /area/eris/medical/chemstor) "dQh" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -81951,7 +81951,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section4deck2port) "dRd" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -82804,7 +82804,7 @@ /area/eris/engineering/construction) "dTq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -83372,7 +83372,7 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck1port) "dUV" = ( -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Reserve Storage"; req_access = list(12) }, @@ -83697,7 +83697,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck1port) "dVL" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -83801,7 +83801,7 @@ /turf/space, /area/space) "dVZ" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -84678,7 +84678,7 @@ /area/eris/rnd/docking) "dXX" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_rnd{ +/obj/machinery/door/airlock/maintenance/rnd{ name = "Research Maintenance"; req_access = list(5) }, @@ -85155,7 +85155,7 @@ /turf/simulated/floor/tiled/steel, /area/eris/hallway/side/section3starboard) "dZt" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -86157,7 +86157,7 @@ /area/shuttle/research/station) "ebT" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_rnd{ +/obj/machinery/door/airlock/maintenance/rnd{ name = "Research Maintenance"; req_access = list(5) }, @@ -87004,7 +87004,7 @@ /area/eris/rnd/anomalisolthree) "edR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Chemistry Storage"; req_access = list(33) }, @@ -87873,7 +87873,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/maintenance_rnd{ +/obj/machinery/door/airlock/maintenance/rnd{ name = "Research Maintenance"; req_access = list(5) }, @@ -87947,7 +87947,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/maintenance_rnd{ +/obj/machinery/door/airlock/maintenance/rnd{ name = "Research Maintenance"; req_access = list(5) }, @@ -87979,7 +87979,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance_rnd{ +/obj/machinery/door/airlock/maintenance/rnd{ name = "Research Maintenance"; req_access = list(5) }, @@ -88413,7 +88413,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section4deck1central) "ehs" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -88747,7 +88747,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -89471,7 +89471,7 @@ /area/eris/maintenance/section4deck1central) "ejK" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Theatre Maintenance"; req_access = list(43) }, @@ -90206,7 +90206,7 @@ /turf/simulated/open, /area/eris/medical/medbay/uppercor) "elC" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -90980,7 +90980,7 @@ /area/eris/rnd/research) "enL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Theatre Maintenance"; req_access = list(43) }, @@ -91061,7 +91061,7 @@ /turf/simulated/floor/tiled/white, /area/eris/rnd/xenobiology/xenoflora) "enU" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -91574,7 +91574,7 @@ /area/eris/maintenance/section3deck2starboard) "epk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Service Maintenance"; req_access = list(12) }, @@ -92470,7 +92470,7 @@ /turf/simulated/floor/tiled/steel/techfloor_grid, /area/eris/maintenance/section3deck4starboard) "ers" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -92653,7 +92653,7 @@ /area/eris/crew_quarters/clownoffice) "erL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -92717,7 +92717,7 @@ /area/eris/engineering/breakroom) "erT" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -93418,7 +93418,7 @@ /turf/simulated/floor/tiled/steel/gray_platform, /area/eris/hallway/side/section3starboard) "etA" = ( -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Medbay Maintenance"; req_access = list(5) }, @@ -94066,7 +94066,7 @@ /turf/simulated/floor/tiled/white/brown_perforated, /area/eris/maintenance/section3deck2starboard) "evb" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -94600,7 +94600,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -94950,7 +94950,7 @@ /area/eris/quartermaster/miningdock) "exe" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -97315,7 +97315,7 @@ /area/eris/quartermaster/misc) "eCn" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -97412,7 +97412,7 @@ /area/eris/engineering/gravity_generator) "eCw" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -98476,7 +98476,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/maintenance_cargo{ +/obj/machinery/door/airlock/maintenance/cargo{ name = "Cargo Maintenance"; req_access = list(50) }, @@ -98538,7 +98538,7 @@ /area/eris/crew_quarters/hydroponics) "eFk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -98612,7 +98612,7 @@ /area/eris/maintenance/section3deck2port) "eFp" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -98660,7 +98660,7 @@ /area/eris/crew_quarters/library) "eFu" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -99742,7 +99742,7 @@ /turf/simulated/floor/tiled/steel/bar_dance, /area/eris/crew_quarters/bar) "fSw" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -99968,7 +99968,7 @@ /turf/simulated/floor/tiled/dark/golden, /area/eris/neotheology/churchcorridor) "grN" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -100059,7 +100059,7 @@ /area/eris/crew_quarters/artistoffice) "gCq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -100095,7 +100095,7 @@ /turf/simulated/floor/plating, /area/holodeck/alphadeck) "gHp" = ( -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Chemistry Maintenance"; req_access = list(33) }, @@ -100126,7 +100126,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -100460,7 +100460,7 @@ name = "Science Total Lockdown"; opacity = 0 }, -/obj/machinery/door/airlock/maintenance_rnd{ +/obj/machinery/door/airlock/maintenance/rnd{ name = "Research Maintenance"; req_access = list(5) }, @@ -100913,7 +100913,7 @@ /turf/simulated/floor/wood, /area/eris/crew_quarters/hydroponics/garden) "isV" = ( -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Medbay Maintenance"; req_access = list(5) }, @@ -101523,7 +101523,7 @@ /area/eris/medical/morgue) "jDU" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Chemistry Maintenance"; req_access = list(33) }, @@ -101543,7 +101543,7 @@ /turf/simulated/floor/tiled/techmaint_cargo, /area/eris/medical/chemstor) "jFt" = ( -/obj/machinery/door/airlock/maintenance_common, +/obj/machinery/door/airlock/maintenance/common, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint_cargo, /area/eris/maintenance/section2deck3port) @@ -102333,7 +102333,7 @@ /turf/simulated/floor/tiled/white/bluecorner, /area/eris/security/exerooms) "lzu" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -102381,7 +102381,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/maintenance_cargo{ +/obj/machinery/door/airlock/maintenance/cargo{ name = "Cargo Maintenance"; req_access = list(50) }, @@ -103025,7 +103025,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -103085,7 +103085,7 @@ /turf/simulated/floor/tiled/steel, /area/eris/quartermaster/storage) "nmJ" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -103341,7 +103341,7 @@ /turf/simulated/floor/tiled/steel/monofloor, /area/eris/quartermaster/hangarsupply) "ocY" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -106828,7 +106828,7 @@ /turf/simulated/floor/tiled/steel, /area/eris/maintenance/section2deck4central) "wah" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -106966,7 +106966,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, diff --git a/maps/encounters/prisonhulk/prisonhulk.dmm b/maps/encounters/prisonhulk/prisonhulk.dmm index 7cd88ea2141..1228f816350 100644 --- a/maps/encounters/prisonhulk/prisonhulk.dmm +++ b/maps/encounters/prisonhulk/prisonhulk.dmm @@ -397,7 +397,7 @@ /turf/simulated/floor/tiled/techmaint, /area/outpost/prisonhulk/security) "xw" = ( -/obj/machinery/door/airlock/maintenance_common, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/steel/techfloor_grid, /area/outpost/prisonhulk/cells) "xA" = ( @@ -735,7 +735,7 @@ /turf/simulated/floor/carpet, /area/outpost/prisonhulk/security) "Pd" = ( -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Chemistry Storage"; req_access = list(33) }, @@ -760,7 +760,7 @@ /turf/simulated/wall/r_wall, /area/outpost/prisonhulk/food) "Qr" = ( -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Service Maintenance"; req_access = list(12) }, @@ -892,7 +892,7 @@ /turf/simulated/floor/tiled/steel/bluecorner, /area/outpost/prisonhulk/security) "VE" = ( -/obj/machinery/door/airlock/maintenance_common, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/steel/techfloor_grid, /area/outpost/prisonhulk) "VP" = ( diff --git a/maps/pulsar/pulsar.dmm b/maps/pulsar/pulsar.dmm index f44bc3a807a..e69172f5960 100644 --- a/maps/pulsar/pulsar.dmm +++ b/maps/pulsar/pulsar.dmm @@ -111,7 +111,7 @@ /turf/simulated/floor/tiled/steel/techfloor_grid, /area/outpost/pulsar/maintenance) "dj" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -152,7 +152,7 @@ /area/outpost/pulsar/maintenance) "dX" = ( /obj/structure/catwalk, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -296,7 +296,7 @@ /turf/simulated/floor/tiled/techmaint, /area/outpost/pulsar/maintenance) "ks" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -393,7 +393,7 @@ /turf/simulated/floor/wood, /area/outpost/pulsar) "pc" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ icon_state = "door_locked"; locked = 1; name = "Engineering Maintenance"; @@ -572,7 +572,7 @@ /turf/simulated/floor/tiled/dark, /area/outpost/pulsar) "wJ" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -658,7 +658,7 @@ /turf/simulated/floor/tiled/techmaint, /area/outpost/pulsar/maintenance) "yj" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -722,7 +722,7 @@ /turf/simulated/floor/tiled/steel/gray_perforated, /area/outpost/pulsar/maintenance) "Af" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -850,7 +850,7 @@ /turf/simulated/floor/plating/under, /area/outpost/pulsar/maintenance) "EK" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -1133,7 +1133,7 @@ /turf/simulated/floor/tiled/steel/cargo, /area/outpost/pulsar/maintenance) "LP" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -1238,7 +1238,7 @@ /turf/simulated/floor/plating/under, /area/outpost/pulsar/maintenance) "PF" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -1298,7 +1298,7 @@ /turf/simulated/floor/plating/under, /area/outpost/pulsar/maintenance) "Sk" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -1374,7 +1374,7 @@ /turf/simulated/floor/tiled/steel/techfloor_grid, /area/outpost/pulsar/maintenance) "Wj" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, diff --git a/maps/submaps/deepmaint_rooms/core/podbay.dmm b/maps/submaps/deepmaint_rooms/core/podbay.dmm index 340c64620e5..2adfb0e841f 100644 --- a/maps/submaps/deepmaint_rooms/core/podbay.dmm +++ b/maps/submaps/deepmaint_rooms/core/podbay.dmm @@ -459,7 +459,7 @@ /turf/simulated/floor/tiled/dark/gray_perforated, /area/deepmaint) "by" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, diff --git a/maps/submaps/deepmaint_rooms/core/vault.dmm b/maps/submaps/deepmaint_rooms/core/vault.dmm index c3bea3c0bc6..4494129a8dc 100644 --- a/maps/submaps/deepmaint_rooms/core/vault.dmm +++ b/maps/submaps/deepmaint_rooms/core/vault.dmm @@ -31,7 +31,7 @@ /turf/simulated/floor/tiled/steel, /area/deepmaint) "aj" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -90,7 +90,7 @@ /turf/simulated/floor/tiled/steel/cargo, /area/deepmaint) "au" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -477,7 +477,7 @@ /turf/simulated/floor/tiled/steel, /area/deepmaint) "bD" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, diff --git a/maps/submaps/deepmaint_rooms/normal/mechbay.dmm b/maps/submaps/deepmaint_rooms/normal/mechbay.dmm index c4d214b211b..3d71a451b85 100644 --- a/maps/submaps/deepmaint_rooms/normal/mechbay.dmm +++ b/maps/submaps/deepmaint_rooms/normal/mechbay.dmm @@ -96,7 +96,7 @@ /turf/simulated/floor/tiled/steel/brown_perforated, /area/deepmaint) "u" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, diff --git a/maps/submaps/deepmaint_rooms/normal/morgue.dmm b/maps/submaps/deepmaint_rooms/normal/morgue.dmm index acc0ffbdab2..7c8eaf316e0 100644 --- a/maps/submaps/deepmaint_rooms/normal/morgue.dmm +++ b/maps/submaps/deepmaint_rooms/normal/morgue.dmm @@ -77,7 +77,7 @@ /turf/simulated/floor/tiled/dark, /area/deepmaint) "p" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, diff --git a/maps/submaps/deepmaint_rooms/normal/roach.dmm b/maps/submaps/deepmaint_rooms/normal/roach.dmm index 5b5110eb023..2f860ea2503 100644 --- a/maps/submaps/deepmaint_rooms/normal/roach.dmm +++ b/maps/submaps/deepmaint_rooms/normal/roach.dmm @@ -86,7 +86,7 @@ /turf/simulated/floor/plating/under, /area/deepmaint) "q" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, diff --git a/maps/submaps/deepmaint_rooms/normal/storage.dmm b/maps/submaps/deepmaint_rooms/normal/storage.dmm index 9ec8cd82fe8..4b98d4232ca 100644 --- a/maps/submaps/deepmaint_rooms/normal/storage.dmm +++ b/maps/submaps/deepmaint_rooms/normal/storage.dmm @@ -29,7 +29,7 @@ /turf/simulated/floor/tiled/steel/techfloor, /area/deepmaint) "g" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, diff --git a/maps/submaps/deepmaint_rooms/normal/toilet.dmm b/maps/submaps/deepmaint_rooms/normal/toilet.dmm index d6d57a54580..00b9d5ddb5f 100644 --- a/maps/submaps/deepmaint_rooms/normal/toilet.dmm +++ b/maps/submaps/deepmaint_rooms/normal/toilet.dmm @@ -32,7 +32,7 @@ /turf/simulated/floor/tiled/steel, /area/deepmaint) "g" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, diff --git a/maps/submaps/junk_field/j25_25/neutral/neutral1.dmm b/maps/submaps/junk_field/j25_25/neutral/neutral1.dmm index be364803987..1011fa11fb7 100644 --- a/maps/submaps/junk_field/j25_25/neutral/neutral1.dmm +++ b/maps/submaps/junk_field/j25_25/neutral/neutral1.dmm @@ -29,7 +29,7 @@ /turf/simulated/floor/plating/under/airless, /area/template_noop) "ai" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -60,7 +60,7 @@ /turf/simulated/floor/plating/under/airless, /area/template_noop) "ap" = ( -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ name = "Reserve Storage"; req_access = list(12) }, @@ -159,7 +159,7 @@ /turf/simulated/floor/tiled/techmaint/airless, /area/template_noop) "aL" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, diff --git a/maps/submaps/junk_field/j25_25/neutral/neutral2.dmm b/maps/submaps/junk_field/j25_25/neutral/neutral2.dmm index 6ecfa838f30..bcf8798fb81 100644 --- a/maps/submaps/junk_field/j25_25/neutral/neutral2.dmm +++ b/maps/submaps/junk_field/j25_25/neutral/neutral2.dmm @@ -22,7 +22,7 @@ /turf/simulated/floor/plating/under/airless, /area/template_noop) "ag" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, @@ -188,7 +188,7 @@ /area/template_noop) "aN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_medical{ +/obj/machinery/door/airlock/maintenance/medical{ name = "Chemistry Maintenance"; req_access = list(33) }, diff --git a/maps/submaps/junk_field/j25_25/neutral/neutral3.dmm b/maps/submaps/junk_field/j25_25/neutral/neutral3.dmm index 520167e271a..1a7ca5b5f6a 100644 --- a/maps/submaps/junk_field/j25_25/neutral/neutral3.dmm +++ b/maps/submaps/junk_field/j25_25/neutral/neutral3.dmm @@ -212,7 +212,7 @@ /turf/simulated/floor/plating/airless, /area/template_noop) "bW" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) }, @@ -237,7 +237,7 @@ /area/template_noop) "ci" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Atmospherics Maintenance"; req_access = list(24) }, diff --git a/maps/submaps/junk_field/j25_25/serbian/serbian1.dmm b/maps/submaps/junk_field/j25_25/serbian/serbian1.dmm index 723258a1f73..f96770118b6 100644 --- a/maps/submaps/junk_field/j25_25/serbian/serbian1.dmm +++ b/maps/submaps/junk_field/j25_25/serbian/serbian1.dmm @@ -323,7 +323,7 @@ }, /area/template_noop) "qX" = ( -/obj/machinery/door/airlock/maintenance_interior, +/obj/machinery/door/airlock/maintenance/interior, /turf/unsimulated/floor/airless{ dir = 2; icon_state = "freezerfloor" @@ -443,7 +443,7 @@ }, /area/template_noop) "wU" = ( -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ icon_state = "door_locked"; locked = 1 }, @@ -566,7 +566,7 @@ }, /area/template_noop) "Eg" = ( -/obj/machinery/door/airlock/maintenance_interior, +/obj/machinery/door/airlock/maintenance/interior, /turf/unsimulated/floor/airless{ icon_state = "cult"; name = "plating" diff --git a/maps/submaps/junk_field/j25_25/serbian/serbian2.dmm b/maps/submaps/junk_field/j25_25/serbian/serbian2.dmm index e3206dc30df..48320ce2eff 100644 --- a/maps/submaps/junk_field/j25_25/serbian/serbian2.dmm +++ b/maps/submaps/junk_field/j25_25/serbian/serbian2.dmm @@ -39,7 +39,7 @@ }, /area/template_noop) "bm" = ( -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ icon_state = "door_locked"; locked = 1 }, @@ -602,7 +602,7 @@ }, /area/template_noop) "XL" = ( -/obj/machinery/door/airlock/maintenance_interior, +/obj/machinery/door/airlock/maintenance/interior, /turf/unsimulated/floor/airless{ icon_state = "cult"; name = "plating" diff --git a/maps/submaps/junk_field/j25_25/serbian/serbian3.dmm b/maps/submaps/junk_field/j25_25/serbian/serbian3.dmm index 2f0c13a2d21..b20dcce1d37 100644 --- a/maps/submaps/junk_field/j25_25/serbian/serbian3.dmm +++ b/maps/submaps/junk_field/j25_25/serbian/serbian3.dmm @@ -235,7 +235,7 @@ }, /area/template_noop) "aL" = ( -/obj/machinery/door/airlock/maintenance_interior, +/obj/machinery/door/airlock/maintenance/interior, /turf/unsimulated/floor/airless{ icon_state = "cult"; name = "plating" @@ -343,7 +343,7 @@ }, /area/template_noop) "bb" = ( -/obj/machinery/door/airlock/maintenance_interior{ +/obj/machinery/door/airlock/maintenance/interior{ icon_state = "door_locked"; locked = 1 }, diff --git a/maps/submaps/junk_field/j5_5/neutral/neutral10.dmm b/maps/submaps/junk_field/j5_5/neutral/neutral10.dmm index 9d2063ed236..ec47dee3521 100644 --- a/maps/submaps/junk_field/j5_5/neutral/neutral10.dmm +++ b/maps/submaps/junk_field/j5_5/neutral/neutral10.dmm @@ -37,7 +37,7 @@ /area/template_noop) "h" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, diff --git a/maps/submaps/junk_field/j5_5/neutral/neutral11.dmm b/maps/submaps/junk_field/j5_5/neutral/neutral11.dmm index 6230112cace..1ff877d9cac 100644 --- a/maps/submaps/junk_field/j5_5/neutral/neutral11.dmm +++ b/maps/submaps/junk_field/j5_5/neutral/neutral11.dmm @@ -38,7 +38,7 @@ /turf/simulated/floor/tiled/techmaint/airless, /area/template_noop) "j" = ( -/obj/machinery/door/airlock/maintenance_common{ +/obj/machinery/door/airlock/maintenance/common{ name = "Service Maintenance"; req_access = list(12) }, diff --git a/maps/submaps/junk_field/j5_5/neutral/neutral8.dmm b/maps/submaps/junk_field/j5_5/neutral/neutral8.dmm index 0a77be6530e..059f937b4d6 100644 --- a/maps/submaps/junk_field/j5_5/neutral/neutral8.dmm +++ b/maps/submaps/junk_field/j5_5/neutral/neutral8.dmm @@ -45,7 +45,7 @@ /turf/simulated/floor/plating/under/airless, /area/template_noop) "k" = ( -/obj/machinery/door/airlock/maintenance_engineering{ +/obj/machinery/door/airlock/maintenance/engineering{ name = "Engineering Maintenance"; req_access = list(10) },