diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 6c0a8ebf9a..b3c58cab66 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -91,7 +91,24 @@ name = "Maintenance Access" icon = 'icons/obj/doors/Doormaint.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_mai - +//VOREStation Add - Specific department maintenance doors +/obj/machinery/door/airlock/maintenance/cargo + icon = 'icons/obj/doors/Doormaint_cargo.dmi' +/obj/machinery/door/airlock/maintenance/command + icon = 'icons/obj/doors/Doormaint_command.dmi' +/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' +/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' +/obj/machinery/door/airlock/maintenance/rnd + icon = 'icons/obj/doors/Doormaint_rnd.dmi' +/obj/machinery/door/airlock/maintenance/sec + icon = 'icons/obj/doors/Doormaint_sec.dmi' +//VOREStation Add End /obj/machinery/door/airlock/external name = "External Airlock" icon = 'icons/obj/doors/Doorext.dmi' @@ -147,7 +164,7 @@ assembly_type = /obj/structure/door_assembly/door_assembly_mhatch /obj/machinery/door/airlock/glass_command - name = "Maintenance Hatch" + //name = "Maintenance Hatch" //VOREStation Removal - Not maintenance... icon = 'icons/obj/doors/Doorcomglass.dmi' hitsound = 'sound/effects/Glasshit.ogg' maxhealth = 300 @@ -157,7 +174,7 @@ glass = 1 /obj/machinery/door/airlock/glass_engineering - name = "Maintenance Hatch" + //name = "Maintenance Hatch" //VOREStation Removal - Not maintenance... icon = 'icons/obj/doors/Doorengglass.dmi' hitsound = 'sound/effects/Glasshit.ogg' maxhealth = 300 @@ -167,7 +184,7 @@ glass = 1 /obj/machinery/door/airlock/glass_engineeringatmos - name = "Maintenance Hatch" + //name = "Maintenance Hatch" //VOREStation Removal - Not maintenance... icon = 'icons/obj/doors/Doorengatmoglass.dmi' hitsound = 'sound/effects/Glasshit.ogg' maxhealth = 300 @@ -177,7 +194,7 @@ glass = 1 /obj/machinery/door/airlock/glass_security - name = "Maintenance Hatch" + //name = "Maintenance Hatch" //VOREStation Removal - Not maintenance... icon = 'icons/obj/doors/Doorsecglass.dmi' hitsound = 'sound/effects/Glasshit.ogg' maxhealth = 300 @@ -187,7 +204,7 @@ glass = 1 /obj/machinery/door/airlock/glass_medical - name = "Maintenance Hatch" + //name = "Maintenance Hatch" //VOREStation Removal - Not maintenance... icon = 'icons/obj/doors/Doormedglass.dmi' hitsound = 'sound/effects/Glasshit.ogg' maxhealth = 300 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index dd8e868d8a..d01e45c889 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -435,7 +435,8 @@ var/obj/fire/fire = locate() in loc if(fire) qdel(fire) - return + + return 1 /obj/machinery/door/proc/requiresID() return 1 diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 45501a3de7..a30ef7b45c 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -2,15 +2,46 @@ /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() + if(filler1) + qdel(filler1) + if(filler2) + qdel(filler2) + ..() /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 +50,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' \ No newline at end of file diff --git a/icons/obj/doors/Door2x1_Maint.dmi b/icons/obj/doors/Door2x1_Maint.dmi new file mode 100644 index 0000000000..8b60326932 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 b05a7a931a..3542659eee 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 new file mode 100644 index 0000000000..07fd6a2744 Binary files /dev/null and b/icons/obj/doors/Door2x1metal.dmi differ diff --git a/icons/obj/doors/DoorHazard.dmi b/icons/obj/doors/DoorHazard.dmi index d32526b388..35f4c474bf 100644 Binary files a/icons/obj/doors/DoorHazard.dmi and b/icons/obj/doors/DoorHazard.dmi differ diff --git a/icons/obj/doors/Dooratmo.dmi b/icons/obj/doors/Dooratmo.dmi index a9cc31f9d7..cc329863e3 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 37928a80c5..f7f3908ffa 100644 Binary files a/icons/obj/doors/Dooratmoglass.dmi and b/icons/obj/doors/Dooratmoglass.dmi differ diff --git a/icons/obj/doors/Doorbananium.dmi b/icons/obj/doors/Doorbananium.dmi index e50a4773c3..2f6ff9577a 100644 Binary files a/icons/obj/doors/Doorbananium.dmi and b/icons/obj/doors/Doorbananium.dmi differ diff --git a/icons/obj/doors/Doorcom.dmi b/icons/obj/doors/Doorcom.dmi index 315f644188..21364429f4 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 fa9599b8c3..991c75dafe 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 6504d463b9..345d49fdb2 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 07cb0dd9a8..fa06f460a1 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 191c0f46ce..57c8774b3f 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 d912394ece..64c582a8d2 100644 Binary files a/icons/obj/doors/Doorext.dmi and b/icons/obj/doors/Doorext.dmi differ diff --git a/icons/obj/doors/Doorfreezer.dmi b/icons/obj/doors/Doorfreezer.dmi index f201659bb0..c310f336a3 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 9eb7098c62..693daac652 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 30e44c7610..412839f69e 100644 Binary files a/icons/obj/doors/Doorgold.dmi and b/icons/obj/doors/Doorgold.dmi differ diff --git a/icons/obj/doors/Doormaint.dmi b/icons/obj/doors/Doormaint.dmi index 5e71c4da76..19f16de856 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 0000000000..1228b54a46 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 0000000000..d61e7f2aa8 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 0000000000..cd0073827b 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 0000000000..25bb5ba4ec 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 0000000000..50f8461a73 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 0000000000..1e4fda5561 Binary files /dev/null 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 new file mode 100644 index 0000000000..c05eabe22b 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 0000000000..e983c70464 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 08f5e9799a..2a723eb2be 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 5894f9b825..0b160a8eb5 100644 Binary files a/icons/obj/doors/Doorminingglass.dmi and b/icons/obj/doors/Doorminingglass.dmi differ diff --git a/icons/obj/doors/Doorplasma.dmi b/icons/obj/doors/Doorplasma.dmi new file mode 100644 index 0000000000..ba1a6d9906 Binary files /dev/null and b/icons/obj/doors/Doorplasma.dmi differ diff --git a/icons/obj/doors/Doorsand.dmi b/icons/obj/doors/Doorsand.dmi index 22977d5c27..2017afd76f 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 e5d5ef10d4..91695ad627 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 9524058640..08d8447437 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 13f8797e10..ed8446deb3 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 96944cbd00..21f107f86a 100644 Binary files a/icons/obj/doors/Dooruranium.dmi and b/icons/obj/doors/Dooruranium.dmi differ diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi index 6c91045161..a984906fb3 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 f6e5657d74..1ea8fe2759 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/doorint.dmi b/icons/obj/doors/doorint.dmi index ea93570e4b..89ef26f7e0 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 06f142ef71..c692311b48 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 fcca772951..425b204b86 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 a95e7b066f..396fed90de 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 9bc2db4610..d90f2e2d53 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 88292a3df2..3b8fc9daff 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 f08906d7a4..c2451aaaf1 100644 Binary files a/icons/obj/doors/doorsciglass.dmi and b/icons/obj/doors/doorsciglass.dmi differ diff --git a/icons/obj/doors/rapid_pdoor.dmi b/icons/obj/doors/rapid_pdoor.dmi index 06cf038c76..d7e82ef045 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/showcase.dmi b/icons/obj/doors/showcase.dmi new file mode 100644 index 0000000000..e3bee59a14 Binary files /dev/null and b/icons/obj/doors/showcase.dmi differ