diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index acd7a446c19..9b01f7b6bd7 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -127,6 +127,36 @@ icon = 'icons/obj/doors/Doormaint.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_mai +/obj/machinery/door/airlock/maintenance/cargo + icon = 'icons/obj/doors/Doormaint_cargo.dmi' + req_one_access = list(access_cargo) + +/obj/machinery/door/airlock/maintenance/command + icon = 'icons/obj/doors/Doormaint_command.dmi' + req_one_access = list(access_heads) + +/obj/machinery/door/airlock/maintenance/common + icon = 'icons/obj/doors/Doormaint_common.dmi' + +/obj/machinery/door/airlock/maintenance/engi + icon = 'icons/obj/doors/Doormaint_engi.dmi' + req_one_access = list(access_engine) + +/obj/machinery/door/airlock/maintenance/int + icon = 'icons/obj/doors/Doormaint_int.dmi' + +/obj/machinery/door/airlock/maintenance/medical + icon = 'icons/obj/doors/Doormaint_med.dmi' + req_one_access = list(access_medical) + +/obj/machinery/door/airlock/maintenance/rnd + icon = 'icons/obj/doors/Doormaint_rnd.dmi' + req_one_access = list(access_research) + +/obj/machinery/door/airlock/maintenance/sec + icon = 'icons/obj/doors/Doormaint_sec.dmi' + req_one_access = list(access_security) + /obj/machinery/door/airlock/external name = "External Airlock" icon = 'icons/obj/doors/Doorext.dmi' diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 45501a3de76..434f7e64cb5 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -2,15 +2,44 @@ /obj/machinery/door/airlock/multi_tile width = 2 appearance_flags = 0 + var/obj/machinery/filler_object/filler1 + var/obj/machinery/filler_object/filler2 /obj/machinery/door/airlock/multi_tile/New() ..() SetBounds() + if(opacity) + create_fillers() + +/obj/machinery/door/airlock/multi_tile/Destroy() + qdel_null(filler1) + qdel_null(filler2) + return ..() /obj/machinery/door/airlock/multi_tile/Move() . = ..() SetBounds() +/obj/machinery/door/airlock/multi_tile/open() + . = ..() + + if(filler1) + filler1.set_opacity(opacity) + if(filler2) + filler2.set_opacity(opacity) + + return . + +/obj/machinery/door/airlock/multi_tile/close() + . = ..() + + if(filler1) + filler1.set_opacity(opacity) + if(filler2) + filler2.set_opacity(opacity) + + return . + /obj/machinery/door/airlock/multi_tile/proc/SetBounds() if(dir in list(EAST, WEST)) bound_width = width * world.icon_size @@ -19,9 +48,35 @@ bound_width = world.icon_size bound_height = width * world.icon_size +/obj/machinery/door/airlock/multi_tile/proc/create_fillers() + if(src.dir > 3) + filler1 = new/obj/machinery/filler_object (src.loc) + filler2 = new/obj/machinery/filler_object (get_step(src,EAST)) + else + filler1 = new/obj/machinery/filler_object (src.loc) + filler2 = new/obj/machinery/filler_object (get_step(src,NORTH)) + filler1.density = 0 + filler2.density = 0 + filler1.set_opacity(opacity) + filler2.set_opacity(opacity) + /obj/machinery/door/airlock/multi_tile/glass name = "Glass Airlock" icon = 'icons/obj/doors/Door2x1glass.dmi' opacity = 0 glass = 1 assembly_type = /obj/structure/door_assembly/multi_tile + +/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/filler_object + name = "" + icon = 'icons/obj/doors/rapid_pdoor.dmi' + icon_state = "" + density = 0 + +/obj/machinery/door/airlock/multi_tile/metal/mait + icon = 'icons/obj/doors/Door2x1_Maint.dmi' diff --git a/icons/obj/doors/Door2x1_Maint.dmi b/icons/obj/doors/Door2x1_Maint.dmi new file mode 100644 index 00000000000..8b60326932a Binary files /dev/null and b/icons/obj/doors/Door2x1_Maint.dmi differ diff --git a/icons/obj/doors/Door2x1glass.dmi b/icons/obj/doors/Door2x1glass.dmi index b05a7a931a2..3542659eee5 100644 Binary files a/icons/obj/doors/Door2x1glass.dmi and b/icons/obj/doors/Door2x1glass.dmi differ diff --git a/icons/obj/doors/Door2x1glass_old.dmi b/icons/obj/doors/Door2x1glass_old.dmi new file mode 100644 index 00000000000..b05a7a931a2 Binary files /dev/null and b/icons/obj/doors/Door2x1glass_old.dmi differ diff --git a/icons/obj/doors/Door2x1metal.dmi b/icons/obj/doors/Door2x1metal.dmi new file mode 100644 index 00000000000..07fd6a27440 Binary files /dev/null and b/icons/obj/doors/Door2x1metal.dmi differ diff --git a/icons/obj/doors/Dooratmo.dmi b/icons/obj/doors/Dooratmo.dmi index a9cc31f9d73..84e54e5a954 100644 Binary files a/icons/obj/doors/Dooratmo.dmi and b/icons/obj/doors/Dooratmo.dmi differ diff --git a/icons/obj/doors/Dooratmo_old.dmi b/icons/obj/doors/Dooratmo_old.dmi new file mode 100644 index 00000000000..a9cc31f9d73 Binary files /dev/null and b/icons/obj/doors/Dooratmo_old.dmi differ diff --git a/icons/obj/doors/Dooratmoglass.dmi b/icons/obj/doors/Dooratmoglass.dmi index 37928a80c53..6226b6dce4c 100644 Binary files a/icons/obj/doors/Dooratmoglass.dmi and b/icons/obj/doors/Dooratmoglass.dmi differ diff --git a/icons/obj/doors/Dooratmoglass_old.dmi b/icons/obj/doors/Dooratmoglass_old.dmi new file mode 100644 index 00000000000..37928a80c53 Binary files /dev/null and b/icons/obj/doors/Dooratmoglass_old.dmi differ diff --git a/icons/obj/doors/Doorbananium.dmi b/icons/obj/doors/Doorbananium.dmi index e50a4773c30..b495e30a24d 100644 Binary files a/icons/obj/doors/Doorbananium.dmi and b/icons/obj/doors/Doorbananium.dmi differ diff --git a/icons/obj/doors/Doorbananium_old.dmi b/icons/obj/doors/Doorbananium_old.dmi new file mode 100644 index 00000000000..e50a4773c30 Binary files /dev/null and b/icons/obj/doors/Doorbananium_old.dmi differ diff --git a/icons/obj/doors/Doorcom.dmi b/icons/obj/doors/Doorcom.dmi index 315f6441887..a7220d359b9 100644 Binary files a/icons/obj/doors/Doorcom.dmi and b/icons/obj/doors/Doorcom.dmi differ diff --git a/icons/obj/doors/Doorcom_old.dmi b/icons/obj/doors/Doorcom_old.dmi new file mode 100644 index 00000000000..315f6441887 Binary files /dev/null and b/icons/obj/doors/Doorcom_old.dmi differ diff --git a/icons/obj/doors/Doorcomglass.dmi b/icons/obj/doors/Doorcomglass.dmi index fa9599b8c3d..225ab47a6b0 100644 Binary files a/icons/obj/doors/Doorcomglass.dmi and b/icons/obj/doors/Doorcomglass.dmi differ diff --git a/icons/obj/doors/Doorcomglass_old.dmi b/icons/obj/doors/Doorcomglass_old.dmi new file mode 100644 index 00000000000..fa9599b8c3d Binary files /dev/null and b/icons/obj/doors/Doorcomglass_old.dmi differ diff --git a/icons/obj/doors/Doordiamond.dmi b/icons/obj/doors/Doordiamond.dmi index 6504d463b9d..db10dd7450b 100644 Binary files a/icons/obj/doors/Doordiamond.dmi and b/icons/obj/doors/Doordiamond.dmi differ diff --git a/icons/obj/doors/Doordiamond_old.dmi b/icons/obj/doors/Doordiamond_old.dmi new file mode 100644 index 00000000000..6504d463b9d Binary files /dev/null and b/icons/obj/doors/Doordiamond_old.dmi differ diff --git a/icons/obj/doors/Dooreng.dmi b/icons/obj/doors/Dooreng.dmi index 07cb0dd9a89..be37dee0ded 100644 Binary files a/icons/obj/doors/Dooreng.dmi and b/icons/obj/doors/Dooreng.dmi differ diff --git a/icons/obj/doors/Dooreng_old.dmi b/icons/obj/doors/Dooreng_old.dmi new file mode 100644 index 00000000000..07cb0dd9a89 Binary files /dev/null and b/icons/obj/doors/Dooreng_old.dmi differ diff --git a/icons/obj/doors/Doorengatmoglass.dmi b/icons/obj/doors/Doorengatmoglass.dmi index 1d32895f84d..d55d66ed63e 100644 Binary files a/icons/obj/doors/Doorengatmoglass.dmi and b/icons/obj/doors/Doorengatmoglass.dmi differ diff --git a/icons/obj/doors/Doorengatmoglass_old.dmi b/icons/obj/doors/Doorengatmoglass_old.dmi new file mode 100644 index 00000000000..1d32895f84d Binary files /dev/null and b/icons/obj/doors/Doorengatmoglass_old.dmi differ diff --git a/icons/obj/doors/Doorengatmos.dmi b/icons/obj/doors/Doorengatmos.dmi index 07cb0dd9a89..589fdc6ea2b 100644 Binary files a/icons/obj/doors/Doorengatmos.dmi and b/icons/obj/doors/Doorengatmos.dmi differ diff --git a/icons/obj/doors/Doorengatmos_old.dmi b/icons/obj/doors/Doorengatmos_old.dmi new file mode 100644 index 00000000000..07cb0dd9a89 Binary files /dev/null and b/icons/obj/doors/Doorengatmos_old.dmi differ diff --git a/icons/obj/doors/Doorengglass.dmi b/icons/obj/doors/Doorengglass.dmi index 191c0f46cee..90986a34504 100644 Binary files a/icons/obj/doors/Doorengglass.dmi and b/icons/obj/doors/Doorengglass.dmi differ diff --git a/icons/obj/doors/Doorengglass_old.dmi b/icons/obj/doors/Doorengglass_old.dmi new file mode 100644 index 00000000000..191c0f46cee Binary files /dev/null and b/icons/obj/doors/Doorengglass_old.dmi differ diff --git a/icons/obj/doors/Doorfreezer.dmi b/icons/obj/doors/Doorfreezer.dmi index f201659bb06..54f409e75f5 100644 Binary files a/icons/obj/doors/Doorfreezer.dmi and b/icons/obj/doors/Doorfreezer.dmi differ diff --git a/icons/obj/doors/Doorfreezer_old.dmi b/icons/obj/doors/Doorfreezer_old.dmi new file mode 100644 index 00000000000..f201659bb06 Binary files /dev/null and b/icons/obj/doors/Doorfreezer_old.dmi differ diff --git a/icons/obj/doors/Doorglass.dmi b/icons/obj/doors/Doorglass.dmi index 9eb7098c62e..cd0c0543cfb 100644 Binary files a/icons/obj/doors/Doorglass.dmi and b/icons/obj/doors/Doorglass.dmi differ diff --git a/icons/obj/doors/Doorglass_old.dmi b/icons/obj/doors/Doorglass_old.dmi new file mode 100644 index 00000000000..9eb7098c62e Binary files /dev/null and b/icons/obj/doors/Doorglass_old.dmi differ diff --git a/icons/obj/doors/Doorgold.dmi b/icons/obj/doors/Doorgold.dmi index 30e44c7610c..435d448c347 100644 Binary files a/icons/obj/doors/Doorgold.dmi and b/icons/obj/doors/Doorgold.dmi differ diff --git a/icons/obj/doors/Doorgold_old.dmi b/icons/obj/doors/Doorgold_old.dmi new file mode 100644 index 00000000000..30e44c7610c Binary files /dev/null and b/icons/obj/doors/Doorgold_old.dmi differ diff --git a/icons/obj/doors/Doormaint.dmi b/icons/obj/doors/Doormaint.dmi index 5e71c4da761..39cf7cf87b8 100644 Binary files a/icons/obj/doors/Doormaint.dmi and b/icons/obj/doors/Doormaint.dmi differ diff --git a/icons/obj/doors/Doormaint_cargo.dmi b/icons/obj/doors/Doormaint_cargo.dmi new file mode 100644 index 00000000000..1228b54a467 Binary files /dev/null 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 new file mode 100644 index 00000000000..d61e7f2aa83 Binary files /dev/null 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 new file mode 100644 index 00000000000..cd0073827b9 Binary files /dev/null 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 new file mode 100644 index 00000000000..25bb5ba4ec3 Binary files /dev/null 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 new file mode 100644 index 00000000000..50f8461a73a Binary files /dev/null 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 new file mode 100644 index 00000000000..1e4fda55610 Binary files /dev/null and b/icons/obj/doors/Doormaint_med.dmi differ diff --git a/icons/obj/doors/Doormaint_old.dmi b/icons/obj/doors/Doormaint_old.dmi new file mode 100644 index 00000000000..5e71c4da761 Binary files /dev/null and b/icons/obj/doors/Doormaint_old.dmi differ diff --git a/icons/obj/doors/Doormaint_rnd.dmi b/icons/obj/doors/Doormaint_rnd.dmi new file mode 100644 index 00000000000..c05eabe22b1 Binary files /dev/null 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 new file mode 100644 index 00000000000..b6c3914d45b Binary files /dev/null and b/icons/obj/doors/Doormaint_sec.dmi differ diff --git a/icons/obj/doors/Doormining.dmi b/icons/obj/doors/Doormining.dmi index 08f5e9799af..e6295f9df6c 100644 Binary files a/icons/obj/doors/Doormining.dmi and b/icons/obj/doors/Doormining.dmi differ diff --git a/icons/obj/doors/Doormining_old.dmi b/icons/obj/doors/Doormining_old.dmi new file mode 100644 index 00000000000..08f5e9799af Binary files /dev/null and b/icons/obj/doors/Doormining_old.dmi differ diff --git a/icons/obj/doors/Doorminingglass.dmi b/icons/obj/doors/Doorminingglass.dmi index 5894f9b8259..4b7cdf064e3 100644 Binary files a/icons/obj/doors/Doorminingglass.dmi and b/icons/obj/doors/Doorminingglass.dmi differ diff --git a/icons/obj/doors/Doorminingglass_old.dmi b/icons/obj/doors/Doorminingglass_old.dmi new file mode 100644 index 00000000000..5894f9b8259 Binary files /dev/null and b/icons/obj/doors/Doorminingglass_old.dmi differ diff --git a/icons/obj/doors/Doorphoron.dmi b/icons/obj/doors/Doorphoron.dmi index cfc8e3cd618..ba1a6d9906c 100644 Binary files a/icons/obj/doors/Doorphoron.dmi and b/icons/obj/doors/Doorphoron.dmi differ diff --git a/icons/obj/doors/Doorphoron_old.dmi b/icons/obj/doors/Doorphoron_old.dmi new file mode 100644 index 00000000000..cfc8e3cd618 Binary files /dev/null and b/icons/obj/doors/Doorphoron_old.dmi differ diff --git a/icons/obj/doors/Doorsand.dmi b/icons/obj/doors/Doorsand.dmi index 22977d5c27b..2fde8384327 100644 Binary files a/icons/obj/doors/Doorsand.dmi and b/icons/obj/doors/Doorsand.dmi differ diff --git a/icons/obj/doors/Doorsand_old.dmi b/icons/obj/doors/Doorsand_old.dmi new file mode 100644 index 00000000000..22977d5c27b Binary files /dev/null and b/icons/obj/doors/Doorsand_old.dmi differ diff --git a/icons/obj/doors/Doorsec.dmi b/icons/obj/doors/Doorsec.dmi index e5d5ef10d43..9c0e62c9193 100644 Binary files a/icons/obj/doors/Doorsec.dmi and b/icons/obj/doors/Doorsec.dmi differ diff --git a/icons/obj/doors/Doorsec_old.dmi b/icons/obj/doors/Doorsec_old.dmi new file mode 100644 index 00000000000..e5d5ef10d43 Binary files /dev/null and b/icons/obj/doors/Doorsec_old.dmi differ diff --git a/icons/obj/doors/Doorsecglass.dmi b/icons/obj/doors/Doorsecglass.dmi index 95240586409..697463c7e97 100644 Binary files a/icons/obj/doors/Doorsecglass.dmi and b/icons/obj/doors/Doorsecglass.dmi differ diff --git a/icons/obj/doors/Doorsecglass_old.dmi b/icons/obj/doors/Doorsecglass_old.dmi new file mode 100644 index 00000000000..95240586409 Binary files /dev/null and b/icons/obj/doors/Doorsecglass_old.dmi differ diff --git a/icons/obj/doors/Doorsilver.dmi b/icons/obj/doors/Doorsilver.dmi index 13f8797e105..ed8446deb3d 100644 Binary files a/icons/obj/doors/Doorsilver.dmi and b/icons/obj/doors/Doorsilver.dmi differ diff --git a/icons/obj/doors/Doorsilver_old.dmi b/icons/obj/doors/Doorsilver_old.dmi new file mode 100644 index 00000000000..13f8797e105 Binary files /dev/null and b/icons/obj/doors/Doorsilver_old.dmi differ diff --git a/icons/obj/doors/Dooruranium.dmi b/icons/obj/doors/Dooruranium.dmi index 96944cbd004..17d3c580b61 100644 Binary files a/icons/obj/doors/Dooruranium.dmi and b/icons/obj/doors/Dooruranium.dmi differ diff --git a/icons/obj/doors/Dooruranium_old.dmi b/icons/obj/doors/Dooruranium_old.dmi new file mode 100644 index 00000000000..96944cbd004 Binary files /dev/null and b/icons/obj/doors/Dooruranium_old.dmi differ diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi index a7150f77c11..3b1a61e7c90 100644 Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ diff --git a/icons/obj/doors/door_assembly2x1.dmi b/icons/obj/doors/door_assembly2x1.dmi index f6e5657d748..1ea8fe2759f 100644 Binary files a/icons/obj/doors/door_assembly2x1.dmi and b/icons/obj/doors/door_assembly2x1.dmi differ diff --git a/icons/obj/doors/door_assembly2x1_old.dmi b/icons/obj/doors/door_assembly2x1_old.dmi new file mode 100644 index 00000000000..f6e5657d748 Binary files /dev/null and b/icons/obj/doors/door_assembly2x1_old.dmi differ diff --git a/icons/obj/doors/door_assembly_old.dmi b/icons/obj/doors/door_assembly_old.dmi new file mode 100644 index 00000000000..a7150f77c11 Binary files /dev/null and b/icons/obj/doors/door_assembly_old.dmi differ diff --git a/icons/obj/doors/doorint.dmi b/icons/obj/doors/doorint.dmi index ea93570e4b7..df6197216f4 100644 Binary files a/icons/obj/doors/doorint.dmi and b/icons/obj/doors/doorint.dmi differ diff --git a/icons/obj/doors/doorint_old.dmi b/icons/obj/doors/doorint_old.dmi new file mode 100644 index 00000000000..ea93570e4b7 Binary files /dev/null and b/icons/obj/doors/doorint_old.dmi differ diff --git a/icons/obj/doors/doormed.dmi b/icons/obj/doors/doormed.dmi index 06f142ef71f..30a34246314 100644 Binary files a/icons/obj/doors/doormed.dmi and b/icons/obj/doors/doormed.dmi differ diff --git a/icons/obj/doors/doormed_old.dmi b/icons/obj/doors/doormed_old.dmi new file mode 100644 index 00000000000..06f142ef71f Binary files /dev/null and b/icons/obj/doors/doormed_old.dmi differ diff --git a/icons/obj/doors/doormedglass.dmi b/icons/obj/doors/doormedglass.dmi index fcca7729516..2d86a8ed812 100644 Binary files a/icons/obj/doors/doormedglass.dmi and b/icons/obj/doors/doormedglass.dmi differ diff --git a/icons/obj/doors/doormedglass_old.dmi b/icons/obj/doors/doormedglass_old.dmi new file mode 100644 index 00000000000..fcca7729516 Binary files /dev/null and b/icons/obj/doors/doormedglass_old.dmi differ diff --git a/icons/obj/doors/doorresearch.dmi b/icons/obj/doors/doorresearch.dmi index a95e7b066fa..286accb6638 100644 Binary files a/icons/obj/doors/doorresearch.dmi and b/icons/obj/doors/doorresearch.dmi differ diff --git a/icons/obj/doors/doorresearch_old.dmi b/icons/obj/doors/doorresearch_old.dmi new file mode 100644 index 00000000000..a95e7b066fa Binary files /dev/null and b/icons/obj/doors/doorresearch_old.dmi differ diff --git a/icons/obj/doors/doorresearchglass.dmi b/icons/obj/doors/doorresearchglass.dmi index 9bc2db4610c..1f0c87e3df0 100644 Binary files a/icons/obj/doors/doorresearchglass.dmi and b/icons/obj/doors/doorresearchglass.dmi differ diff --git a/icons/obj/doors/doorresearchglass_old.dmi b/icons/obj/doors/doorresearchglass_old.dmi new file mode 100644 index 00000000000..9bc2db4610c Binary files /dev/null and b/icons/obj/doors/doorresearchglass_old.dmi differ diff --git a/icons/obj/doors/doorsci.dmi b/icons/obj/doors/doorsci.dmi index 88292a3df26..f8c76a10879 100644 Binary files a/icons/obj/doors/doorsci.dmi and b/icons/obj/doors/doorsci.dmi differ diff --git a/icons/obj/doors/doorsci_old.dmi b/icons/obj/doors/doorsci_old.dmi new file mode 100644 index 00000000000..88292a3df26 Binary files /dev/null and b/icons/obj/doors/doorsci_old.dmi differ diff --git a/icons/obj/doors/doorsciglass.dmi b/icons/obj/doors/doorsciglass.dmi index f08906d7a49..b5f558b3485 100644 Binary files a/icons/obj/doors/doorsciglass.dmi and b/icons/obj/doors/doorsciglass.dmi differ diff --git a/icons/obj/doors/doorsciglass_old.dmi b/icons/obj/doors/doorsciglass_old.dmi new file mode 100644 index 00000000000..f08906d7a49 Binary files /dev/null and b/icons/obj/doors/doorsciglass_old.dmi differ diff --git a/icons/turf/wall_masks.dmi b/icons/turf/wall_masks.dmi index d67671c4d63..3c9072dafa0 100644 Binary files a/icons/turf/wall_masks.dmi and b/icons/turf/wall_masks.dmi differ diff --git a/icons/turf/wall_masks_old.dmi b/icons/turf/wall_masks_old.dmi new file mode 100644 index 00000000000..d67671c4d63 Binary files /dev/null and b/icons/turf/wall_masks_old.dmi differ